[Fusionforge-commits] r18637 - in trunk/src: translations www/my
Marc-Etienne VARGENAU
vargenau at fusionforge.org
Thu Dec 12 14:47:49 CET 2013
Author: vargenau
Date: 2013-12-12 14:47:49 +0100 (Thu, 12 Dec 2013)
New Revision: 18637
Modified:
trunk/src/translations/bg.po
trunk/src/translations/ca.po
trunk/src/translations/de.po
trunk/src/translations/en.po
trunk/src/translations/es.po
trunk/src/translations/eu.po
trunk/src/translations/fr.po
trunk/src/translations/fusionforge.pot
trunk/src/translations/gl.po
trunk/src/translations/it.po
trunk/src/translations/ja.po
trunk/src/translations/ko.po
trunk/src/translations/nl.po
trunk/src/translations/pl.po
trunk/src/translations/pt.po
trunk/src/translations/ru.po
trunk/src/translations/sv.po
trunk/src/translations/th.po
trunk/src/translations/zh_CN.po
trunk/src/translations/zh_TW.po
trunk/src/www/my/diary.php
Log:
No \n in translated strings
Modified: trunk/src/translations/bg.po
===================================================================
--- trunk/src/translations/bg.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/bg.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 19:02+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-02-01 14:38+0100\n"
"Last-Translator: \n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1802,7 +1802,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2428,7 +2428,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5062,7 +5062,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5404,7 +5404,7 @@
msgstr "Файл"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -8024,7 +8024,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -16302,7 +16302,7 @@
msgid "Posted on "
msgstr "Публикуване на обяви"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Списък на бележките"
@@ -17143,7 +17143,7 @@
msgid "New Package Name"
msgstr ""
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -17573,7 +17573,7 @@
msgid "View your tasks and artifacts."
msgstr "Нямате въведени бележки в дневника"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Моят дневник и бележки"
@@ -18334,48 +18334,47 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Грешка при добавянето на бележка"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Бележката не е намерена или не Ви принадлежи"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Добавяне на бележка"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Обновяване на бележка"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Флаг за публичност"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18384,7 +18383,7 @@
"всички потрбители, които са активирали следенето за промени във Вашият "
"дневник."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Нямате въведени бележки в дневника"
Modified: trunk/src/translations/ca.po
===================================================================
--- trunk/src/translations/ca.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/ca.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-02-01 14:38+0100\n"
"Last-Translator: \n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1821,7 +1821,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2449,7 +2449,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5214,7 +5214,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5567,7 +5567,7 @@
msgstr "Suprimeix el fitxer"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Privat"
@@ -8259,7 +8259,7 @@
msgstr "L'element #%s està pendent"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "Detalls"
@@ -16736,7 +16736,7 @@
msgid "Posted on "
msgstr "Enviat per"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Entrades existents de Diari i Notes"
@@ -17607,7 +17607,7 @@
msgid "New Package Name"
msgstr "Nou nom de pàquet"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "Públic"
@@ -18068,7 +18068,7 @@
msgid "View your tasks and artifacts."
msgstr "No teniu entrades de diari"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "El meu diari i les meves notes"
@@ -18831,48 +18831,47 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Error afegint un element"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "No s'ha trobat l'entrada o no us pertany a vos"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Afegeix una nova entrada"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Actualitza una entrada"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "És pública"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18880,7 +18879,7 @@
"Si està marcat com a pública, un cop enviada la vostra entrada s'enviarà "
"per correu a tots els usuaris que monitoritzen."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "No teniu entrades de diari"
Modified: trunk/src/translations/de.po
===================================================================
--- trunk/src/translations/de.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/de.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:27+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2010-07-16 10:07+0200\n"
"Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
"Language-Team: german\n"
@@ -1817,7 +1817,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2440,7 +2440,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -2579,8 +2579,7 @@
#: common/forum/ForumHTML.class.php:615
#, php-format
msgid ""
-"You are posting anonymously because you are not <a href=\"%s\">logged in</"
-"a>"
+"You are posting anonymously because you are not <a href=\"%s\">logged in</a>"
msgstr "Sie posten anonym, da Sie nicht <a href=\"%s\">angemeldet</a> sind"
#: common/forum/ForumHTML.class.php:620 common/tracker/actions/mod.php:216
@@ -5200,7 +5199,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5546,7 +5545,7 @@
msgstr "Auswählen"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Privat"
@@ -8266,7 +8265,7 @@
msgstr "Das Element #%s ist schwebend"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "Details"
@@ -16758,7 +16757,7 @@
msgid "Posted on "
msgstr "Geposted von"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Existierender Terminkalender und Notizeinträge"
@@ -17635,7 +17634,7 @@
msgid "New Package Name"
msgstr "Neuer Paketname"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "öffentlich"
@@ -18103,7 +18102,7 @@
msgid "View your tasks and artifacts."
msgstr "Sie haben keine Terminkalendereinträge"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Mein Terminkalender und Notizen"
@@ -18919,57 +18918,51 @@
msgid "[%s User Notes: %s] %s"
msgstr "[%s User Notes: %s] %s"
-#: www/my/diary.php:104
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"Sie erhalten diese E-Mail da Sie ausgewählt haben diesen Nutzer zu "
-"beobachten. Um die Beobachtung wieder zu beenden, loggen Sie sich unter %s "
-"ein und besuchen Sie den nachfolgenden Link: \n"
-"%s\n"
+"Sie erhalten diese E-Mail, da Sie für dieser Nutzer beobachten ausgewählt "
+"haben."
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+"Um die Beobachtung der Nutzer wieder zu beenden, "
+"besuchen Sie:"
+
+#: www/my/diary.php:116
#, fuzzy, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] "E-Mail gesandt an %s der Nutzer beobachtet"
msgstr[1] "E-Mail gesandt an %s der Nutzer beobachtet"
-#: www/my/diary.php:119
-#, fuzzy
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr "E-Mail nicht versandt - kein Beobachter"
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Fehler beim Hinzufügen eines Elementes"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Eintrag nicht gefunden oder er gehört Ihnen nicht"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Einen neuen Eintrag hinzufügen"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Einen Eintrag aktualisieren"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Ist öffentlich"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18977,7 +18970,7 @@
"Wenn als öffentlich markiert, wird Ihr Eintrag an alle beobachtenden "
"Benutzer gemailt, wenn es zuerst freigegeben wird."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Sie haben keine Terminkalendereinträge"
@@ -23577,10 +23570,6 @@
msgid "Personal Page for %s"
msgstr "Persönliche Seite für %s"
-#, fuzzy
-#~ msgid "Project Name (click to edit)"
-#~ msgstr "Gruppen-Name (anklicken zum Bearbeiten)"
-
#~ msgid ""
#~ "Read/write access to Mercurial tree is allowed for authenticated users. "
#~ "SSH must be installed on your client machine. Enter your site password "
Modified: trunk/src/translations/en.po
===================================================================
--- trunk/src/translations/en.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/en.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-01-13 16:27+0100\n"
"Last-Translator: Roland Mas <lolando at debian.org>\n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1711,7 +1711,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2307,7 +2307,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -4785,7 +4785,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5115,7 +5115,7 @@
msgstr ""
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -7604,7 +7604,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -15333,7 +15333,7 @@
msgid "Posted on "
msgstr ""
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr ""
@@ -16118,7 +16118,7 @@
msgid "New Package Name"
msgstr ""
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -16530,7 +16530,7 @@
msgid "View your tasks and artifacts."
msgstr ""
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr ""
@@ -17269,53 +17269,52 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
msgid "Error Adding Item: "
msgstr ""
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr ""
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr ""
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr ""
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr ""
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
msgstr ""
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr ""
Modified: trunk/src/translations/es.po
===================================================================
--- trunk/src/translations/es.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/es.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:27+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2013-02-11 13:42+0100\n"
"Last-Translator: skymix <skymix.es at gmail.com>\n"
"Language-Team: Spanish/Spain\n"
@@ -1762,7 +1762,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2370,7 +2370,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -2505,11 +2505,9 @@
#: common/forum/ForumHTML.class.php:615
#, php-format
msgid ""
-"You are posting anonymously because you are not <a href=\"%s\">logged in</"
-"a>"
+"You are posting anonymously because you are not <a href=\"%s\">logged in</a>"
msgstr ""
-"Está publicando anónimamente porque no ha <a href=\"%s\">iniciado sesión</"
-"a>"
+"Está publicando anónimamente porque no ha <a href=\"%s\">iniciado sesión</a>"
#: common/forum/ForumHTML.class.php:620 common/tracker/actions/mod.php:216
msgid "Post Comment"
@@ -5080,7 +5078,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5418,7 +5416,7 @@
msgstr "Seleccionar rol"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Privado"
@@ -8082,7 +8080,7 @@
msgstr "El registro #%s está pendiente"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "Detalles"
@@ -16279,7 +16277,7 @@
msgid "Posted on "
msgstr "Publicado en "
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Apuntes Actuales"
@@ -17102,7 +17100,7 @@
msgid "New Package Name"
msgstr "Nombre del Nuevo Paquete"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "Público"
@@ -17568,7 +17566,7 @@
msgid "View your tasks and artifacts."
msgstr "Ver sus tareas y artefactos."
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Diario y Notas"
@@ -18349,53 +18347,47 @@
msgid "[%s User Notes: %s] %s"
msgstr "[%s Notas Usuarios: ·%s]·%s"
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
+msgstr "Usted esta recibiendo este email porque eligió monitorizar este usuario."
+
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
msgstr ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"Usted esta recibiendo este email porque eligió monitorizar este usuario.\n"
-"Para dejar de monitorizarlo, acceda al siguiente enlace:\n"
-"%s\n"
+"Para dejar de monitorizarlo, visite:"
-#: www/my/diary.php:114
+#: www/my/diary.php:116
#, fuzzy, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] "email enviado a ·%s usuario de monitorización"
msgstr[1] "email enviado a ·%s usuario de monitorización"
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr "email no enviado- nadie siguiendo"
-#: www/my/diary.php:131
+#: www/my/diary.php:133
msgid "Error Adding Item: "
msgstr "Error agregando Elemento: "
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "No hay tal apunte o no es suyo."
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Crear nuevo apunte."
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Actualizar un apunte"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Público"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18403,7 +18395,7 @@
"Si su apunte está marcado \"Público\", su apunte se le enviará por correo a "
"los usuarios que están monitorizando su diario."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "No hay apuntes en su diario"
Modified: trunk/src/translations/eu.po
===================================================================
--- trunk/src/translations/eu.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/eu.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-02-19 23:28+0200\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1818,7 +1818,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2443,7 +2443,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5188,7 +5188,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5538,7 +5538,7 @@
msgstr "Fitxeroa ezabatu"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Pribatua"
@@ -8216,7 +8216,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -16644,7 +16644,7 @@
msgid "Posted on "
msgstr "Lanak argitaratu"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Dauden apunteak"
@@ -17507,7 +17507,7 @@
msgid "New Package Name"
msgstr "Pakete berriaren izena"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "Publikoa"
@@ -17967,7 +17967,7 @@
msgid "View your tasks and artifacts."
msgstr "Ez daude apunterik zure egunkarian"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Egunkaria eta Oharrak"
@@ -18731,48 +18731,47 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Akatsa apuntea sortzean"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Ez dago horrelako apunterik edo ez da zurea"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Apunte berria idatzi"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Apuntea eguneratu"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Publikoa"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18780,7 +18779,7 @@
"Zure apuntea \"publikoa\" bezela ezarria badago, apuntea postaz bidaliko "
"zaio zure egunkaria monitorizatzen ari denari."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Ez daude apunterik zure egunkarian"
Modified: trunk/src/translations/fr.po
===================================================================
--- trunk/src/translations/fr.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/fr.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:27+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2013-06-03 17:17+0100\n"
"Last-Translator: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent."
"com>\n"
@@ -1734,7 +1734,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2335,7 +2335,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -2469,8 +2469,7 @@
#: common/forum/ForumHTML.class.php:615
#, php-format
msgid ""
-"You are posting anonymously because you are not <a href=\"%s\">logged in</"
-"a>"
+"You are posting anonymously because you are not <a href=\"%s\">logged in</a>"
msgstr ""
"Vous ajoutez un message anonyme car vous n'êtes pas <a href=\"%s"
"\">identifié</a>"
@@ -4980,7 +4979,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5316,7 +5315,7 @@
msgstr "Sélectionner"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Privé"
@@ -7955,7 +7954,7 @@
msgstr " L'élément #%s est en attente"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "Détails"
@@ -16092,7 +16091,7 @@
msgid "Posted on "
msgstr "Publié le "
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Journal et notes existantes"
@@ -16921,7 +16920,7 @@
msgid "New Package Name"
msgstr "Nouveau nom de paquet"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "Public"
@@ -17395,7 +17394,7 @@
msgid "View your tasks and artifacts."
msgstr "Visualisez vos tâches et vos artifacts."
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Journal et notes"
@@ -18218,53 +18217,47 @@
msgid "[%s User Notes: %s] %s"
msgstr "[Journal d'utilisateur %s : %s] %s"
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"Vous recevez ce message suite à votre choix de surveiller le journal de cet "
-"utilisateur.\n"
-"Pour interrompre la surveillance suivez ce lien :\n"
+"Vous recevez ce message suite à votre choix de surveiller cet utilisateur."
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr "Pour interrompre la surveillance, suivez ce lien :"
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] "message de notification envoyé à %s utilisateur."
msgstr[1] "message de notification envoyé à %s utilisateurs."
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr "aucun message de notification envoyé (personne ne surveille)."
-#: www/my/diary.php:131
+#: www/my/diary.php:133
msgid "Error Adding Item: "
msgstr "Erreur lors de l'ajout : "
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Entrée non trouvée ou entrée qui ne vous appartient pas"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Ajouter une nouvelle entrée"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Mise à jour d'une entrée"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Affichage public ?"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18272,7 +18265,7 @@
"Si cette entrée est publique, elle sera envoyée par courriel aux "
"utilisateurs abonnés."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Vous n'avez pas de données"
Modified: trunk/src/translations/fusionforge.pot
===================================================================
--- trunk/src/translations/fusionforge.pot 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/fusionforge.pot 2013-12-12 13:47:49 UTC (rev 18637)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 19:02+0100\n"
+"POT-Creation-Date: 2013-12-12 14:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1711,7 +1711,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2307,7 +2307,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -4783,7 +4783,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5113,7 +5113,7 @@
msgstr ""
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -7602,7 +7602,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -15320,7 +15320,7 @@
msgid "Posted on "
msgstr ""
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr ""
@@ -16105,7 +16105,7 @@
msgid "New Package Name"
msgstr ""
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -16517,7 +16517,7 @@
msgid "View your tasks and artifacts."
msgstr ""
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr ""
@@ -17256,53 +17256,52 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
msgid "Error Adding Item: "
msgstr ""
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr ""
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr ""
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr ""
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr ""
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
msgstr ""
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr ""
Modified: trunk/src/translations/gl.po
===================================================================
--- trunk/src/translations/gl.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/gl.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:27+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-09-21 10:21+0100\n"
"Last-Translator: José Manuel Castroagudín Silva <chavescesures at gmail.com>\n"
"Language-Team: Galician <g11n at mancomun.org>\n"
@@ -1824,7 +1824,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2446,7 +2446,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -2585,11 +2585,9 @@
#: common/forum/ForumHTML.class.php:615
#, php-format
msgid ""
-"You are posting anonymously because you are not <a href=\"%s\">logged in</"
-"a>"
+"You are posting anonymously because you are not <a href=\"%s\">logged in</a>"
msgstr ""
-"Está a publicar de xeito anónimo porque non está <a href=\"%s\">conectado</"
-"a>"
+"Está a publicar de xeito anónimo porque non está <a href=\"%s\">conectado</a>"
#: common/forum/ForumHTML.class.php:620 common/tracker/actions/mod.php:216
msgid "Post Comment"
@@ -5209,7 +5207,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5560,7 +5558,7 @@
msgstr ""
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Privado"
@@ -8270,7 +8268,7 @@
msgstr "O elemento #%s está pendente"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "Detalles"
@@ -16822,7 +16820,7 @@
msgid "Posted on "
msgstr "Publicado por "
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Entradas existentes de diario e de notas"
@@ -17687,7 +17685,7 @@
msgid "New Package Name"
msgstr "Nome do novo paquete "
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "Público "
@@ -18158,7 +18156,7 @@
msgid "View your tasks and artifacts."
msgstr "Non ten ningunha entrada no seu diario "
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "O meu diario e as miñas notas"
@@ -18952,57 +18950,48 @@
msgid "[%s User Notes: %s] %s"
msgstr "[%s Notas do usuario: %s] %s"
-#: www/my/diary.php:104
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"Está a recibir este correo porque escolleu monitorizar a este usuario.\n"
-"Para parar de monitorizar a este usuario, inicie sesión en %s e visite a "
-"seguinte ligazón:\n"
-"\n"
-"%s\n"
+"Recibe este correo porque escolleu monitorizar este usuario."
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr "Para deixar de monitorizalo, visite:"
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] "Enviouse un correo a %s usuario monitorizando."
msgstr[1] "Enviouse un correo a %s usuarios monitorizando."
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr "Non se enviou correo - non hai ninguén monitorizando"
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Produciuse un erro ao engadir o elemento "
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Non se atopou a entrada ou non lle pertence"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Engadir unha entrada nova "
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Actualizar unha entrada "
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "É pública"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -19010,7 +18999,7 @@
"Se se marca como pública, a súa entrada enviaráselle por correo aos usuarios "
"que estean a monitorizar cando a envíe."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Non ten ningunha entrada no seu diario "
Modified: trunk/src/translations/it.po
===================================================================
--- trunk/src/translations/it.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/it.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2010-10-06 15:06+0200\n"
"Last-Translator: Reinhard Spisser <reinhard.spisser at fiditalia.it>\n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1826,7 +1826,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2454,7 +2454,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5218,7 +5218,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5571,7 +5571,7 @@
msgstr "Rimuovi file"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Privato"
@@ -8271,7 +8271,7 @@
msgstr "L'elemento #%s è scaduto"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "Dettagli"
@@ -16708,7 +16708,7 @@
msgid "Posted on "
msgstr "Inserito da"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Note e Diario esistenti"
@@ -17584,7 +17584,7 @@
msgid "New Package Name"
msgstr "Nome nuovo pacchetto"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "Pubblico"
@@ -18041,7 +18041,7 @@
msgid "View your tasks and artifacts."
msgstr "Non ci sono elementi del diario"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Diario personale e Note"
@@ -18805,52 +18805,48 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-"Stai ricevendo questa e-mail poiché hai scelto la notifica di questo forum.\n"
-"Per terminare la notifica, fai il login a %s e vai alla pagina: \n"
-"%s\n"
+"Stai ricevendo questa e-mail poiché hai scelto la notifica di questo utente."
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr "Per terminare la notifica, vai alla pagina:"
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Errore nell'aggiungere l'elemento"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Elemento non trovato o non ti appartiene"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Aggiungi nuova nota"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Aggiorna un elemento"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Pubblico?"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18858,7 +18854,7 @@
"Se marcato come pubblico, la nota verrà inviata a tutti gli utenti che "
"richiedono la notifica della nota."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Non ci sono elementi del diario"
@@ -23397,10 +23393,6 @@
msgid "Personal Page for %s"
msgstr "Pagina Personale"
-#, fuzzy
-#~ msgid "Project Name (click to edit)"
-#~ msgstr "Nome progetti (selezionare il nome per modificare)"
-
#~ msgid "Account Maintenance"
#~ msgstr "Manutenzione account"
Modified: trunk/src/translations/ja.po
===================================================================
--- trunk/src/translations/ja.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/ja.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-01-15 14:05+0100\n"
"Last-Translator: Roland Mas <lolando at debian.org>\n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1809,7 +1809,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2433,7 +2433,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5078,7 +5078,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5419,7 +5419,7 @@
msgstr "ファイル"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -8029,7 +8029,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -16245,7 +16245,7 @@
msgid "Posted on "
msgstr "コメント投稿"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
#, fuzzy
msgid "Existing Diary and Notes Entries"
msgstr "日記 & ノート"
@@ -17070,7 +17070,7 @@
msgid "New Package Name"
msgstr ""
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -17494,7 +17494,7 @@
msgid "View your tasks and artifacts."
msgstr "あなたに割り当てられたタスクはありません。"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "日記 & ノート"
@@ -18248,52 +18248,51 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
msgid "Error Adding Item: "
msgstr ""
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr ""
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr ""
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr ""
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr ""
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
msgstr ""
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr ""
Modified: trunk/src/translations/ko.po
===================================================================
--- trunk/src/translations/ko.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/ko.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-02-01 14:36+0100\n"
"Last-Translator: \n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1805,7 +1805,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2428,7 +2428,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5092,7 +5092,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5434,7 +5434,7 @@
msgstr "파일 삭제하기"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -8052,7 +8052,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -16249,7 +16249,7 @@
msgid "Posted on "
msgstr "멤버 구함 공지 올리기"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "존재하는 일기와 메모 항목들"
@@ -17094,7 +17094,7 @@
msgid "New Package Name"
msgstr "새 패키지 이름"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -17541,7 +17541,7 @@
msgid "View your tasks and artifacts."
msgstr "일기가 없습니다."
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "일기쓰기 및 메모"
@@ -18293,54 +18293,53 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "항목을 추가하는데 오류가 발생하였습니다."
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "해당 항목이 없거나 귀하에게 속하지 않는 항목입니다."
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "새로운 항목 추가"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "항목 갱신하기"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "공개"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
msgstr ""
"공개하시면 추가되는 항목들이 모니터링 중인 사용자들의 이메일로 발송됩니다."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "일기가 없습니다."
Modified: trunk/src/translations/nl.po
===================================================================
--- trunk/src/translations/nl.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/nl.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-02-01 14:36+0100\n"
"Last-Translator: \n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1810,7 +1810,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2439,7 +2439,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5189,7 +5189,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5543,7 +5543,7 @@
msgstr "Bestand wissen"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Besloten"
@@ -8235,7 +8235,7 @@
msgstr "Item #%s staat open"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "Details"
@@ -16723,7 +16723,7 @@
msgid "Posted on "
msgstr "Gepost door"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Bestaand logboek en aantekeningen"
@@ -17601,7 +17601,7 @@
msgid "New Package Name"
msgstr "Naam nieuwe bundel"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "Openbaar"
@@ -18062,7 +18062,7 @@
msgid "View your tasks and artifacts."
msgstr "Je hebt geen logboek of aantekeningen"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Mijn logboek en aantekeningen"
@@ -18825,48 +18825,47 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Fout bij toevoegen item"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Item niet gevonden of niet jouw eigendom"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Voeg een nieuw item toe"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Item bewerken"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Openbaar"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18874,7 +18873,7 @@
"Als je \"Openbaar\" aanvinkt zullen nieuw toegevoegde items aan alle "
"monitoring gebruikers worden gemaild."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Je hebt geen logboek of aantekeningen"
Modified: trunk/src/translations/pl.po
===================================================================
--- trunk/src/translations/pl.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/pl.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 19:02+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-10-06 16:20+0200\n"
"Last-Translator: Roland Mas <lolando at debian.org>\n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1792,7 +1792,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2409,7 +2409,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -4958,7 +4958,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5295,7 +5295,7 @@
msgstr "Dodaj Grupę Dokumentów"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -7859,7 +7859,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -15884,7 +15884,7 @@
msgid "Posted on "
msgstr ""
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr ""
@@ -16687,7 +16687,7 @@
msgid "New Package Name"
msgstr ""
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -17103,7 +17103,7 @@
msgid "View your tasks and artifacts."
msgstr ""
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr ""
@@ -17854,53 +17854,52 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
msgid "Error Adding Item: "
msgstr ""
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr ""
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr ""
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr ""
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr ""
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
msgstr ""
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr ""
Modified: trunk/src/translations/pt.po
===================================================================
--- trunk/src/translations/pt.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/pt.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 19:02+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-02-01 14:35+0100\n"
"Last-Translator: \n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1714,7 +1714,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2316,7 +2316,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -4853,7 +4853,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5188,7 +5188,7 @@
msgstr ""
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -7700,7 +7700,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -15492,7 +15492,7 @@
msgid "Posted on "
msgstr ""
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Diário e Anotações Existentes"
@@ -16301,7 +16301,7 @@
msgid "New Package Name"
msgstr "Nome do Novo Pacote"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -16745,7 +16745,7 @@
msgid "View your tasks and artifacts."
msgstr ""
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Meu Diário E Anotações"
@@ -17491,47 +17491,46 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
msgid "Error Adding Item: "
msgstr ""
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Entrada não encontrada ou não pertence à você"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Adicionar Uma Nova Entrada"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Atualizar Uma Entrada"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "É Público"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -17539,7 +17538,7 @@
"Se marcado como público, sua anotação será enviada para quaisquer usuários "
"monitores quando esse for o primeiro envio."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Você Não Tem Entradas No Diário"
Modified: trunk/src/translations/ru.po
===================================================================
--- trunk/src/translations/ru.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/ru.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-02-18 16:52+0100\n"
"Last-Translator: Aleksey Bragin <aleksey at reactos.org>\n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1830,7 +1830,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2451,7 +2451,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5217,7 +5217,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5569,7 +5569,7 @@
msgstr "Удалить файл"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "Приватный"
@@ -8284,7 +8284,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "Дополнительно"
@@ -16937,7 +16937,7 @@
msgid "Posted on "
msgstr "Опубликовал:"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Краткое содердание ежедневника"
@@ -17798,7 +17798,7 @@
msgid "New Package Name"
msgstr "Имя нового пакета"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "Публичный"
@@ -18267,7 +18267,7 @@
msgid "View your tasks and artifacts."
msgstr "У Вас нет записей в дневнике"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Мой журнал и заметки"
@@ -19064,16 +19064,15 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
@@ -19081,32 +19080,32 @@
msgstr[1] ""
msgstr[2] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Ошибка добавления элемента"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Для вас ничего нет"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Добавить новую запись"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Обновить запись"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Открыть для общего обозрения"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -19114,7 +19113,7 @@
"Если включено для общего обозрения, в этом случае будет разослано всем "
"участникам наблюдающим за Вашим проектом."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "У Вас нет записей в дневнике"
Modified: trunk/src/translations/sv.po
===================================================================
--- trunk/src/translations/sv.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/sv.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-07-19 01:41+0200\n"
"Last-Translator: Martin Bagge <brother at bsnet.se>\n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1815,7 +1815,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2440,7 +2440,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5175,7 +5175,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5525,7 +5525,7 @@
msgstr "Ta bort fil"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -8193,7 +8193,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -16587,7 +16587,7 @@
msgid "Posted on "
msgstr "Posta jobb"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "Existerande dagbok och anteckningar"
@@ -17448,7 +17448,7 @@
msgid "New Package Name"
msgstr "Nytt paketnamn"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -17902,7 +17902,7 @@
msgid "View your tasks and artifacts."
msgstr "Du har inga dagboksanteckningar"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "Min dagbok och anteckningar"
@@ -18664,48 +18664,47 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "Fel vid tillägg av post"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "Notering finns inte eller tillhör inte dig"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "Lägg till en ny notering"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "Uppdatera en notering"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "Är offentlig"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18713,7 +18712,7 @@
"Om markerad som offentlig, kommer din post att skickas till alla bevakande "
"användare när det skickas in första gången."
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "Du har inga dagboksanteckningar"
Modified: trunk/src/translations/th.po
===================================================================
--- trunk/src/translations/th.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/th.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 19:02+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2013-06-03 17:16+0100\n"
"Last-Translator: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent."
"com>\n"
@@ -1713,7 +1713,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2312,7 +2312,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -4791,7 +4791,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5121,7 +5121,7 @@
msgstr ""
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr ""
@@ -7609,7 +7609,7 @@
msgstr ""
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr ""
@@ -15317,7 +15317,7 @@
msgid "Posted on "
msgstr ""
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr ""
@@ -16102,7 +16102,7 @@
msgid "New Package Name"
msgstr ""
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr ""
@@ -16514,7 +16514,7 @@
msgid "View your tasks and artifacts."
msgstr ""
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr ""
@@ -17247,53 +17247,52 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
msgid "Error Adding Item: "
msgstr ""
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr ""
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr ""
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr ""
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr ""
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
msgstr ""
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr ""
Modified: trunk/src/translations/zh_CN.po
===================================================================
--- trunk/src/translations/zh_CN.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/zh_CN.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2010-10-06 15:07+0200\n"
"Last-Translator: 邱承 <qiucheng1 at sina.com>\n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1824,7 +1824,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2450,7 +2450,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5172,7 +5172,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5525,7 +5525,7 @@
msgstr "删除文件"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "私人"
@@ -8204,7 +8204,7 @@
msgstr "项目 #%s 是未决定"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "细节"
@@ -16640,7 +16640,7 @@
msgid "Posted on "
msgstr "张贴者"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "已有的日记和笔记"
@@ -17495,7 +17495,7 @@
msgid "New Package Name"
msgstr "新软件包名称"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "公开"
@@ -17939,7 +17939,7 @@
msgid "View your tasks and artifacts."
msgstr "您没有日记或笔记"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "我的日记和笔记"
@@ -18694,51 +18694,50 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
+#: www/my/diary.php:107
#, fuzzy
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
"你由于被选举出来监控这个论坛而接收到本邮件。如果想要停止监控这个论坛,请登"
"录%s并访问:%s\n"
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "增加新项目时错误"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "不存在或者不属于您"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "增加新日记或笔记"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "更新日记或笔记"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "是否公开?"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18746,7 +18745,7 @@
"如果标记为<strong>公开</strong>,您的日记或笔记将被通过mail发送到监视您日记或"
"笔记的用户信箱。"
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "您没有日记或笔记"
Modified: trunk/src/translations/zh_TW.po
===================================================================
--- trunk/src/translations/zh_TW.po 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/translations/zh_TW.po 2013-12-12 13:47:49 UTC (rev 18637)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: FusionForge 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 18:48+0100\n"
+"POT-Creation-Date: 2013-12-12 14:37+0100\n"
"PO-Revision-Date: 2009-02-01 14:34+0100\n"
"Last-Translator: \n"
"Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1824,7 +1824,7 @@
#: www/include/user_profile.php:152 www/mail/admin/index.php:192
#: www/mail/admin/index.php:225 www/my/bookmark_add.php:53
#: www/my/bookmark_add.php:59 www/my/bookmark_edit.php:59
-#: www/my/bookmark_edit.php:65 www/my/diary.php:181 www/my/diary.php:185
+#: www/my/bookmark_edit.php:65 www/my/diary.php:183 www/my/diary.php:187
#: www/news/admin/index.php:125 www/people/admin/index.php:99
#: www/people/admin/index.php:133 www/people/createjob.php:52
#: www/people/createjob.php:55 www/people/editjob.php:169
@@ -2452,7 +2452,7 @@
#: plugins/mantisbt/view/editIssue.php:213
#: plugins/mantisbt/view/viewIssue.php:108
#: plugins/mantisbt/view/viewIssues.php:363 www/export/rssAboTask.php:143
-#: www/my/dashboard.php:66 www/my/diary.php:181 www/pm/browse_task.php:143
+#: www/my/dashboard.php:66 www/my/diary.php:183 www/pm/browse_task.php:143
#: www/project/report/index.php:135
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
#: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:48
@@ -5183,7 +5183,7 @@
#: www/admin/cronman.php:37 www/admin/globalroleedit.php:247
#: www/admin/index.php:169 www/admin/pending-news.php:160
#: www/forum/admin/index.php:413 www/include/vote_function.php:286
-#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:189
+#: www/my/bookmark_add.php:63 www/my/bookmark_edit.php:69 www/my/diary.php:191
#: www/news/admin/index.php:149 www/news/news_utils.php:42
#: www/news/submit.php:170 www/pm/add_task.php:57 www/pm/add_task.php:140
#: www/pm/add_task.php:154 www/pm/admin/index.php:219
@@ -5536,7 +5536,7 @@
msgstr "刪除文件"
#: common/tracker/actions/browse.php:365 www/frs/admin/index.php:210
-#: www/my/diary.php:207
+#: www/my/diary.php:209
msgid "Private"
msgstr "隱藏"
@@ -8215,7 +8215,7 @@
msgstr "項目 #%s 是未決定"
#: cronjobs/send_pending_items_mail.php:121 www/admin/pending-news.php:147
-#: www/export/rssAboTask.php:146 www/my/diary.php:185
+#: www/export/rssAboTask.php:146 www/my/diary.php:187
#: www/news/admin/index.php:135 www/news/submit.php:158
msgid "Details"
msgstr "細節"
@@ -16665,7 +16665,7 @@
msgid "Posted on "
msgstr "張貼者"
-#: www/developer/diary.php:62 www/my/diary.php:197
+#: www/developer/diary.php:62 www/my/diary.php:199
msgid "Existing Diary and Notes Entries"
msgstr "已有的日記和筆記"
@@ -17520,7 +17520,7 @@
msgid "New Package Name"
msgstr "新套裝軟體名稱"
-#: www/frs/admin/index.php:209 www/my/diary.php:207
+#: www/frs/admin/index.php:209 www/my/diary.php:209
msgid "Public"
msgstr "公開"
@@ -17962,7 +17962,7 @@
msgid "View your tasks and artifacts."
msgstr "您沒有日記或筆記"
-#: www/include/html.php:990 www/my/diary.php:164
+#: www/include/html.php:990 www/my/diary.php:166
msgid "My Diary and Notes"
msgstr "我的日記和筆記"
@@ -18722,48 +18722,47 @@
msgid "[%s User Notes: %s] %s"
msgstr ""
-#: www/my/diary.php:104
-msgid ""
-"\n"
-"\n"
-"______________________________________________________________________\n"
-"You are receiving this email because you elected to monitor this user.\n"
-"To stop monitoring this user, visit the following link:\n"
+#: www/my/diary.php:107
+msgid "You are receiving this email because you elected to monitor this user."
msgstr ""
-#: www/my/diary.php:114
+#: www/my/diary.php:109
+msgid "To stop monitoring this user, visit the following link:"
+msgstr ""
+
+#: www/my/diary.php:116
#, php-format
msgid "email sent to %s monitoring user"
msgid_plural "email sent to %s monitoring users"
msgstr[0] ""
msgstr[1] ""
-#: www/my/diary.php:119
+#: www/my/diary.php:121
msgid "email not sent - no one monitoring"
msgstr ""
-#: www/my/diary.php:131
+#: www/my/diary.php:133
#, fuzzy
msgid "Error Adding Item: "
msgstr "增加新項目時錯誤"
-#: www/my/diary.php:147
+#: www/my/diary.php:149
msgid "Entry not found or does not belong to you"
msgstr "不存在或者不屬於您"
-#: www/my/diary.php:149 www/my/diary.php:160
+#: www/my/diary.php:151 www/my/diary.php:162
msgid "Add A New Entry"
msgstr "增加新日記或筆記"
-#: www/my/diary.php:152
+#: www/my/diary.php:154
msgid "Update An Entry"
msgstr "更新日記或筆記"
-#: www/my/diary.php:190
+#: www/my/diary.php:192
msgid "Is Public"
msgstr "是否公開?"
-#: www/my/diary.php:192
+#: www/my/diary.php:194
msgid ""
"If marked as public, your entry will be mailed to any monitoring users when "
"it is first submitted."
@@ -18771,7 +18770,7 @@
"如果標記為<strong>公開</strong>,您的日記或筆記將被透過mail發送到監視您日記或"
"筆記的會員信箱。"
-#: www/my/diary.php:202
+#: www/my/diary.php:204
msgid "You Have No Diary Entries"
msgstr "您沒有日記或筆記"
Modified: trunk/src/www/my/diary.php
===================================================================
--- trunk/src/www/my/diary.php 2013-12-11 18:03:38 UTC (rev 18636)
+++ trunk/src/www/my/diary.php 2013-12-12 13:47:49 UTC (rev 18637)
@@ -101,12 +101,14 @@
$body = strip_tags($body);
$body = $sanitizer->convertExtendedCharsForEmail($body);
- $body .= _('
+ $body .= "\n\n";
+ $body .= '______________________________________________________________________';
+ $body .= "\n";
+ $body .= _('You are receiving this email because you elected to monitor this user.');
+ $body .= "\n";
+ $body .= _('To stop monitoring this user, visit the following link:');
+ $body .= "\n";
-______________________________________________________________________
-You are receiving this email because you elected to monitor this user.
-To stop monitoring this user, visit the following link:
-');
$body .= util_make_url("/developer/monitor.php?diary_user=".user_getid());
util_send_message($to, $subject, $body, $to, $tolist);
More information about the Fusionforge-commits
mailing list