From fa7b8038c6b9bd11b314fd5ab278ed4d2cc5cd15 Mon Sep 17 00:00:00 2001
From: Roland Mas
Date: Wed, 6 Oct 2010 13:26:11 +0000
Subject: [PATCH] gettext-related fixes, including a new check for syntax
validity of the *.po files
---
.../widget/Widget_ProjectInfo.class.php | 2 +-
src/translations/bg.po | 153 ++++++------
src/translations/ca.po | 153 ++++++------
src/translations/de.po | 157 ++++++------
src/translations/el.po | 139 +++++------
src/translations/en.po | 139 +++++------
src/translations/eo.po | 139 +++++------
src/translations/es.po | 157 ++++++------
src/translations/eu.po | 153 ++++++------
src/translations/fr.po | 236 ++++++++++--------
src/translations/gforge.pot | 139 +++++------
src/translations/gl.po | 160 ++++++------
src/translations/he.po | 139 +++++------
src/translations/id.po | 139 +++++------
src/translations/it.po | 159 ++++++------
src/translations/ja.po | 145 +++++------
src/translations/ko.po | 150 ++++++-----
src/translations/la.po | 139 +++++------
src/translations/nb.po | 139 +++++------
src/translations/nl.po | 153 ++++++------
src/translations/pl.po | 140 +++++------
src/translations/pt.po | 139 +++++------
src/translations/pt_BR.po | 150 ++++++-----
src/translations/ru.po | 155 ++++++------
src/translations/sv.po | 150 ++++++-----
src/translations/th.po | 140 +++++------
src/translations/zh_CN.po | 166 ++++++------
src/translations/zh_TW.po | 153 ++++++------
src/utils/manage-translations.sh | 9 +
.../FullProjectHtmlSearchRenderer.class.php | 2 +-
.../renderers/HtmlSearchRenderer.class.php | 2 +-
.../include/ArtifactTypeHtml.class.php | 4 +-
src/www/tracker/query.php | 2 +-
tests/code/syntax/SyntaxTest.php | 9 +
34 files changed, 1998 insertions(+), 2113 deletions(-)
diff --git a/src/common/widget/Widget_ProjectInfo.class.php b/src/common/widget/Widget_ProjectInfo.class.php
index 2e2fcbad19..60fc4d92d0 100644
--- a/src/common/widget/Widget_ProjectInfo.class.php
+++ b/src/common/widget/Widget_ProjectInfo.class.php
@@ -99,7 +99,7 @@ class Widget_ProjectInfo extends Widget {
if ($num>0) {
print '
';
printf(
- ngettext('HELP WANTED: This project is looking for a "%2$s".',
+ ngettext('HELP WANTED: This project is looking for someone to fill a position.',
'HELP WANTED: This project is looking for people to fill several different positions.',
$num),
util_make_url ('/people/?group_id='.$group_id),
diff --git a/src/translations/bg.po b/src/translations/bg.po
index e0bc0a637b..701fe3faad 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:38+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -2974,7 +2974,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5683,25 +5684,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "СÑÑаниÑаÑа не е намеÑена"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "ÐоÑвÑÑди"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "Ðевалиден Ñ
ÐµÑ Ð·Ð° поÑвÑÑждение"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5709,11 +5711,11 @@ msgstr "Ðевалиден Ñ
ÐµÑ Ð·Ð° поÑвÑÑждение"
msgid "Could Not Get User"
msgstr "РазÑеÑение не беÑе полÑÑено"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "ÐÑÑÑеÑÑвена ÑмÑна на email адÑеÑ"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5721,8 +5723,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5814,7 +5816,7 @@ msgstr "ÐÑеÑна ÑÑаÑа паÑола"
msgid "You must supply valid password (at least 6 chars)"
msgstr "ТÑÑбва да вÑведеÑе валидна паÑола (поне 6 Ñимвола)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "ÐовиÑе паÑоли не ÑÑвпадаÑ."
@@ -5853,7 +5855,7 @@ msgstr "СÑаÑа паÑола"
msgid "New Password (at least 6 chars)"
msgstr "Ðова паÑола (поне 6 Ñимвола)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Ðова паÑола (оÑново)"
@@ -5894,7 +5896,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5969,11 +5971,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "СобÑÑвено име:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "ФамилиÑ:"
@@ -5981,7 +5983,7 @@ msgstr "ФамилиÑ:"
msgid "Language:"
msgstr "Ðзик:"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5989,7 +5991,7 @@ msgstr ""
msgid "Theme:"
msgstr "Тема:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "ÐÑÑжава:"
@@ -6002,35 +6004,35 @@ msgid "Change Email Addr"
msgstr "ÐÑомÑна на елекÑÑÐ¾Ð½Ð½Ð¸Ñ Ð¿Ð¾ÑенÑки адÑеÑ"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "ÐдÑеÑ:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "ТелеÑон:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "ФакÑ:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "Ðме:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6039,7 +6041,7 @@ msgstr ""
"ÑайÑа (ÐенеÑиÑа малко ÑÑаÑик и вклÑÑва извеÑÑÐ¸Ñ Ð¸Ð¼Ð°Ñи оÑноÑение кÑм "
"ÑигÑÑноÑÑÑа. Силно пÑепоÑÑÑиÑелно е да Ñе абониÑаÑе.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "ÐолÑÑаване на допÑлниÑелни ÑÑобÑÐµÐ½Ð¸Ñ Ð¾Ñ Ð¾Ð±ÑноÑÑÑа."
@@ -6136,46 +6138,41 @@ msgstr "[ÐзгÑбена паÑола]"
msgid "[New Account]"
msgstr "[Ðова ÑегиÑÑÑаÑиÑ]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[ÐовÑоÑно изпÑаÑане на пиÑмоÑо за акÑивиÑане на акаÑнÑ]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "ÐоÑвÑÑди"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "Ðевалиден Ñ
ÐµÑ Ð·Ð° поÑвÑÑждение"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "ТÑÑбва да вÑведеÑе валидна паÑола (поне 6 Ñимвола)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[ÐзгÑбена паÑола]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Ðова паÑола (поне 6 Ñимвола)"
@@ -6271,38 +6268,38 @@ msgstr ""
"confirmation email to verify your email address. Visiting the link sent to "
"you in this email will activate your account."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "ÐоÑÑебиÑелÑко име:"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "ÐаÑола (минимÑм 6 Ñимвола):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "ÐаÑола (поÑвÑÑждение):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Ðзик:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Тема"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "ÐдÑÐµÑ Ð·Ð° елекÑÑонна поÑа:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6310,25 +6307,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "РегиÑÑÑиÑане"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6336,7 +6333,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13102,6 +13099,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "ÐÑма оÑкÑиÑи ÑезÑлÑаÑи за %1$s"
@@ -13146,21 +13145,11 @@ msgstr "ÐневникÑÑ Ðµ обновен"
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "ÐÑма оÑкÑиÑи ÑезÑлÑаÑи за %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "РезÑлÑаÑи Ð¾Ñ ÑÑÑÑенеÑо за %1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "ÐÑма оÑкÑиÑи ÑезÑлÑаÑи за %1$s"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14158,37 +14147,36 @@ msgstr ""
msgid "Is Active"
msgstr "Флаг за акÑивноÑÑ"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "ÐдминиÑÑÑиÑане"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "ÐÑмаÑе оÑвоÑени задаÑи."
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "ÐдминиÑÑÑиÑане"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15449,7 +15437,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -15795,6 +15783,17 @@ msgstr ""
msgid "Project info"
msgstr "ÐÑоекÑи на поÑÑебиÑелÑ"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "ÐÑма оÑкÑиÑи ÑезÑлÑаÑи за %1$s"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "ÐÑма оÑкÑиÑи ÑезÑлÑаÑи за %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "ÐоÑвÑÑди"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "ÐÑеÑка пÑи полÑÑаванеÑо на %1$s"
diff --git a/src/translations/ca.po b/src/translations/ca.po
index 0ff3168712..7866593157 100644
--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:38+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -3134,7 +3134,8 @@ msgstr "Aquà hi ha una llista de posicions disponibles per a aquest projecte."
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5916,25 +5917,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "La pà gina sol·licitada no s'ha trobat (Error 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Confirma"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Aquesta clau hash de confirmació existeix més d'un cop."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "clau hash de confirmació no và lida"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5942,11 +5944,11 @@ msgstr "clau hash de confirmació no và lida"
msgid "Could Not Get User"
msgstr "No s'ha pogut completar l'operació"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Canvi d'adreça de correu completat"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5954,8 +5956,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Retorna"
@@ -6048,7 +6050,7 @@ msgstr "La contrasenya vella és incorrecta"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Heu d'entrar una contrasenya và lida (6 carà cters com a mÃnim)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Les noves contrasenyes no coincideixen."
@@ -6087,7 +6089,7 @@ msgstr "Contrasenya vella"
msgid "New Password (at least 6 chars)"
msgstr "Nova contrasenya (6 carà cters com a mÃnim)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Nova contrasenya (repetició)"
@@ -6141,7 +6143,7 @@ msgstr ""
"de claus al vostre fitxer és el que esperaveu."
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6216,11 +6218,11 @@ msgstr "ID usuari:"
msgid "Login name:"
msgstr "Nom d'inici de sessió:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "Nom:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Cognom:"
@@ -6228,7 +6230,7 @@ msgstr "Cognom:"
msgid "Language:"
msgstr "Idioma:"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Zona horà ria:"
@@ -6236,7 +6238,7 @@ msgstr "Zona horà ria:"
msgid "Theme:"
msgstr "Tema:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "PaÃs:"
@@ -6249,35 +6251,35 @@ msgid "Change Email Addr"
msgstr "Canvia l'adreça de correu"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Adreça:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Telèfon:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "Fax:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "TÃtol:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Adreça Jabber:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "Envieu notÃcies auto-generades només a la meva adreça de Jabber"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6285,7 +6287,7 @@ msgstr ""
"Rebre correu sobre actualitzacions del lloc (trà fic molt baix i inclou "
"notÃcies de seguretat. Molt recomanable.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Rebre enviaments addicionals de la comunitat. (trà fic baix.)"
@@ -6381,46 +6383,41 @@ msgstr "[Heu perdut la vostra contrasenya?]"
msgid "[New Account]"
msgstr "[Nou compte]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[Reenvia el correu de confirmació a un compte pendent]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Confirma"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "clau hash de confirmació no và lida"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "Heu de proporcionar una contrasenya và lida (6 car. com a mÃnim)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "ERROR"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[Heu perdut la vostra contrasenya?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Nova contrasenya (mÃn. 6 car.)"
@@ -6527,38 +6524,38 @@ msgstr ""
"correu de confirmació per a verificar la vostra adreça de correu. Visiteu "
"l'enllaç enviat en aquest correu i s'activarà el vostre compte."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Nom d'inici de sessió (no useu lletres majúscules):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Contrasenya (mÃn. 6 cars):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Contrasenya (repetició):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Selecció d'idioma:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Tema"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Adr. correu:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6566,26 +6563,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Registre"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "Registre complet"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6593,7 +6590,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13635,6 +13632,8 @@ msgstr ""
"els vostres permisos)"
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "No s'han trobat coincidències per %1$s"
@@ -13680,21 +13679,11 @@ msgstr "Data d'enviament"
msgid "Entire project search"
msgstr "Cerca avançada"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "No s'han trobat coincidències per %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "Resultats de cerca per %1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "No s'han trobat coincidències per %1$s"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14739,37 +14728,36 @@ msgstr ""
msgid "Is Active"
msgstr "Està actiu"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Administració de l'enquesta"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "No heu escollit cap llicència"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Administració de l'enquesta"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -16095,7 +16083,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16451,6 +16439,17 @@ msgstr "Nom d'usuari"
msgid "Project info"
msgstr "Informació de projecte"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "No s'han trobat coincidències per %1$s"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "No s'han trobat coincidències per %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Confirma"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "Error al crear un objecte de grup"
diff --git a/src/translations/de.po b/src/translations/de.po
index 5434d36833..66f0b4c101 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionForge trunk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2010-07-16 10:07+0200\n"
"Last-Translator: Thorsten Glaser \n"
"Language-Team: german\n"
@@ -3135,7 +3135,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -6007,25 +6008,26 @@ msgstr "Kein Kalender für diese Gruppe"
msgid "Requested Page not Found (Error 404)"
msgstr "Angeforderte Seite nicht gefunden (Fehler 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Bestätigen"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Dieser Bestätigungs-Hash-Wert existiert mehr als einmal."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "Ungültiger Hash-Wert der Bestätigung"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -6033,11 +6035,11 @@ msgstr "Ungültiger Hash-Wert der Bestätigung"
msgid "Could Not Get User"
msgstr "Konnte die Rolle nicht bekommen"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "EMail-Ãnderung abgeschlossen"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -6048,8 +6050,8 @@ msgstr ""
"registrierte E-Mail-Adresse lautet %2$s. Mails die an <"
"%3$s> gesendet wurden, werden nun an diesen Account weitergeleitet."
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Zurücksenden"
@@ -6145,7 +6147,7 @@ msgstr "Altes Passwort ist falsch"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Sie müssen ein gültiges Passwort (mind. 6 Buchstaben) eingeben."
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Die neuen Passwörter sind nicht identisch."
@@ -6184,7 +6186,7 @@ msgstr "Altes Passwort"
msgid "New Password (at least 6 chars)"
msgstr "Neues Passwort (mind. 6 Buchstaben)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Neues Passwort (Wiederholung)"
@@ -6241,7 +6243,7 @@ msgstr ""
"Sie, dass die Anzahl der Schlüssel in Ihrer Datei wie erwartet ist."
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6315,11 +6317,11 @@ msgstr "Benutzer-ID:"
msgid "Login name:"
msgstr "Anmelde-Name:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "Vorname:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Nachname:"
@@ -6327,7 +6329,7 @@ msgstr "Nachname:"
msgid "Language:"
msgstr "Sprache:"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Zeitzone:"
@@ -6335,7 +6337,7 @@ msgstr "Zeitzone:"
msgid "Theme:"
msgstr "Theme-ID:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "Land:"
@@ -6348,36 +6350,36 @@ msgid "Change Email Addr"
msgstr "Ãndere Email-Adresse"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Adresse:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Telefon:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "FAX:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "Titel:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Jabber-Adresse:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
"Sende automatisch generierte Notizen ausschlieÃlich an meine Jabber-Adresse"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6385,7 +6387,7 @@ msgstr ""
"Erhalte Emails über Seiten-Updates (Sehr sehr wenige und sie enthalten "
"Sicherheitshinweise. Diese Option wird sehr empfohlen.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Erhalte auÃerplanmäÃige Community-Mailings. (Sehr wenige.)"
@@ -6498,24 +6500,19 @@ msgstr "[Passwort vergessen?]"
msgid "[New Account]"
msgstr "[Neuer Account]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[Sende Bestätigungs-Email zu einem anstehenden Account nochmal]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Bestätigen"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "Ungültiger Hash-Wert der Bestätigung"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "Sie müssen ein gültiges Passwort eingeben (mind. 6 Buchstaben)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
@@ -6525,21 +6522,21 @@ msgstr ""
"zurückgesetzt. Sie können nun auf der Seite einloggen."
"p>"
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "Fehler"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr "[Passwort vergessen?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr "Willkommen %s. Sie können nun Ihr Passwort ändern."
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Neues Passwort (mind. 6 Buchstaben)"
@@ -6658,7 +6655,7 @@ msgstr ""
"überprüfen. Das Besuchen des Links, der in dieser Email steht, wird Ihren "
"Account aktivieren."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
@@ -6666,32 +6663,32 @@ msgstr ""
"Login-Name (keine GroÃbuchstaben, lassen Sie das Feld leer wird ein Name "
"automatisch generiert):"
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Anmelde-Name (keine GroÃbuchstaben):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Passwort (mind. 6 Buchstaben):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Passwort (Wiederholung):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Auswahl der Sprache:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Theme"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Email-Adresse:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, fuzzy, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6703,27 +6700,27 @@ msgstr ""
"Mail-Weiterleitungs-Account unter <loginname@%1$s> erhalten, welcher "
"Mails zu der angegebenen Adresse weiterleitet."
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
"Akzeptieren Sie Sie die Nutzungsbedingungenfür diese "
"Site?"
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr "Felder, die mit %s markiert sind, sind Pflichtfelder."
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Registrieren"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr "Abmeldung abgeschlossen"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, fuzzy, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6734,7 +6731,7 @@ msgstr ""
"den Fall dass Sie Ihre Subskription zukünftig wieder reaktivieren möchten, "
"loggen Sie ein und besuchen Sie Ihre Account Pflege Seite."
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, fuzzy, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13938,6 +13935,8 @@ msgstr ""
"Erlaubnis)"
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "Keine Treffer für %1$s gefunden"
@@ -13982,21 +13981,11 @@ msgstr "Beitragsdatum"
msgid "Entire project search"
msgstr "Erweiterte Projektsuche"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Keine Treffer für %1$s gefunden"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "Suchergebnisse für%1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "Keine Treffer für %1$s gefunden"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -15071,37 +15060,36 @@ msgstr ""
msgid "Is Active"
msgstr "Ist Aktiv"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Survey \tAdministration"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "Projekt-Administrator"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Survey \tAdministration"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -16439,7 +16427,7 @@ msgstr "Beobachtung beenden"
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, fuzzy, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr "(% als Joker)"
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16792,6 +16780,21 @@ msgstr "Kein Benutzername angegeben"
msgid "Project info"
msgstr "Projekt-Info"
+#, fuzzy
+#~ msgid "(% for wildcards)"
+#~ msgstr "(% als Joker)"
+
+#~ msgid "No matches found for %1$s"
+#~ msgstr "Keine Treffer für %1$s gefunden"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Keine Treffer für %1$s gefunden"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Bestätigen"
+
#~ msgid "Error getting member object"
#~ msgstr "Fehler beim Erstellen des Mitarbeiter-Objektes"
diff --git a/src/translations/el.po b/src/translations/el.po
index a384bd0bb3..75fe48362c 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:37+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -2843,7 +2843,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5453,34 +5454,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5488,8 +5490,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5564,7 +5566,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5600,7 +5602,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5641,7 +5643,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5707,11 +5709,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5719,7 +5721,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5727,7 +5729,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5740,41 +5742,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5868,44 +5870,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5989,37 +5987,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6027,25 +6025,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6053,7 +6051,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12541,6 +12539,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12584,21 +12584,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13569,36 +13559,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14829,7 +14818,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/en.po b/src/translations/en.po
index 2277757f9c..2edc25f347 100644
--- a/src/translations/en.po
+++ b/src/translations/en.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-01-13 16:27+0100\n"
"Last-Translator: Roland Mas \n"
"Language-Team: LANGUAGE \n"
@@ -2843,7 +2843,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5453,34 +5454,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5488,8 +5490,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5564,7 +5566,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5600,7 +5602,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5641,7 +5643,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5707,11 +5709,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5719,7 +5721,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5727,7 +5729,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5740,41 +5742,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5868,44 +5870,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5989,37 +5987,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6027,25 +6025,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6053,7 +6051,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12541,6 +12539,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12584,21 +12584,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13569,36 +13559,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14829,7 +14818,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/eo.po b/src/translations/eo.po
index 7c81390760..59e4e39662 100644
--- a/src/translations/eo.po
+++ b/src/translations/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:37+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -2843,7 +2843,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5453,34 +5454,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5488,8 +5490,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5564,7 +5566,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5600,7 +5602,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5641,7 +5643,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5707,11 +5709,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5719,7 +5721,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5727,7 +5729,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5740,41 +5742,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5868,44 +5870,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5989,37 +5987,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6027,25 +6025,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6053,7 +6051,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12541,6 +12539,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12584,21 +12584,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13569,36 +13559,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14829,7 +14818,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/es.po b/src/translations/es.po
index fca4298d6b..fb791d0464 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
-"PO-Revision-Date: 2010-07-29 18:42+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
+"PO-Revision-Date: 2010-10-06 14:24+0200\n"
"Last-Translator: Luis Cañas DÃaz \n"
"Language-Team: LANGUAGE \n"
"Language: es\n"
@@ -1399,7 +1399,7 @@ msgstr ""
#: common/include/GroupJoinRequest.class.php:266
#, php-format
msgid "Request to Join Project %1$s"
-msgstr "Petición para unirse al proyecto: %1 $s"
+msgstr "Petición para unirse al proyecto: %1$s"
#: common/include/GroupJoinRequest.class.php:228
#, php-format
@@ -3144,7 +3144,8 @@ msgstr "Aquà hay una lista de las posiciones disponibles para este proyecto."
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5925,25 +5926,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "Página solicitada no encontrada (Error 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Confirmar"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Este 'hash' de confirmación existe más de una vez."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "'Hash' de confirmación invalido"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5951,11 +5953,11 @@ msgstr "'Hash' de confirmación invalido"
msgid "Could Not Get User"
msgstr "No se pudo obtener el rol"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Cambio de dirección de correo electrónico completado"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5963,8 +5965,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Volver"
@@ -6056,7 +6058,7 @@ msgstr "La contraseña antigua es incorrecta"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Debe proporcionar una contraseña válida (al menos de 6 caracteres)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Las nuevas contraseñas no coinciden."
@@ -6096,7 +6098,7 @@ msgstr "Contraseña antigua"
msgid "New Password (at least 6 chars)"
msgstr "Nueva contraseña (al menos de 6 caracteres)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Nueva contraseña (repÃtala)"
@@ -6150,7 +6152,7 @@ msgstr ""
"que el número de claves de su cuenta es el esperado."
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6227,11 +6229,11 @@ msgstr "User ID:"
msgid "Login name:"
msgstr "Nombre de usuario:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "Nombre:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Apellidos:"
@@ -6239,7 +6241,7 @@ msgstr "Apellidos:"
msgid "Language:"
msgstr "Idioma"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Zona horaria:"
@@ -6247,7 +6249,7 @@ msgstr "Zona horaria:"
msgid "Theme:"
msgstr "Tema:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "PaÃs:"
@@ -6260,35 +6262,35 @@ msgid "Change Email Addr"
msgstr "Cambiar Dirección e-mail"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Dirección:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Teléfono:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "FAX:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "TÃtulo:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Dirección Jabber:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "Enviar noticias automáticas sólo a mi dirección Jabber"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6296,7 +6298,7 @@ msgstr ""
"Recibir correos sobre actualizaciones del portal (Tráfico muy bajo. "
"Altamente recomendado.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Recibir correos adicionales de la comunidad. (Bajo tráfico.)"
@@ -6392,47 +6394,42 @@ msgstr "[¿Se le olvidó su contraseña?]"
msgid "[New Account]"
msgstr "[Nueva cuenta]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[Reenviar el email de confirmación a una cuenta pendiente de registro]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Confirmar"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "'Hash' de confirmación invalido"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
"Debe proporcionar una contraseña válida (por lo menos seis carácteres)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "ERROR"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[¿Se le olvidó su contraseña?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Nueva contraseña (min. 6 carácteres)"
@@ -6540,38 +6537,38 @@ msgstr ""
"confirmación para verificar su cuenta de correo. Visitando el enlace que le "
"hemos enviado le activará la cuenta.
"
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Nombre de la cuenta (no use mayúsculas) *:"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Contraseña (min. 6 caracteres) *:"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Contraseña (repÃtela) *:"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Seleccione su lenguaje:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Tema"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Dirección e-mail:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6579,26 +6576,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "RegÃstrese"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "Registro Completo"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6606,7 +6603,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13613,6 +13610,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "Ninguna coincidencia encontrada para %1$s"
@@ -13658,21 +13657,11 @@ msgstr "Lista añadida"
msgid "Entire project search"
msgstr "Búsqueda avanzada"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Ninguna coincidencia encontrada para %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "Buscar resultados de %1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "Ninguna coincidencia encontrada para %1$s"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14713,37 +14702,36 @@ msgstr ""
msgid "Is Active"
msgstr "Esta Activa"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Administración de Encuestas"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "No ha elegido tipo de licencia"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Administración de Encuestas"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -16065,7 +16053,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16420,6 +16408,17 @@ msgstr "No ha proporcionado el nombre de usuario"
msgid "Project info"
msgstr "Información del Proyecto"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "Ninguna coincidencia encontrada para %1$s"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Ninguna coincidencia encontrada para %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Confirmar"
+
#~ msgid "Error getting member object"
#~ msgstr "Error obteniendo el objeto member"
diff --git a/src/translations/eu.po b/src/translations/eu.po
index 7377f5f777..357a7edcb8 100644
--- a/src/translations/eu.po
+++ b/src/translations/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-19 23:28+0200\n"
"Last-Translator: Piarres Beobide \n"
"Language-Team: LANGUAGE \n"
@@ -3116,7 +3116,8 @@ msgstr "Hemen proiektu honetan eskuragarri dauden posizioen zerrenda dago"
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5874,25 +5875,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "Eskatutako orria ez da aurkitu (404 akatsa)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Baieztatu"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "'hash' Baieztapen hau behin baino gehiagotan gauzatzen da."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "'Hash' Baieztapen baliogabekoa"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5900,11 +5902,11 @@ msgstr "'Hash' Baieztapen baliogabekoa"
msgid "Could Not Get User"
msgstr "Ezin izan da rola eskuratu"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Posta aldaketa gauzatu da"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5912,8 +5914,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Itzuli"
@@ -6005,7 +6007,7 @@ msgstr "Pasahitza zaharra ez da zuzena"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Pasahitza egokia jarri behar duzu (gutxienez 6 karaktere)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Pasahitza berriak bat datoz."
@@ -6044,7 +6046,7 @@ msgstr "Pasahitza zaharra"
msgid "New Password (at least 6 chars)"
msgstr "Pasahitza berria (gutxienez 6 karaktere)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Pasahitza berria (errepika ezazu)"
@@ -6085,7 +6087,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6163,11 +6165,11 @@ msgstr "ID erabiltzailea:"
msgid "Login name:"
msgstr "Erabiltzailearen izena:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "Izena:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Abizena:"
@@ -6175,7 +6177,7 @@ msgstr "Abizena:"
msgid "Language:"
msgstr "Hizkuntza"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Ordutegi gunea:"
@@ -6183,7 +6185,7 @@ msgstr "Ordutegi gunea:"
msgid "Theme:"
msgstr "Gaia:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "Herrialdea:"
@@ -6196,35 +6198,35 @@ msgid "Change Email Addr"
msgstr "E-mail helbidea aldatu"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Helbidea:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Telefonoa:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "FAXa:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "Izenburua:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Jabber helbidea:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "Berri automatikoak bakarrik bidali nere Jabber helbidera"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6232,7 +6234,7 @@ msgstr ""
"Atariaren eguneraketei buruz postak jasotzeko (Trafiko gutxi. Oso "
"gomendagarria.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Komunitatearen posta gehigarriak jaso. (Tráfiko gutxi)"
@@ -6328,46 +6330,41 @@ msgstr "[Pasahitza ahaztu al zaizu?]"
msgid "[New Account]"
msgstr "[Kontu berria]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[Aktibazioaren zai dagoen kontuaren onespen mezua berriz bidali]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Baieztatu"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "'Hash' Baieztapen baliogabekoa"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "Pasahitza egokia eman behar duzu (gutxienez sei karakterekoa)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "Akatsa"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[Pasahitza ahaztu al zaizu?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Pasahitza berria (gutxienez 6 karaktere)"
@@ -6472,38 +6469,38 @@ msgstr ""
"verificar su cuenta de correo. Visitando el enlace que le hemos enviado le "
"activará la cuenta.
"
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Kontuaren izena (ez erabili maiuskularik) *:"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Pasahitza (gutxienez 6 karaktere) *:"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Pasahitza (errepika ezazu) *:"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Zure hizkuntza aukeratu"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Gaia"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "E-mail helbidea:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6511,26 +6508,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Erregistratu hadi"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "Erregistro osoa"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6538,7 +6535,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13517,6 +13514,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "Ez da ezer aurkitu %1$s -entzat"
@@ -13561,21 +13560,11 @@ msgstr "Zerrenda Gehitua"
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Ez da ezer aurkitu %1$s -entzat"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "Bilaketa emaitzak %1$s renttzat"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "Ez da ezer aurkitu %1$s -entzat"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14618,37 +14607,36 @@ msgstr ""
msgid "Is Active"
msgstr "Aktibatua dago"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Inkesten administrazioa"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "Ez duzu lizentzia mota aukeratu"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Inkesten administrazioa"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15957,7 +15945,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16308,6 +16296,17 @@ msgstr "Ez da erabiltzaile-izenik eman"
msgid "Project info"
msgstr "Proiektuaren informazioa"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "Ez da ezer aurkitu %1$s -entzat"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Ez da ezer aurkitu %1$s -entzat"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Baieztatu"
+
#~ msgid "Error getting member object"
#~ msgstr "Errorea partaide objektua eskuratzean"
diff --git a/src/translations/fr.po b/src/translations/fr.po
index 9482aa0e91..8ec553a360 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -6,11 +6,12 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionForge 4.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
-"PO-Revision-Date: 2010-10-06 14:17+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
+"PO-Revision-Date: 2010-10-06 15:24+0200\n"
"Last-Translator: Roland Mas \n"
"Language-Team: FusionForge team \n"
"Language: fr\n"
+"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -19,48 +20,48 @@ msgstr ""
#: common/docman/Document.class.php:113 common/docman/Document.class.php:448
#: common/pm/ProjectGroup.class.php:145 common/pm/ProjectGroup.class.php:328
msgid "Title Must Be At Least 5 Characters"
-msgstr "Le titre doit avoir au moins 5 caractères"
+msgstr "Le titre doit avoir au moins 5 caractères."
#: common/docman/Document.class.php:117 common/docman/Document.class.php:452
#: common/pm/ProjectGroup.class.php:149 common/pm/ProjectGroup.class.php:332
msgid "Document Description Must Be At Least 10 Characters"
-msgstr "La description du document doit avoir au moins 10 caractères"
+msgstr "La description du document doit avoir au moins 10 caractères."
#: common/docman/Document.class.php:192
msgid "Document:: Invalid docid"
-msgstr "Document : numéro de document invalide"
+msgstr "Document : numéro de document invalide."
#: common/docman/DocumentFactory.class.php:165
msgid "No Documents Found"
-msgstr "Aucun document trouvé"
+msgstr "Aucun document trouvé."
#: common/docman/DocumentGroup.class.php:97
msgid "DocumentGroup: name is Required"
-msgstr "Groupe de documents : le nom est obligatoire"
+msgstr "Groupe de documents : le nom est obligatoire."
#: common/docman/DocumentGroup.class.php:107
#: common/docman/DocumentGroup.class.php:277
msgid "DocumentGroup: Invalid DocumentGroup parent ID"
-msgstr "DocumentGroup: ID parent non valable"
+msgstr "DocumentGroup: ID parent non valable."
#: common/docman/DocumentGroup.class.php:125
#: common/docman/DocumentGroup.class.php:289
msgid "Group name already exists"
-msgstr "Le nom du groupe est déjà pris"
+msgstr "Le nom du groupe est déjà pris."
#: common/docman/DocumentGroup.class.php:201
#: common/docman/include/utils.php:35 common/docman/include/utils.php:47
msgid "DocumentGroup: Invalid DocumentGroup ID"
-msgstr "Groupe de documents : numéro de groupe de documents invalide"
+msgstr "Groupe de documents : numéro de groupe de documents invalide."
#: common/docman/actions/addfile.php:45 www/docman/new.php:61
msgid "No valid Document Group was selected."
-msgstr "Aucun groupe de document défini"
+msgstr "Aucun groupe de document défini."
#: common/docman/actions/addfile.php:62 common/docman/actions/addfile.php:75
#: www/docman/new.php:70 www/docman/new.php:82
msgid "Error getting blank document."
-msgstr "Erreur lors de l'ajout d'un document"
+msgstr "Erreur lors de l'ajout d'un document."
#: common/docman/actions/addfile.php:89 www/docman/new.php:95
msgid "Invalid file name."
@@ -68,11 +69,11 @@ msgstr "Nom de fichier invalide."
#: common/docman/actions/addfile.php:119
msgid "Document submitted successfully"
-msgstr "Le document a été soumis avec succès"
+msgstr "Le document a été soumis avec succès."
#: common/docman/actions/addfile.php:122
msgid "Document submitted successfully : pending state (need validation)"
-msgstr "Le document a été soumis avec succès (en attente de validation)"
+msgstr "Le document a été soumis avec succès (en attente de validation)."
#: common/docman/actions/addsubdocgroup.php:34
#: common/docman/actions/deldir.php:34 common/docman/actions/editfile.php:34
@@ -100,7 +101,7 @@ msgstr "Le groupe de documents a été mis à jour avec succès."
#: common/docman/actions/editfile.php:68
#, php-format
msgid "Invalid file attack attempt %1$s"
-msgstr "Tentative d'attaque par fichier invalide (%1$s)"
+msgstr "Tentative d'attaque par fichier invalide (%1$s)."
#: common/docman/actions/editfile.php:99
msgid "Document Updated successfully"
@@ -390,7 +391,9 @@ msgstr "Modifier"
msgid ""
"Directory name will be used as a title, so it should be formatted "
"correspondingly."
-msgstr "Le nom du répertoire sera utilisé comme titre. Il doit donc être formaté en conséquence."
+msgstr ""
+"Le nom du répertoire sera utilisé comme titre. Il doit donc être formaté en "
+"conséquence."
#: common/docman/views/listfile.php:94
msgid "Edit this directory"
@@ -618,7 +621,9 @@ msgstr ""
#: common/forum/ForumMessage.class.php:271
#: www/forum/admin/ForumAdmin.class.php:457
msgid "Couldn't Update Master Thread parent with current time"
-msgstr "Ãchec lors de la mise à jour du fil de discussion principal avec la date courante"
+msgstr ""
+"Ãchec lors de la mise à jour du fil de discussion principal avec la date "
+"courante"
#: common/forum/ForumMessage.class.php:194
#: common/forum/ForumMessage.class.php:282
@@ -706,7 +711,9 @@ msgstr "Le nom du fichier doit compter au moins 3 caractères"
msgid ""
"Filename can only be alphanumeric and \"-\" \"_\" \"+\" \".\" \"~\" "
"characters."
-msgstr "Le nom de fichier ne peut contenir que des caractères alphanumériques ainsi que « - », « _ », « . », « + » et « ~ »."
+msgstr ""
+"Le nom de fichier ne peut contenir que des caractères alphanumériques ainsi "
+"que « - », « _ », « . », « + » et « ~ »."
#: common/frs/FRSFile.class.php:107
msgid "FRSFile Appears to be invalid"
@@ -2788,7 +2795,9 @@ msgstr "Utilisateurs au statut P (en attente)"
#: common/widget/Widget_MyAdmin.class.php:57
#, php-format
msgid "Validated users pending email activation"
-msgstr "Utilisateurs validés en attente de confirmation par email"
+msgstr ""
+"Utilisateurs validés en attente de confirmation par email"
+"b>"
#: common/widget/Widget_MyAdmin.class.php:71
#, php-format
@@ -3049,13 +3058,14 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
msgstr[0] ""
-"NOUS AVONS BESOIN D'AIDE : ce projet recherche un "
-"\"%2$s\""
+"NOUS AVONS BESOIN D'AIDE : ce projet recherche un contributeur\n"
+"pour un poste."
msgstr[1] ""
"NOUS AVONS BESOIN D'AIDE : ce projet recherche des contributeurs pour "
"différentes positions."
@@ -4152,7 +4162,10 @@ msgid ""
"You can move and delete the tabs that you already added. Please note that "
"those extra tabs can only appear after the standard tabs. And you can only "
"move them inside the set of extra tabs."
-msgstr "Vous pouvez déplacer et supprimer les onglets supplémentaires déjà ajoutés. Note : ces onglets supplémentaires apparaissent forcément à droite des onglets standard, et ne peuvent être réordonnés qu'entre eux."
+msgstr ""
+"Vous pouvez déplacer et supprimer les onglets supplémentaires déjà ajoutés. "
+"Note : ces onglets supplémentaires apparaissent forcément à droite des "
+"onglets standard, et ne peuvent être réordonnés qu'entre eux."
#: plugins/extratabs/www/index.php:207
msgid "Tab to modify:"
@@ -5824,34 +5837,35 @@ msgstr "Ce groupe n'a pas de calendrier."
msgid "Requested Page not Found (Error 404)"
msgstr "La page demandée n'a pas été trouvée (Erreur 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr "Hash de confirmation"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Le hash de confirmation est en plusieurs exemplaires."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr "Hash de confirmation invalide."
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr "Erreur lors de la récupération de l'objet User."
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Changement d'adresse e-mail effectué"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5863,8 +5877,8 @@ msgstr ""
"%2$s. Les courriers envoyés à <%3$s> seront "
"dorénavant redirigée vers cette adresse."
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Retour"
@@ -5904,7 +5918,9 @@ msgstr "Confirmation de changement d'adresse e-mail"
msgid ""
"An email has been sent to the new address. Follow the instructions in the "
"email to complete the email change."
-msgstr "Un message a été envoyé à la nouvelle adresse. Suivez les instructions qu'il contient pour valider le changement d'adresse."
+msgstr ""
+"Un message a été envoyé à la nouvelle adresse. Suivez les instructions "
+"qu'il contient pour valider le changement d'adresse."
#: www/account/change_email.php:79
msgid "Email change"
@@ -5922,7 +5938,11 @@ msgid ""
"of access we grant via this account. If we need to reach a user for issues "
"arriving from a shell or project account, it is important that we be able to "
"do so."
-msgstr "Nous avons besoin d'une adresse valide pour chaque utilisateur en raison du niveau d'accès accordé via ce compte. Si nous avons besoin de joindre un utilisateur à cause de problèmes en provenance d'un compte shell ou projet, il est important que nous puissions le faire."
+msgstr ""
+"Nous avons besoin d'une adresse valide pour chaque utilisateur en raison du "
+"niveau d'accès accordé via ce compte. Si nous avons besoin de joindre un "
+"utilisateur à cause de problèmes en provenance d'un compte shell ou projet, "
+"il est important que nous puissions le faire."
#: www/account/change_email.php:83
msgid ""
@@ -5946,7 +5966,7 @@ msgstr "Ancien mot de passe incorrect"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Vous devez donner un mot de passe valide (6 caractères minimum)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Les nouveaux mots de passe ne concordent pas."
@@ -5987,7 +6007,7 @@ msgstr "Ancien mot de passe"
msgid "New Password (at least 6 chars)"
msgstr "Nouveau mot de passe (6 caractères minimum)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Nouveau mot de passe (confirmez)"
@@ -6043,7 +6063,7 @@ msgstr ""
"attendiez."
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6117,11 +6137,11 @@ msgstr "Identifiant utilisateur :"
msgid "Login name:"
msgstr "Nom du compte :"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "Prénom :"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Nom de famille :"
@@ -6129,7 +6149,7 @@ msgstr "Nom de famille :"
msgid "Language:"
msgstr "Langue :"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Fuseau horaire :"
@@ -6137,7 +6157,7 @@ msgstr "Fuseau horaire :"
msgid "Theme:"
msgstr "Thème :"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "Pays :"
@@ -6150,35 +6170,35 @@ msgid "Change Email Addr"
msgstr "Modifier mon adresse e-mail"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Adresse :"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Téléphone :"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "Fax :"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "Titre :"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Adresse Jabber :"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "N'envoyer les notifications automatiques qu'Ã mon adresse Jabber"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6187,7 +6207,7 @@ msgstr ""
"(Faible trafic et informations relatives à la sécurité. Fortement "
"recommandé.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
"Recevoir des messages additionnels concernant la communauté. (Faible "
@@ -6303,23 +6323,19 @@ msgstr "[Perdu votre mot de passe ?]"
msgid "[New Account]"
msgstr "[Nouveau compte]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[Renvoyer l'email de confirmation à un compte en attente]"
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr "Hash de confirmation : "
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "Hash de confirmation invalide"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "Vous devez fournir un mot de passe valide (au moins 6 caractères)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
@@ -6329,21 +6345,21 @@ msgstr ""
"de votre compte. Vous pouvez à présent vous connecter "
"au site."
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "ERREUR"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr "Connexion avec mot de passe perdu"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr "Bienvenue, %s. Vous pouvez maintenant changer votre mot de passe."
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Nouveau mot de passe (6 caractères minimum)"
@@ -6459,7 +6475,7 @@ msgstr ""
"adresse e-mail. Suivez le lien qui vous a été envoyé pour activer votre "
"compte.
"
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
@@ -6467,31 +6483,31 @@ msgstr ""
"Identifiant de connexion (en minuscules ; si vous laissez ce champ vide, un "
"identifiant sera généré automatiquement) :"
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Nom du compte (ne pas utiliser de majuscules)Â :"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Mot de passe (6 caractères minimum) :"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Mot de passe (confirmez)Â :"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Langue :"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Thème :"
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr "Adresse e-mail :"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6503,26 +6519,26 @@ msgstr ""
"redirection de la forme <loginname@%1$s>, qui renverra vers\n"
"votre adresse."
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
"Acceptez-vous les conditions d'utilisation de ce site ?"
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr "Les champs marqués avec %s sont obligatoires."
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "S'inscrire"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr "Désabonnement effectué"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6533,7 +6549,7 @@ msgstr ""
"notifications de %1$s. Si vous voulez réactiver ces abonnements,\n"
"connectez-vous sur votre page de gestion du compte."
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -7606,9 +7622,9 @@ msgstr "Membre depuis le"
msgid "Group search with criteria %s: %d match"
msgid_plural "Group search with criteria %s: %d matches"
msgstr[0] ""
-"Recherche de groupes selon les critères %1$s : %2$s résultat"
+"Recherche de groupes selon les critères %1$s : %2$d résultat"
msgstr[1] ""
-"Recherche de groupes selon les critères %1$s : %2$s résultats"
+"Recherche de groupes selon les critères %1$s : %2$d résultats"
#: www/admin/search.php:158
msgid "Full Name"
@@ -13386,9 +13402,8 @@ msgid "Commits By User"
msgstr "Envois par utilisateur"
#: www/scm/reporting/index.php:30
-#, fuzzy
msgid "SCM Repository Reporting"
-msgstr "Dépôt de sources"
+msgstr "Statistiques sur le dépôt de sources"
#: www/scm/viewvc.php:94
#, fuzzy, php-format
@@ -13473,17 +13488,20 @@ msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:195
#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:198
-#, fuzzy, php-format
+#, php-format
msgid ""
"No matches found for %s - No sections available (check your "
"permissions)"
msgstr ""
-"Aucun résultat trouvé - Aucune section disponible (vérifiez vos permissions)"
+"Aucun résultat trouvé pour %s - Aucune section disponible\n"
+"(vérifiez vos permissions)."
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
-#, fuzzy, php-format
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
+#, php-format
msgid "No matches found for %s"
-msgstr "Aucun résultat trouvé pour %1$s"
+msgstr "Aucun résultat trouvé pour %1$s."
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:336
msgid "with all words"
@@ -13525,21 +13543,11 @@ msgstr "Date de publication"
msgid "Entire project search"
msgstr "Recherche des projets avancée"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Aucun résultat trouvé pour %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "Résultats de la recherche de %1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "Aucun résultat trouvé pour %1$s"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14600,37 +14608,36 @@ msgstr ""
msgid "Is Active"
msgstr "Est actif"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Administration de sondages"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "Administration du projet"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Administration de sondages"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15960,8 +15967,8 @@ msgstr "Arrêter la surveillance"
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
-msgstr "(% pour les jokers)"
+msgid "(%% for wildcards)"
+msgstr "(%% pour les jokers)"
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
msgid "Related Tasks"
@@ -16308,6 +16315,19 @@ msgstr "Aucun nom d'utilisateur n'a été fourni"
msgid "Project info"
msgstr "Information sur un projet"
+#~ msgid "(% for wildcards)"
+#~ msgstr "(% pour les jokers)"
+
+#~ msgid "No matches found for %1$s"
+#~ msgstr "Aucun résultat trouvé pour %1$s"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Aucun résultat trouvé pour %1$s"
+
+#~ msgid "Confirm Has"
+#~ msgstr "Hash de confirmation : "
+
#~ msgid "Error getting member object"
#~ msgstr "Erreur lors de la création d'un objet membre"
diff --git a/src/translations/gforge.pot b/src/translations/gforge.pot
index 2dfd602e13..5045bb2666 100644
--- a/src/translations/gforge.pot
+++ b/src/translations/gforge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -2845,7 +2845,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5455,34 +5456,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5490,8 +5492,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5566,7 +5568,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5602,7 +5604,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5643,7 +5645,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5709,11 +5711,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5721,7 +5723,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5729,7 +5731,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5742,41 +5744,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5870,44 +5872,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5991,37 +5989,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6029,25 +6027,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6055,7 +6053,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12543,6 +12541,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12586,21 +12586,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13571,36 +13561,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14831,7 +14820,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/gl.po b/src/translations/gl.po
index 22ad9826ff..2419eea63f 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.8.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-09-21 10:21+0100\n"
"Last-Translator: José Manuel CastroagudÃn Silva \n"
"Language-Team: Galician \n"
@@ -3134,9 +3134,10 @@ msgstr ""
"proxecto"
#: common/widget/Widget_ProjectInfo.class.php:102
-#, php-format
+#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -6041,25 +6042,26 @@ msgstr "Este grupo non ten calendario"
msgid "Requested Page not Found (Error 404)"
msgstr "Non se atopou a páxina solicitada (Erro 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Confirmar"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Este hash de confirmación existe máis dunha vez. "
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "O hash de confirmación non é válido "
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -6067,11 +6069,11 @@ msgstr "O hash de confirmación non é válido "
msgid "Could Not Get User"
msgstr "Non se puido obter o Rol"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Completouse o cambio de correo electrónico"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -6082,8 +6084,8 @@ msgstr ""
"enderezo de correo electrónico é %2$s. O correo enviado a "
"<%3$s> será reenviado a esta conta."
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Volver "
@@ -6180,7 +6182,7 @@ msgstr "O contrasinal antigo é incorrecto "
msgid "You must supply valid password (at least 6 chars)"
msgstr "Debe proporcionar un contrasinal válido (6 caracteres como mÃnimo) "
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Os novos contrasinais non coinciden. "
@@ -6219,7 +6221,7 @@ msgstr "Contrasinal antigo"
msgid "New Password (at least 6 chars)"
msgstr "Contrasinal novo (cando menos 6 caracteres)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Contrasinal novo (repÃtao) "
@@ -6275,7 +6277,7 @@ msgstr ""
"chaves no ficheiro é o esperado."
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6348,11 +6350,11 @@ msgstr "ID de usuario: "
msgid "Login name:"
msgstr "Nome de usuario: "
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "Nome: "
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Apelidos: "
@@ -6360,7 +6362,7 @@ msgstr "Apelidos: "
msgid "Language:"
msgstr "Idioma: "
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Zona horaria: "
@@ -6368,7 +6370,7 @@ msgstr "Zona horaria: "
msgid "Theme:"
msgstr "Tema: "
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "PaÃs: "
@@ -6381,35 +6383,35 @@ msgid "Change Email Addr"
msgstr "Cambiar enderezo de correo electrónico"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Enderezo: "
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Teléfono: "
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "Fax: "
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "TÃtulo: "
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Enderezo de Jabber: "
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "Enviar as novas autoxeradas só á miña conta de Jabber "
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6417,7 +6419,7 @@ msgstr ""
"Recibir correos sobre as actualizacións do sitio (Ten pouco tráfico e "
"inclúe novas sobre seguranza. à unha opción altamente recomendábel.) "
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Recibir correos adicionais da comunidade. (Tráfico baixo.) "
@@ -6529,25 +6531,20 @@ msgstr "[Esqueceu o seu contrasinal?] "
msgid "[New Account]"
msgstr "[Conta nova] "
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[Reenviar o correo de confirmación a unha conta pendente] "
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Confirmar"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "O hash de confirmación non é válido "
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
"Ten de proporcionar un contrasinal válido (con, cando menos, 6 caracteres). "
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
@@ -6556,21 +6553,21 @@ msgstr ""
"
Cambiouse o contrasinal
Parabéns, acaba de restabelecer o seu "
"contrasinal da conta. Pode acceder ao sitio agora.
"
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "Erro "
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr "Acceso co contrasinal esquecido"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr "Benvido/a, %s. Agora pode cambiar o contrasinal."
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Contrasinal novo (mÃn. 6 caracteres)"
@@ -6684,38 +6681,38 @@ msgstr ""
"confirmación para verificar o seu enderezo de correo. Visite a ligazón que "
"se lle envÃa no correo para activar a súa conta. "
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr "Nome "
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Nome da conta (non use maiúsculas):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Contrasinal (cando menos 6 caracteres):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Contrasinal (repÃtao):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Selección de idioma: "
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Tema"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Enderezo de correo electrónico:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, fuzzy, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6726,25 +6723,25 @@ msgstr ""
"correo verificarase antes de activar a conta. Recibirá un correo de reenvÃo "
"en <loginname@%1$s> que se reenviará a este enderezo. "
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr "Acepta os termos de uso para este sitio?"
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr "Os campos marcados con %s son obrigados."
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Rexistrar"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr "Completouse a desubscrición"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6755,7 +6752,7 @@ msgstr ""
"caso de que queira reactivar as súas subscricións no futuro, acceda ao "
"sistema e visite a páxina de mantemento da súa conta."
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13883,6 +13880,8 @@ msgstr ""
"(comprobe os seus permisos) "
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "Non se achou ningunha coincidencia para %1$s"
@@ -13927,21 +13926,11 @@ msgstr "Data da publicación"
msgid "Entire project search"
msgstr "Procura avanzada no proxecto "
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Non se achou ningunha coincidencia para %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "Resultados da procura para %1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "Non se achou ningunha coincidencia para %1$s"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -15011,37 +15000,36 @@ msgstr ""
msgid "Is Active"
msgstr "Está activa"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Administración de enquisas"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "Administración do proxecto "
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Administración de enquisas"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -16367,8 +16355,8 @@ msgstr "Deixar de monitorizar"
#: www/tracker/include/ArtifactTypeHtml.class.php:241
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
-#, php-format
-msgid "(% for wildcards)"
+#, fuzzy, php-format
+msgid "(%% for wildcards)"
msgstr "(empregue % como comodÃn)"
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16718,6 +16706,20 @@ msgstr "Non se introduciu un nome de usuario"
msgid "Project info"
msgstr "Información do proxecto"
+#~ msgid "(% for wildcards)"
+#~ msgstr "(empregue % como comodÃn)"
+
+#~ msgid "No matches found for %1$s"
+#~ msgstr "Non se achou ningunha coincidencia para %1$s"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Non se achou ningunha coincidencia para %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Confirmar"
+
#~ msgid "Error getting member object"
#~ msgstr "Erro ao obter o obxecto de membro"
diff --git a/src/translations/he.po b/src/translations/he.po
index 5b826741d6..49352870dc 100644
--- a/src/translations/he.po
+++ b/src/translations/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:36+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -2843,7 +2843,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5453,34 +5454,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5488,8 +5490,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5564,7 +5566,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5600,7 +5602,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5641,7 +5643,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5707,11 +5709,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5719,7 +5721,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5727,7 +5729,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5740,41 +5742,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5868,44 +5870,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5989,37 +5987,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6027,25 +6025,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6053,7 +6051,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12541,6 +12539,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12584,21 +12584,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13569,36 +13559,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14829,7 +14818,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/id.po b/src/translations/id.po
index 27e1cb44ee..2bfa7c8f21 100644
--- a/src/translations/id.po
+++ b/src/translations/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:36+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -2843,7 +2843,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5453,34 +5454,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5488,8 +5490,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5564,7 +5566,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5600,7 +5602,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5641,7 +5643,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5707,11 +5709,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5719,7 +5721,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5727,7 +5729,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5740,41 +5742,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5868,44 +5870,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5989,37 +5987,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6027,25 +6025,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6053,7 +6051,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12541,6 +12539,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12584,21 +12584,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13569,36 +13559,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14829,7 +14818,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/it.po b/src/translations/it.po
index 70a9b4d733..742fe2bd48 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
-"PO-Revision-Date: 2010-05-06 14:22+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
+"PO-Revision-Date: 2010-10-06 15:06+0200\n"
"Last-Translator: Reinhard Spisser \n"
"Language-Team: LANGUAGE \n"
"Language: it\n"
@@ -903,8 +903,8 @@ msgstr "ERRORE: DB: Impossibile cambiare proprieta' gruppo: %s"
#, php-format
msgid "New Doc Address Appeared Invalid: %s"
msgid_plural "New Doc Addresses Appeared Invalid: %s"
-msgstr[0] "L'indirizzo del nuovo documento non è valido"
-msgstr[1] "Gli indirizzi del nuovo documento non sono validi"
+msgstr[0] "L'indirizzo del nuovo documento non è valido: %s"
+msgstr[1] "Gli indirizzi del nuovo documento non sono validi: %s"
#: common/include/Group.class.php:570
msgid ""
@@ -3148,7 +3148,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5939,25 +5940,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "Pagina richiesta non trovata (Errore 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Conferma"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Il codice hash di conferma esiste più volte."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "Il codice hash di conferma non è valido."
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5965,11 +5967,11 @@ msgstr "Il codice hash di conferma non è valido."
msgid "Could Not Get User"
msgstr "Impossibile completare l'operazione"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Cambio indirizzo email completato"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5977,8 +5979,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Torna"
@@ -6070,7 +6072,7 @@ msgstr "La vecchia password non è corretta"
msgid "You must supply valid password (at least 6 chars)"
msgstr "La nuova password non è valida (deve essere di almeno 6 caratteri)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Le password non corrispondono."
@@ -6109,7 +6111,7 @@ msgstr "Vecchia password"
msgid "New Password (at least 6 chars)"
msgstr "Nuova password (almeno 6 caratteri)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Conferma nuova password"
@@ -6163,7 +6165,7 @@ msgstr ""
"di chiavi del file è quello atteso."
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6238,11 +6240,11 @@ msgstr "ID Utente:"
msgid "Login name:"
msgstr "Nome login:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "Nome:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Cognome:"
@@ -6250,7 +6252,7 @@ msgstr "Cognome:"
msgid "Language:"
msgstr "Lingua:"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Fuso orario:"
@@ -6258,7 +6260,7 @@ msgstr "Fuso orario:"
msgid "Theme:"
msgstr "Tema:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "Nazione:"
@@ -6271,36 +6273,36 @@ msgid "Change Email Addr"
msgstr "Cambia indirizzo e-mail"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Indirizzo completo:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Telefono:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "FAX:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "Titolo:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Indirizzo Jabber:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
"Invia le notifiche generate automaticamente solo al mio indirizzo Jabber"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6309,7 +6311,7 @@ msgstr ""
"include informazioni sulla sicurezza. Si raccomanda di attivare questa "
"opzione)."
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Desidero ricevere email dalla comunità (poco traffico)."
@@ -6405,46 +6407,41 @@ msgstr "[Hai dimenticato la password?]"
msgid "[New Account]"
msgstr "[Nuovo account]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[Rispedisci l'email di conferma di un nuovo account]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Conferma"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "Il codice hash di conferma non è valido."
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "La password deve essere valida (minimo 6 caratteri)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "ERRORE"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[Hai dimenticato la password?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Nuova password (minimo 6 caratteri)"
@@ -6551,38 +6548,38 @@ msgstr ""
"email di conferma per verificare il tuo indirizzo email. Visita il link "
"indicato nella email per attivare il tuo account."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Login (non usare maiuscole):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Password (minimo 6 caratteri):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Conferma password:"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Lingua preferita:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Tema"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Indirizzo e-mail:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6590,26 +6587,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Registra"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "Registrazione completata"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6617,7 +6614,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13659,6 +13656,8 @@ msgstr ""
"(controlla i tuoi privilegi)"
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "Nessuna occorrenza trovata per %1$s"
@@ -13704,21 +13703,11 @@ msgstr "Data di inserimento"
msgid "Entire project search"
msgstr "Ricerca avanzata"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Nessuna occorrenza trovata per %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "Risultati per %1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "Nessuna occorrenza trovata per %1$s"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14762,37 +14751,36 @@ msgstr ""
msgid "Is Active"
msgstr "Attivo"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Amministrazione sondaggi"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "Non hai scelto una licenza"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Amministrazione sondaggi"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -16124,7 +16112,7 @@ msgstr "Termina notifica"
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16481,6 +16469,17 @@ msgstr "Non è stato inserito alcun file"
msgid "Project info"
msgstr "Informazioni progetto"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "Nessuna occorrenza trovata per %1$s"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Nessuna occorrenza trovata per %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Conferma"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "Errore nella creazione del progetto"
diff --git a/src/translations/ja.po b/src/translations/ja.po
index c96e19ea6f..d9da4ecd72 100644
--- a/src/translations/ja.po
+++ b/src/translations/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-01-15 14:05+0100\n"
"Last-Translator: Roland Mas \n"
"Language-Team: LANGUAGE \n"
@@ -3011,7 +3011,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5688,26 +5689,27 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
"(æªè¨³ï¼account_lostlogin.severalconfirm)This confirm hash exists more than "
"once."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "(æªè¨³ï¼account_lostlogin.invalidconfirm)Invalid confirmation hash"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5715,11 +5717,11 @@ msgstr "(æªè¨³ï¼account_lostlogin.invalidconfirm)Invalid confirmation hash"
msgid "Could Not Get User"
msgstr "ãã¼ããã·ã§ã³ãåå¾ã§ãã¾ããã"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5727,8 +5729,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5820,7 +5822,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "æ°è¦ãã¹ã¯ã¼ãã確èªã¨ããããã¾ããã§ããã"
@@ -5857,7 +5859,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "æ°è¦ãã¹ã¯ã¼ã(確èª)"
@@ -5898,7 +5900,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5974,11 +5976,11 @@ msgstr ""
msgid "Login name:"
msgstr "ãã°ã¤ã³å:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5986,7 +5988,7 @@ msgstr ""
msgid "Language:"
msgstr "ã©ã³ã²ã¼ã¸"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "ã¿ã¤ã ã¾ã¼ã³:"
@@ -5994,7 +5996,7 @@ msgstr "ã¿ã¤ã ã¾ã¼ã³:"
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -6007,44 +6009,44 @@ msgid "Change Email Addr"
msgstr "ã¡ã¼ã«ã¢ãã¬ã¹å¤æ´"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Jabberã¢ãã¬ã¹:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
"(æªè¨³ï¼account_register.jabberonly)Send auto-generated notices only to my "
"Jabber address"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
"ãµã¤ãã®ææ°æ
å ±(ã»ãã¥ãªãã£æ
å ±ãå«ã)ã«é¢ããã¡ã¼ã«ãåãåã"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "追å ãããã³ãã¥ããã£ã®ã¡ã¼ã«ãåãåãã¾ãã"
@@ -6140,45 +6142,41 @@ msgstr "[ãã¹ã¯ã¼ããå¿ãã¾ãããï¼]"
msgid "[New Account]"
msgstr "[æ°è¦ã¢ã«ã¦ã³ã]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "(æªè¨³ï¼account_lostlogin.invalidconfirm)Invalid confirmation hash"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "æå¹ãªãã¹ã¯ã¼ããå
¥åãã¦ãã ãã(æä½ 6 æå以ä¸)"
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[ãã¹ã¯ã¼ããå¿ãã¾ãããï¼]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "æ°è¦ãã¹ã¯ã¼ã(æä½ 6 æå以ä¸)"
@@ -6278,38 +6276,38 @@ msgstr ""
"ã®æå¹æ§ããã§ãã¯ããããã«ç¢ºèªã®ã¡ã¼ã«ãéä¿¡ãã¾ãããã¡ã¼ã«ã«è¨è¿°ããããª"
"ã³ã¯ããã©ããã¢ã«ã¦ã³ããã¢ã¯ãã£ãã«ãã¦ãã ããã"
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "ãã°ã¤ã³å(大æåã使ç¨ãã¦ã¯ããã¾ãã)"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "ãã¹ã¯ã¼ã(æä½ 6 æå以ä¸):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "ãã¹ã¯ã¼ã(確èª):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "ã©ã³ã²ã¼ã¸é¸æ:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "ã¡ã¼ã«ã¢ãã¬ã¹:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6317,25 +6315,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "ç»é²"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6343,7 +6341,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13022,6 +13020,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "ãã¥ã¼ã¹ãè¦ã¤ããã¾ãã"
@@ -13065,21 +13065,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "ãã¥ã¼ã¹ãè¦ã¤ããã¾ãã"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14065,37 +14055,36 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr ""
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "ããªãã«å²ãå½ã¦ãããã¿ã¹ã¯ã¯ããã¾ããã"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr ""
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15341,7 +15330,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -15680,6 +15669,10 @@ msgstr ""
msgid "Project info"
msgstr "ããã¸ã§ã¯ã管ç"
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "ãã¥ã¼ã¹ãè¦ã¤ããã¾ãã"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "ã¢ã«ã¦ã³ããã¢ã¯ãã£ãã«ããã¨ãã«ã¨ã©ã¼ãçºçãã¾ãã"
diff --git a/src/translations/ko.po b/src/translations/ko.po
index 5813932f5a..c0d7542435 100644
--- a/src/translations/ko.po
+++ b/src/translations/ko.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:36+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -3084,7 +3084,8 @@ msgstr "Here is a list of positions available for this project."
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5821,25 +5822,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "ìì²íì íì´ì§ë¥¼ ì°¾ì ì ììµëë¤.(Error 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "íì¸"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "íì¸ì ì¬ì©ë hashê°ê³¼ ëì¼í hashê°ì´ íë ì´ì ì¡´ì¬í©ëë¤."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "íì¸ì ì¬ì©ë hashê°ì´ ë§ì§ ììµëë¤."
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5847,11 +5849,11 @@ msgstr "íì¸ì ì¬ì©ë hashê°ì´ ë§ì§ ììµëë¤."
msgid "Could Not Get User"
msgstr "Could Not Complete Operation"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "ì´ë©ì¼ 주ì ë³ê²½ ìê²°"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5859,8 +5861,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "ëëìê°ê¸°"
@@ -5951,7 +5953,7 @@ msgstr "기존 ë¹ë°ë²í¸ê° ë§ì§ ììµëë¤."
msgid "You must supply valid password (at least 6 chars)"
msgstr "ì í¨í ë¹ë°ë²í¸ë¥¼ ì
ë ¥íì
ì¼ í©ëë¤. (6ê¸ì ì´ì)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "ì ë¹ë°ë²í¸ê° ìë¡ ì¼ì¹íì§ ììµëë¤."
@@ -5990,7 +5992,7 @@ msgstr "기존 ë¹ë°ë²í¸"
msgid "New Password (at least 6 chars)"
msgstr "ìë¡ì´ ë¹ë°ë²í¸ (6ê¸ì ì´ì)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "ìë¡ì´ ë¹ë°ë²í¸ (íë²ë)"
@@ -6031,7 +6033,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6108,11 +6110,11 @@ msgstr "User ID:"
msgid "Login name:"
msgstr "ì¬ì©ì ID:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -6120,7 +6122,7 @@ msgstr ""
msgid "Language:"
msgstr "ì¸ì´:"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "ìê°ë:"
@@ -6128,7 +6130,7 @@ msgstr "ìê°ë:"
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -6141,35 +6143,35 @@ msgid "Change Email Addr"
msgstr "ì´ë©ì¼ 주ì ë³ê²½"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "Title:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Jabber 주ì:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "ìëìì±ëë ë©ìì§ë Jabber 주ìë¡ë§ ë³´ë´ê¸°"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6177,7 +6179,7 @@ msgstr ""
"ì¬ì´í¸ ì
ë°ì´í¸ì ê´í ìì ë©ì¼ë¡ ë°ê¸° (í¸ëí½ì´ ê±°ì ìì¼ë©° ë³´ì ê´ë ¨ ê³µ"
"ì§ì¬íì í¬í¨íë¯ë¡ ë©ì¼ì ë°ì ë³´ì기를 ê¶ì¥í©ëë¤.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "커뮤ëí° ê´ë ¨ ë©ì¼ ë°ê¸°. (í¸ëí½ ë³ë¡ ìì.)"
@@ -6273,46 +6275,41 @@ msgstr "[ë¹ë°ë²í¸ë¥¼ ìì¼ì
¨ëì?]"
msgid "[New Account]"
msgstr "[ìë¡ì´ ê³ì ë§ë¤ê¸°(ê°ì
í기)]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "íì¸"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "íì¸ì ì¬ì©ë hashê°ì´ ë§ì§ ììµëë¤."
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "ì í¨í ë¹ë°ë²í¸ë¥¼ ì
ë ¥íì
ì¼ í©ëë¤. (ìµì 6ê¸ì ì´ì)"
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "ERROR"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[ë¹ë°ë²í¸ë¥¼ ìì¼ì
¨ëì?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "ìë¡ì´ ë¹ë°ë²í¸ (6ê¸ì ì´ì)"
@@ -6413,38 +6410,38 @@ msgstr ""
"기 ìí íì¸ ë©ì¼ì ë°ì¼ìê² ë©ëë¤. ë©ì¼ì í¬í¨ëì´ ìë URLì í´ë¦íìë©´ ê³"
"ì ì ì¬ì©íì¤ ì ììµëë¤."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "ì¬ì©ì ID(ë문ìë ì°ì§ ë§ììì¤.):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "ë¹ë°ë²í¸ (ìµì 6 ê¸ì):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "ë¹ë°ë²í¸ (ë¤ì):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "ì¸ì´ ì í:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "ì´ë©ì¼ 주ì:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6452,26 +6449,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "ë±ë¡í기"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "ë±ë¡ ìë£"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6479,7 +6476,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13397,6 +13394,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "%1$sì ëí ê²ìíì´ ììµëë¤."
@@ -13441,21 +13440,11 @@ msgstr "ëë ê°±ì "
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "%1$sì ëí ê²ìíì´ ììµëë¤."
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14492,37 +14481,36 @@ msgstr ""
msgid "Is Active"
msgstr "Is Active"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Survey Administration"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "ë¼ì´ì¼ì¤ë¥¼ ì ííì§ ìììµëë¤."
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Survey Administration"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15811,7 +15799,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16167,6 +16155,14 @@ msgstr "ì¬ì©ìID"
msgid "Project info"
msgstr "íë¡ì í¸ ì ë³´"
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "%1$sì ëí ê²ìíì´ ììµëë¤."
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "íì¸"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "그룹 ê°ì²´ ìì± ì¤ë¥"
diff --git a/src/translations/la.po b/src/translations/la.po
index d95dbaf1b9..483006ea46 100644
--- a/src/translations/la.po
+++ b/src/translations/la.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:36+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -2843,7 +2843,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5453,34 +5454,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5488,8 +5490,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5564,7 +5566,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5600,7 +5602,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5641,7 +5643,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5707,11 +5709,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5719,7 +5721,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5727,7 +5729,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5740,41 +5742,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5868,44 +5870,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5989,37 +5987,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6027,25 +6025,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6053,7 +6051,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12541,6 +12539,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12584,21 +12584,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13569,36 +13559,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14829,7 +14818,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/nb.po b/src/translations/nb.po
index aac3717fd7..a2411fd179 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:36+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -2843,7 +2843,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5453,34 +5454,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5488,8 +5490,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5564,7 +5566,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5600,7 +5602,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5641,7 +5643,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5707,11 +5709,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5719,7 +5721,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5727,7 +5729,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5740,41 +5742,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5868,44 +5870,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5989,37 +5987,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6027,25 +6025,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6053,7 +6051,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12541,6 +12539,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12584,21 +12584,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13569,36 +13559,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14829,7 +14818,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/nl.po b/src/translations/nl.po
index 2488c67f7c..34bae3f2ff 100644
--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:36+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -3128,7 +3128,8 @@ msgstr "Hier is een lijst met openstaande functies voor dit project."
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5914,25 +5915,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "Pagina niet gevonden (Fout 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Bevestigen"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Deze bevestigingshash bestaat meer dan één keer."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "Ongeldige bevestigings hash"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5940,11 +5942,11 @@ msgstr "Ongeldige bevestigings hash"
msgid "Could Not Get User"
msgstr "Kon de gevraagde bewerking niet uitvoeren"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "E-mail adreswijziging voltooid"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5952,8 +5954,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Terug"
@@ -6047,7 +6049,7 @@ msgstr "Het oude wachtwoord is niet juist"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Je moet een geldig wachtwoord ingeven (minimaal 6 karakters)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "De nieuwe wachtwoorden zijn niet gelijk."
@@ -6087,7 +6089,7 @@ msgstr "Oude wachtwoord"
msgid "New Password (at least 6 chars)"
msgstr "Nieuw wachtwoord (minimaal 6 karakters)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Nieuw wachtwoord (opnieuw)"
@@ -6141,7 +6143,7 @@ msgstr ""
"sleutels in je bestand correct is."
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6219,11 +6221,11 @@ msgstr "Gebruikers ID:"
msgid "Login name:"
msgstr "Loginnaam:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "Voornaam:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Achternaam:"
@@ -6231,7 +6233,7 @@ msgstr "Achternaam:"
msgid "Language:"
msgstr "Taal"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Tijdzone:"
@@ -6239,7 +6241,7 @@ msgstr "Tijdzone:"
msgid "Theme:"
msgstr "Thema:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "Land:"
@@ -6252,36 +6254,36 @@ msgid "Change Email Addr"
msgstr "Wijzig e-mail adres"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Adres:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Telefoon:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "FAX:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "Titel:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Jabber adres:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
"Stuur automatisch gegenereerde mededelingen alleen naar mijn Jabber adres"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6289,7 +6291,7 @@ msgstr ""
"E-mail over site updates ontvangen (Weinig mail, en inclusief "
"beveiligings aankondigingen. Sterk aanbevolen.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Aanvullende community mailings ontvangen. (Weinig mail.)"
@@ -6385,47 +6387,42 @@ msgstr "[Wachtwoord kwijt?]"
msgid "[New Account]"
msgstr "[Nieuw account]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[Bevestigings e-mail opnieuw toesturen]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Bevestigen"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "Ongeldige bevestigings hash"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
"Je kunt alleen inloggen met een geldig wachtwoord (minimaal 6 karakters)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "Fout"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[Wachtwoord kwijt?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Nieuw wachtwoord (minimum 6 karakters)"
@@ -6533,38 +6530,38 @@ msgstr ""
"verificatie van het e-mail adres wordt er nu een bevestiging per e-mail "
"opgestuurd. Klik op de link in de e-mail om je account te activeren."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Loginnaam (gebruik geen hoofdletters):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Wachtwoord (min. 6 tekens):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Wachtwoord (herhaal):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Taal keuze:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Thema"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "E-mail adres:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6572,26 +6569,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Registreer"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "Registratie compleet"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6599,7 +6596,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13638,6 +13635,8 @@ msgid ""
msgstr "Niets gevonden - geen secties beschikbaar (controleer je rechten)"
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "Niets passends gevonden voor %1$s"
@@ -13683,21 +13682,11 @@ msgstr "Post datum"
msgid "Entire project search"
msgstr "Uitgebreid zoeken"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Niets passends gevonden voor %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "Zoekresulten voor %1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "Niets passends gevonden voor %1$s"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14744,37 +14733,36 @@ msgstr ""
msgid "Is Active"
msgstr "actief"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Enquête beheer"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "Je hebt geen licentievorm gekozen"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Enquête beheer"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -16112,7 +16100,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16469,6 +16457,17 @@ msgstr "Gebruikersnaam"
msgid "Project info"
msgstr "Project info"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "Niets passends gevonden voor %1$s"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Niets passends gevonden voor %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Bevestigen"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "Fout bij aanmaken groep object"
diff --git a/src/translations/pl.po b/src/translations/pl.po
index fd9ad2e2bd..a7a8b69f9b 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-10-06 16:20+0200\n"
"Last-Translator: Roland Mas \n"
"Language-Team: LANGUAGE \n"
@@ -2872,12 +2872,14 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
msgstr[0] ""
msgstr[1] ""
+msgstr[2] ""
#: common/widget/Widget_ProjectInfo.class.php:126
msgid "Some infos about the project."
@@ -5634,34 +5636,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5669,8 +5672,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5745,7 +5748,7 @@ msgstr "Stare hasÅo jest niepoprawne"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Musisz podaÄ poprawne hasÅo (co najmniej 6 znaków)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Podane nowe hasÅa sÄ
różne."
@@ -5784,7 +5787,7 @@ msgstr "Stare HasÅo"
msgid "New Password (at least 6 chars)"
msgstr "Nowe HasÅo (co najmniej 6 znaków)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Nowe HasÅo (powtórz)"
@@ -5825,7 +5828,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5891,11 +5894,11 @@ msgstr "ID użytkownika:"
msgid "Login name:"
msgstr "Login:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "ImiÄ:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "Nazwisko:"
@@ -5903,7 +5906,7 @@ msgstr "Nazwisko:"
msgid "Language:"
msgstr "JÄzyk:"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Strefa czasowa:"
@@ -5911,7 +5914,7 @@ msgstr "Strefa czasowa:"
msgid "Theme:"
msgstr "Motyw:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "Kraj:"
@@ -5924,41 +5927,41 @@ msgid "Change Email Addr"
msgstr "ZmieÅ Adres Email"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "Adres:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "Telefon:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "FAX:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "TytuÅ:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Adres Jabber:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -6052,44 +6055,40 @@ msgstr "[Nie pamiÄtasz hasÅa?]"
msgid "[New Account]"
msgstr "[Utwórz konto]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -6173,38 +6172,38 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Adres Email:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6212,25 +6211,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr "Pola oznaczone na %s sÄ
wymagne."
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Zarejestruj"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6238,7 +6237,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12758,6 +12757,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12801,21 +12802,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13792,36 +13783,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15053,7 +15043,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/pt.po b/src/translations/pt.po
index d22e652e98..b80615bd2d 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:35+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -2843,7 +2843,8 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5453,34 +5454,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5488,8 +5490,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5564,7 +5566,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5600,7 +5602,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5641,7 +5643,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5707,11 +5709,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5719,7 +5721,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5727,7 +5729,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5740,41 +5742,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5868,44 +5870,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5989,37 +5987,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6027,25 +6025,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6053,7 +6051,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12541,6 +12539,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12584,21 +12584,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13569,36 +13559,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14829,7 +14818,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index 5ce6764a40..dec293df5d 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:35+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -3107,7 +3107,8 @@ msgstr "Aqui está uma lista de posições disponÃveis para esse projeto."
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5853,25 +5854,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "Página Solicitada não Encontrada (Erro 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Confirmar"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Esta hash de confirmação já existe."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "Hash de confirmação inválido"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5879,11 +5881,11 @@ msgstr "Hash de confirmação inválido"
msgid "Could Not Get User"
msgstr "Não Posso Completar a Operação"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Troca de E-mail Completa"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5891,8 +5893,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Retornar"
@@ -5985,7 +5987,7 @@ msgstr "Senha antiga está incorreta"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Você precisa fornecer uma senha válida (pelo menos 6 caracteres)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Novas senhas não conferem."
@@ -6024,7 +6026,7 @@ msgstr "Senha Antiga"
msgid "New Password (at least 6 chars)"
msgstr "Nova Senha (pelo menos 6 caracteres)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Nova Senha (repita)"
@@ -6065,7 +6067,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6141,11 +6143,11 @@ msgstr "ID de Usuário:"
msgid "Login name:"
msgstr "Nome de login:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -6153,7 +6155,7 @@ msgstr ""
msgid "Language:"
msgstr "Lingua:"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Fuso-horário:"
@@ -6161,7 +6163,7 @@ msgstr "Fuso-horário:"
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -6174,36 +6176,36 @@ msgid "Change Email Addr"
msgstr "Trocar Endereço de E-mail"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "TÃtulo:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Endereço do Jabber:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
"Enviar notÃcias geradas automáticamente apenas para o meu endereço do Jabber"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6211,7 +6213,7 @@ msgstr ""
"Receber Mensagens sobre Atualizações do Site (Tráfego muito baixo, inclui "
"notÃcias de segurança. Altamente Recomendável.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Receber postagens adicionais da comunidade. (Baixo tráfego.)"
@@ -6307,46 +6309,41 @@ msgstr "[Perdeu sua senha?]"
msgid "[New Account]"
msgstr "[Nova Conta]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Confirmar"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "Hash de confirmação inválido"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "Você precisa fornecer uma senha válida (pelo menos 6 caracteres)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "ERRO"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[Perdeu sua senha?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Nova Senha (mÃn. 6 caracteres)"
@@ -6447,38 +6444,38 @@ msgstr ""
"e-mail de confirmação para verificar seu endereço de e-mail. Ao visitar o "
"link enviado para você nesse e-mail você irá ativar a sua conta."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Nome de Login (não use letras maiúsculas):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Senha (mÃn. 6 caracteres):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Senha (repita):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Escolha da LÃngua:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Endereço de E-mail:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6486,26 +6483,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Registrar"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "Registro completo"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6513,7 +6510,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13478,6 +13475,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "Nenhum Fórum Encontrado Para %1$s"
@@ -13522,21 +13521,11 @@ msgstr "Atualização em massa"
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Nenhum Fórum Encontrado Para %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14579,37 +14568,36 @@ msgstr ""
msgid "Is Active"
msgstr "Está Ativa"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Administração da Enquete"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "Você não escolheu uma licença"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Administração da Enquete"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15914,7 +15902,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16271,6 +16259,14 @@ msgstr "Nome do Usuário"
msgid "Project info"
msgstr "Informações de Projeto"
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Nenhum Fórum Encontrado Para %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Confirmar"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "Erro criando objeto de grupo"
diff --git a/src/translations/ru.po b/src/translations/ru.po
index 3b7404ba2b..26ee34ae90 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: FusionForge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-18 16:52+0100\n"
"Last-Translator: Aleksey Bragin \n"
"Language-Team: LANGUAGE \n"
@@ -3102,9 +3102,10 @@ msgstr ""
"поÑока ÑÑого пÑоекÑа."
#: common/widget/Widget_ProjectInfo.class.php:102
-#, php-format
+#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -6077,25 +6078,26 @@ msgstr "ÐÑÑппа Ð½ÐµÐ¸Ð¼ÐµÐµÑ ÐºÐ°Ð»ÐµÐ½Ð´Ð°ÑÑ"
msgid "Requested Page not Found (Error 404)"
msgstr "ÐапÑаÑÐ¸Ð²Ð°ÐµÐ¼Ð°Ñ ÑÑÑаниÑа не найдена (ÐÑибка 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "ÐодÑвеÑждение"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "ÐзлиÑнее подÑвеÑждение ÑегиÑÑÑаÑии."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "ÐÑибоÑное подÑвеÑждение недопÑÑÑимо"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -6103,11 +6105,11 @@ msgstr "ÐÑибоÑное подÑвеÑждение недопÑÑÑимо"
msgid "Could Not Get User"
msgstr "ÐÑибка, не Ñказана ÑолÑ"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "УÑÑановлен новÑй Ðмайл "
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -6118,8 +6120,8 @@ msgstr ""
"%2$s. ÐÑÑ ÐаÑа коÑÑеÑпонденÑÐ¸Ñ Ð±ÑÐ´ÐµÑ Ð¿ÐµÑепÑавлÑÑÑÑ Ð½Ð° <"
"%3$s> ."
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "ÐозвÑаÑ"
@@ -6214,7 +6216,7 @@ msgstr "СÑаÑÑй паÑÐ¾Ð»Ñ Ð½ÐµÐ²ÐµÑнÑй"
msgid "You must supply valid password (at least 6 chars)"
msgstr "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑказаÑÑ ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¸Ð· 6 знаков минимÑм"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "ÐаÑоли не ÑовпадаÑÑ"
@@ -6253,7 +6255,7 @@ msgstr "СÑаÑÑй паÑолÑ"
msgid "New Password (at least 6 chars)"
msgstr "ÐовÑй паÑÐ¾Ð»Ñ (не менее 6 Ñимволов)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "ÐовÑй паÑÐ¾Ð»Ñ (повÑоÑиÑÑ)"
@@ -6306,7 +6308,7 @@ msgstr ""
"ÑÑÑоки Ð¼ÐµÐ¶Ð´Ñ ÐºÐ»ÑÑами, пÑовеÑÑÑе еÑе Ñаз колиÑеÑÑво клÑÑей в ÐаÑем Ñайле."
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6382,11 +6384,11 @@ msgstr "ÐÐ¼Ñ ÑÑаÑÑника:"
msgid "Login name:"
msgstr "РегиÑÑÑаÑионное имÑ:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "ÐмÑ:"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "ФамилиÑ:"
@@ -6394,7 +6396,7 @@ msgstr "ФамилиÑ:"
msgid "Language:"
msgstr "ЯзÑк:"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "ЧаÑовой поÑÑ:"
@@ -6402,7 +6404,7 @@ msgstr "ЧаÑовой поÑÑ:"
msgid "Theme:"
msgstr "Тема оÑоÑÐ¼Ð»ÐµÐ½Ð¸Ñ ÑайÑа:"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "СÑÑана:"
@@ -6415,35 +6417,35 @@ msgid "Change Email Addr"
msgstr "ÐзмениÑÑ email адÑеÑ"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "ÐдÑеÑ:"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "ТелеÑон:"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "ФакÑ:"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "ÐбÑаÑение:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "ÐдÑÐµÑ Jabber:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "ÐÑпÑавлÑÑÑ Ð°Ð²Ñо-инÑомиÑование ÑолÑко на мой Jabber "
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6451,7 +6453,7 @@ msgstr ""
"ÐолÑÑаÑÑ Ð½Ð¾Ð²Ð¾ÑÑи об обновлениÑÑ
на ÑайÑе. (макÑималÑÐ½Ð°Ñ ÑÐºÐ¾Ð½Ð¾Ð¼Ð¸Ñ Ð²Ð°Ñего "
"ÑÑаÑÑика). ÐÑÐµÐ½Ñ ÑекомендÑеÑÑÑ."
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "ÐолÑÑаÑÑ Ð¿Ð¸ÑÑма Ð¾Ñ ÑообÑеÑÑва. (С вÑÑокой Ñкономией ÑÑаÑÑика.)"
@@ -6572,24 +6574,19 @@ msgstr "[ÐабÑли паÑолÑ?]"
msgid "[New Account]"
msgstr "[ÐаÑегиÑÑÑиÑоваÑÑÑÑ]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[ÐовÑоÑиÑÑ Ð¾ÑпÑÐ°Ð²ÐºÑ Ð½Ð° ÑказаннÑй е-мейл запÑоÑа о подÑвеÑждении]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "ÐодÑвеÑждение"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "ÐÑибоÑное подÑвеÑждение недопÑÑÑимо"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¸Ð¼ÐµÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ñм из 6 бÑкв."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, fuzzy, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
@@ -6598,21 +6595,21 @@ msgstr ""
"
ÐаÑÐ¾Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½Ñн
ÐоздÑавлÑем, паÑÐ¾Ð»Ñ Ð±Ñл пеÑеÑÑÑановлен. ТепеÑÑ "
"можно войÑи на ÑайÑ.
"
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "ÐШÐÐÐÐ"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr "ÐоÑÑÑановление паÑолей"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr "ÐобÑо пожаловаÑÑ, %s. ТепеÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе измениÑÑ Ð²Ð°Ñ Ð¿Ð°ÑолÑ."
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "ÐовÑй паÑÐ¾Ð»Ñ (мин. 6 Ñимволов)"
@@ -6726,38 +6723,38 @@ msgstr ""
"подÑвеÑждаÑÑее пиÑÑмо Ð´Ð»Ñ Ð¿ÑовеÑки адÑеÑа ÑлекÑÑонной поÑÑÑ. ÐÐ»Ñ Ð°ÐºÑиваÑии "
"ÑÑÑÑной запиÑи поÑеÑиÑе ÑÑÑлкÑ, пÑиÑланнÑÑ Ð² пиÑÑме."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ (ÑолÑко нижний ÑегиÑÑÑ):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "ÐаÑÐ¾Ð»Ñ (минимÑм 6 Ñимволов):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "ÐаÑÐ¾Ð»Ñ (подÑвеÑждение):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "ЯзÑк:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "Тема оÑоÑмлениÑ"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Email адÑеÑ:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, fuzzy, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6769,26 +6766,26 @@ msgstr ""
"loginname@%1$s>, коÑоÑÑй бÑÐ´ÐµÑ Ð¿ÐµÑеÑÑлаÑÑ ÑообÑÐµÐ½Ð¸Ñ Ð½Ð° ÑказаннÑй здеÑÑ "
"email."
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr "ÐолÑ, помеÑеннÑе %s обÑзаÑелÑнÑ."
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "РегиÑÑÑаÑиÑ"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "РегиÑÑÑаÑÐ¸Ñ Ð·Ð°Ð²ÐµÑÑена"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6796,7 +6793,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13908,6 +13905,8 @@ msgid ""
msgstr "ÐÑовеÑÑÑе ваÑи полномоÑиÑ, ÑекÑÐ¸Ñ Ð½ÐµÐ´Ð¾ÑÑÑпна"
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "ÐиÑего не найдено Ð´Ð»Ñ %1$s"
@@ -13952,21 +13951,11 @@ msgstr "ÐаÑа оÑпÑавки"
msgid "Entire project search"
msgstr "ÐополниÑелÑнÑй поиÑк пÑоекÑов"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "ÐиÑего не найдено Ð´Ð»Ñ %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "РезÑлÑÑÐ°Ñ Ð¿Ð¾Ð¸Ñка Ð´Ð»Ñ %1$s"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "ÐиÑего не найдено Ð´Ð»Ñ %1$s"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -15027,37 +15016,36 @@ msgstr ""
msgid "Is Active"
msgstr "ÐкÑивен"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Ðдмин опÑоÑов"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "ÐиÑÐµÐ½Ð·Ð¸Ñ Ð½Ðµ вÑбÑана"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Ðдмин опÑоÑов"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -16398,7 +16386,7 @@ msgstr "ÐÑекÑаÑиÑÑ Ð½Ð°Ð±Ð»Ñдение"
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16753,6 +16741,17 @@ msgstr "ÐÐ¼Ñ ÑÑаÑÑника обÑзаÑелÑно"
msgid "Project info"
msgstr "ÐнÑоÑмаÑÐ¸Ñ Ð¾ пÑоекÑе"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "ÐиÑего не найдено Ð´Ð»Ñ %1$s"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "ÐиÑего не найдено Ð´Ð»Ñ %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "ÐодÑвеÑждение"
+
#~ msgid "Error getting member object"
#~ msgstr "ÐÑибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð³ÑÑппÑ"
diff --git a/src/translations/sv.po b/src/translations/sv.po
index 2c1b8ed65e..2fd9a0ff01 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-07-19 01:41+0200\n"
"Last-Translator: Martin Bagge \n"
"Language-Team: LANGUAGE \n"
@@ -3110,7 +3110,8 @@ msgstr "Här är en lista över tillgängliga positioner i detta projekt."
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5859,25 +5860,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "Begärd sida hittades inte (Fel 404)"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "Bekräfta"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "Denna bekräftelsenyckel finns i mer än en uppsättning."
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "Ogiltig bekräftelsenyckel"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5885,11 +5887,11 @@ msgstr "Ogiltig bekräftelsenyckel"
msgid "Could Not Get User"
msgstr "Kan inte slutföra operationen"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "E-postadress ändring klar"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5897,8 +5899,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "Ã
tergå"
@@ -5990,7 +5992,7 @@ msgstr "Gamla lösenordet är ogiltigt"
msgid "You must supply valid password (at least 6 chars)"
msgstr "Du måste ange ett giltigt lösenord (min. 6 tecken)"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "Nytt lösenord passar inte."
@@ -6029,7 +6031,7 @@ msgstr "Gamla lösenordet"
msgid "New Password (at least 6 chars)"
msgstr "Nytt lösenord (min. 6 tecken)"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "Nytt lösenord (repetera)"
@@ -6070,7 +6072,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6147,11 +6149,11 @@ msgstr "Användar-ID:"
msgid "Login name:"
msgstr "Inloggningsnamn:"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -6159,7 +6161,7 @@ msgstr ""
msgid "Language:"
msgstr "Språk"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "Tidszon:"
@@ -6167,7 +6169,7 @@ msgstr "Tidszon:"
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -6180,36 +6182,36 @@ msgid "Change Email Addr"
msgstr "Byt e-postadress"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "Rubrik:"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Jabberadress:"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
"Skicka automatiskt genererade meddelanden endast till min Jabber adress"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
@@ -6217,7 +6219,7 @@ msgstr ""
"Erhåll e-post om webbplatsuppdateringar (Mycket låg trafik samt "
"inkluderar säkerhetsvarningar. Rekommenderas.)"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "Ta emot ytterligare brev från gruppen. (Låg trafik.)"
@@ -6313,46 +6315,41 @@ msgstr "[Förlorat ditt lösenord?]"
msgid "[New Account]"
msgstr "[Nytt Konto]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "Bekräfta"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "Ogiltig bekräftelsenyckel"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "Du måste ange ett giltigt lösenord (min. 6 tecken)."
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "FEL"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[Förlorat ditt lösenord?]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "Nytt lösenord (min. 6 tecken)"
@@ -6453,38 +6450,38 @@ msgstr ""
"bekräftelsebrev för att säkerställa att din e-postadress är riktig. Följ "
"länken i detta e-postbrev för att bekräfta ditt nya konto."
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "Inloggningsnamn (använd endast små bokstäver):"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "Lösenord (min. 6 tecken):"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "Lösenord (repetera):"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "Språk:"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "e-postadress:"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6492,26 +6489,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "Registrera"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "Registrering färdig"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6519,7 +6516,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13466,6 +13463,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "Hittade inga forum för %1$s"
@@ -13510,21 +13509,11 @@ msgstr "Mass uppdatering"
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "Hittade inga forum för %1$s"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14566,37 +14555,36 @@ msgstr ""
msgid "Is Active"
msgstr "Ãr aktiv"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "Administration av undersökning"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "Du har inte valt en licens"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "Administration av undersökning"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15902,7 +15890,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16258,6 +16246,14 @@ msgstr "Användarenamn"
msgid "Project info"
msgstr "Projekt info"
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "Hittade inga forum för %1$s"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "Bekräfta"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "Fel vid skapande av gruppobjekt"
diff --git a/src/translations/th.po b/src/translations/th.po
index 03cb7c6429..f975c846a1 100644
--- a/src/translations/th.po
+++ b/src/translations/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-10-06 16:32+0200\n"
"Last-Translator: Roland Mas \n"
"Language-Team: LANGUAGE \n"
@@ -2853,12 +2853,12 @@ msgstr ""
#: common/widget/Widget_ProjectInfo.class.php:102
#, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
msgstr[0] ""
-msgstr[1] ""
#: common/widget/Widget_ProjectInfo.class.php:126
msgid "Some infos about the project."
@@ -5461,34 +5461,35 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr ""
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
msgid "Confirm Hash"
msgstr ""
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr ""
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
msgid "Invalid confirmation hash."
msgstr ""
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
msgid "Could Not Get User"
msgstr ""
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr ""
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5496,8 +5497,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr ""
@@ -5572,7 +5573,7 @@ msgstr ""
msgid "You must supply valid password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr ""
@@ -5608,7 +5609,7 @@ msgstr ""
msgid "New Password (at least 6 chars)"
msgstr ""
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr ""
@@ -5649,7 +5650,7 @@ msgid ""
msgstr ""
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -5715,11 +5716,11 @@ msgstr ""
msgid "Login name:"
msgstr ""
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr ""
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr ""
@@ -5727,7 +5728,7 @@ msgstr ""
msgid "Language:"
msgstr ""
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr ""
@@ -5735,7 +5736,7 @@ msgstr ""
msgid "Theme:"
msgstr ""
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr ""
@@ -5748,41 +5749,41 @@ msgid "Change Email Addr"
msgstr ""
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr ""
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr ""
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr ""
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr ""
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr ""
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr ""
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr ""
@@ -5876,44 +5877,40 @@ msgstr ""
msgid "[New Account]"
msgstr ""
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr ""
-#: www/account/lostlogin.php:40
-msgid "Confirm Has"
-msgstr ""
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr ""
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr ""
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr ""
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
msgid "Lost Password Login"
msgstr ""
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr ""
@@ -5997,37 +5994,37 @@ msgid ""
"you in this email will activate your account."
msgstr ""
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr ""
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr ""
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr ""
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr ""
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr ""
-#: www/account/register.php:159
+#: www/account/register.php:160
msgid "Email Address:"
msgstr ""
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6035,25 +6032,25 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr ""
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
msgid "Unsubscription Complete"
msgstr ""
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6061,7 +6058,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -12558,6 +12555,8 @@ msgid ""
msgstr ""
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, php-format
msgid "No matches found for %s"
msgstr ""
@@ -12601,21 +12600,11 @@ msgstr ""
msgid "Entire project search"
msgstr ""
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, php-format
-msgid "No matches found for %s "
-msgstr ""
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr ""
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr ""
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
msgid "People Search"
@@ -13586,36 +13575,35 @@ msgstr ""
msgid "Is Active"
msgstr ""
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
+#: www/survey/admin/index.php:51
+msgid "You are not a Project admin"
msgstr ""
-#: www/survey/admin/index.php:54
-msgid "You are not a Project admin"
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
msgstr ""
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -14846,7 +14834,7 @@ msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index ed3185221a..8a053225f7 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
-"PO-Revision-Date: 2010-04-30 16:36+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
+"PO-Revision-Date: 2010-10-06 15:07+0200\n"
"Last-Translator: é±æ¿ \n"
"Language-Team: LANGUAGE \n"
"Language: zh_CN\n"
@@ -1205,16 +1205,7 @@ msgid ""
"if there is anything we can do to help you.\n"
"\n"
"-- the %4$s crew"
-msgstr ""
-"ä½ æ³¨åçé¡¹ç® %4$s å·²ç»æ¹å.项ç®å
¨å: %1$s项ç®Unixå: %2$sä½ çDNSéè¦ä¸å¤©æ"
-"è½æ¿æ´»ãä½ çWEBç½ç«å¯ä»¥éè¿shellå¸å·ååã请é
读ä¸é¢çé¾æ¥ä¸ç建ç«ææ¡£æ¥äºè§£"
-"ç¨æ³,å¯ä½¿ç¨çæå¡,åå¸å·çç®å½å¸å±.ä½ å¦æç»å½å访é®%4%så¤ç项ç®é¡µé¢, å°ä¼åç°"
-"é¢å¤çèååè½é¡¹:'项ç®ç®¡ç'.强çå»ºè®®ä½ ç°å¨è®¿é® %4$s ,å建项ç®çå
¬å¼è¯´æ.请ç»"
-"å½å访é®é¡¹ç®é¡µé¢, éæ©å·¦è¾¹ç'项ç®ç®¡ç' èå(æç»å½å访é®%3$s).å¨ä½ æªéè¿é¡¹ç®"
-"管ç页é¢å°é¡¹ç®åç±»åï¼ä½ ç项ç®ä¸ä¼å¨é¡¹ç®åç±»å表ä¸æ¾ç¤º(é¨ç½²å¨%4$sä¸ç项ç®å"
-"表ï¼ä»¥æäºæ¥æ¾åæµè§) ãè¿æ ·äººä»¬å¯ä»¥å¾æ¹ä¾¿çåç°ä½ ç项ç®.ç»å½å访é®ä½ ç项ç®,"
-"åéæ©å·¦è¾¹èåç'项ç®ç®¡ç'.享ç¨è¿ä¸ªç³»ç»çåæ¶è¯·åè¯å
¶ä»äºº%4$sãå¦ææéè¦è¯·ä¸"
-"æ们èç³»ï¼æ们ä¹äºæä¾å¸®å©ã-- %4$sçæå"
+msgstr "ä½ æ³¨åçé¡¹ç® %4$s å·²ç»æ¹å.项ç®å
¨å: %1$s项ç®Unixå: %2$sä½ çDNSéè¦ä¸å¤©æè½æ¿æ´»ãä½ çWEBç½ç«å¯ä»¥éè¿shellå¸å·ååã请é
读ä¸é¢çé¾æ¥ä¸ç建ç«ææ¡£æ¥äºè§£ç¨æ³,å¯ä½¿ç¨çæå¡,åå¸å·çç®å½å¸å±.ä½ å¦æç»å½å访é®%4$så¤ç项ç®é¡µé¢, å°ä¼åç°é¢å¤çèååè½é¡¹:'项ç®ç®¡ç'.强çå»ºè®®ä½ ç°å¨è®¿é® %4$s ,å建项ç®çå
¬å¼è¯´æ.请ç»å½å访é®é¡¹ç®é¡µé¢, éæ©å·¦è¾¹ç'项ç®ç®¡ç' èå(æç»å½å访é®%3$s).å¨ä½ æªéè¿é¡¹ç®ç®¡ç页é¢å°é¡¹ç®åç±»åï¼ä½ ç项ç®ä¸ä¼å¨é¡¹ç®åç±»å表ä¸æ¾ç¤º(é¨ç½²å¨%4$sä¸ç项ç®å表ï¼ä»¥æäºæ¥æ¾åæµè§) ãè¿æ ·äººä»¬å¯ä»¥å¾æ¹ä¾¿çåç°ä½ ç项ç®.ç»å½å访é®ä½ ç项ç®,åéæ©å·¦è¾¹èåç'项ç®ç®¡ç'.享ç¨è¿ä¸ªç³»ç»çåæ¶è¯·åè¯å
¶ä»äºº%4$sãå¦ææéè¦è¯·ä¸æ们èç³»ï¼æ们ä¹äºæä¾å¸®å©ã-- %4$sçæå"
#: common/include/Group.class.php:2441
#, php-format
@@ -3054,7 +3045,8 @@ msgstr "以ä¸æ¯è¿ä¸ªé¡¹ç®è½å¤æä¾çå·¥ä½å表"
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5838,25 +5830,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "页é¢ä¸åå¨ï¼é误 404ï¼"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "确认"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "è¿ä¸ªç¡®è®¤ç¼ç ä¸åªåå¨äºä¸æ¬¡"
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "ä¸æ£ç¡®ç确认ç¼ç "
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5864,11 +5857,11 @@ msgstr "ä¸æ£ç¡®ç确认ç¼ç "
msgid "Could Not Get User"
msgstr "ä¸è½è·åè§è²ä¿¡æ¯"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Emailæ´æ¹æå"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5876,8 +5869,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "è¿å"
@@ -5966,7 +5959,7 @@ msgstr "æ§çå¯ç ä¸æ£ç¡®"
msgid "You must supply valid password (at least 6 chars)"
msgstr "æ¨å¿
é¡»æä¾ææçå¯ç ï¼è³å°6个åèï¼"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "æ°å¯ç ä¸ä¸è´ã"
@@ -6003,7 +5996,7 @@ msgstr "æ§å¯ç "
msgid "New Password (at least 6 chars)"
msgstr "æ°å¯ç ï¼è³å°6个åèï¼"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "æ°å¯ç ï¼éå¤ï¼"
@@ -6053,7 +6046,7 @@ msgstr ""
"符ï¼å¨æ交ä¹åï¼æ£éªæ¨æ件ä¸å¯é¥çæ°å¼æ¯æ¨æææçã"
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6126,11 +6119,11 @@ msgstr "ç¨æ·ç¼å·ï¼"
msgid "Login name:"
msgstr "ç¨æ·å称ï¼"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "ååï¼"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "å§æ°ï¼"
@@ -6138,7 +6131,7 @@ msgstr "å§æ°ï¼"
msgid "Language:"
msgstr "è¯è¨ï¼"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "æ¶åºéæ©ï¼"
@@ -6146,7 +6139,7 @@ msgstr "æ¶åºéæ©ï¼"
msgid "Theme:"
msgstr "主é¢ï¼"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "å½å®¶ï¼"
@@ -6159,42 +6152,42 @@ msgid "Change Email Addr"
msgstr "æ¹åEmail"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "ä½åï¼"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "çµè¯ï¼"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "ä¼ çï¼"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "æ é¢"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Jabber ä¿¡ç®±ï¼"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "èªå¨äº§ççéç¥åªåéå°æçJabberä¿¡ç®±"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
"æ¥åå
³äºæ¬ç½ç«æ´æ°çEmailï¼éé常å°ï¼å¹¶ä¸å
æ¬å®å
¨éåï¼å¼ºçæ¨èãï¼"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "æ¥æ¶éå çå
Œ
±é®ä»¶å表ã (éå¾å°)"
@@ -6290,46 +6283,41 @@ msgstr "[å¿äºå¯ç ï¼]"
msgid "[New Account]"
msgstr "[æ°å¸å·]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[éæ°åé确认é®ä»¶ç»æªéè¿çå¸å·]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "确认"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "ä¸æ£ç¡®ç确认ç¼ç "
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "æ¨å¿
é¡»æä¾ä¸ä¸ªææçå¯ç ï¼è³å°6个åèï¼ã"
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "é误"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[å¿äºå¯ç ï¼]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "æ°å¯ç ï¼è³å°6个åèï¼"
@@ -6429,38 +6417,38 @@ msgstr ""
"æåãæ¨å·²ç»å¨ %1$s ä¸æå注åã
ä¸å°ç¡®è®¤emailå·²ç»åéå°æ¨çemailä¿¡"
"ç®±ï¼ä»¥ç¡®ä¿æ¨emailä¿¡ç®±çæ£ç¡®æ§ãç¹å»emailä¸çé¾æ¥å°±å¯ä»¥å¯å¨æ¨çå¸å·ã"
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "ç¨æ·å称ï¼è¯·ä½¿ç¨å°åè±æåæ¯ï¼å称å¼å¤´ä¸å¾ä½¿ç¨æ°åï¼ï¼"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "å¯ç ï¼è³å°6个åèï¼ï¼"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "å¯ç ï¼éå¤ï¼ï¼"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "è¯è¨éæ©ï¼"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "主é¢ï¼"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Emailï¼"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6468,26 +6456,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "注å"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "注åå®æ"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6495,7 +6483,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13414,6 +13402,8 @@ msgid ""
msgstr "æªåç°ç¬¦åé¡¹ç® - 没æé¨ä»½æä¾(æ£æ¥æ¨çæé)"
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "æ¾ä¸å°å
³äº %1$s çèµæ"
@@ -13459,21 +13449,11 @@ msgstr "å¼ è´´æ¥æ"
msgid "Entire project search"
msgstr "é«çº§æç´¢"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "æ¾ä¸å°å
³äº %1$s çèµæ"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "%1$s çæç´¢ç»æ"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "æ¾ä¸å°å
³äº %1$s çèµæ"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14503,37 +14483,36 @@ msgstr ""
msgid "Is Active"
msgstr "å¯ç¨ä¸"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "é®å·ç®¡ç"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "æ¨å°æªéæ©æææ¹å¼"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "é®å·ç®¡ç"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15833,7 +15812,7 @@ msgstr "åæ¢çè§"
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16190,6 +16169,17 @@ msgstr "å¸å·"
msgid "Project info"
msgstr "项ç®ä¿¡æ¯"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "æ¾ä¸å°å
³äº %1$s çèµæ"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "æ¾ä¸å°å
³äº %1$s çèµæ"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "确认"
+
#~ msgid "Error getting member object"
#~ msgstr "è·åæå对象é误"
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index 88a45dd6b4..c073d70233 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gforge 4.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-04 19:41+0200\n"
+"POT-Creation-Date: 2010-10-06 15:05+0200\n"
"PO-Revision-Date: 2009-02-01 14:34+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE \n"
@@ -3097,7 +3097,8 @@ msgstr "以ä¸æ¯éåå°æ¡è½å¤ æä¾çå·¥ä½å表"
#: common/widget/Widget_ProjectInfo.class.php:102
#, fuzzy, php-format
msgid ""
-"HELP WANTED: This project is looking for a \"%2$s\"."
+"HELP WANTED: This project is looking for someone to fill a "
+"position."
msgid_plural ""
"HELP WANTED: This project is looking for people to fill several different positions."
@@ -5880,25 +5881,26 @@ msgstr ""
msgid "Requested Page not Found (Error 404)"
msgstr "é é¢ä¸åå¨ï¼é¯èª¤ 404ï¼"
-#: www/account/change_email-complete.php:39 www/account/unsubscribe.php:38
+#: www/account/change_email-complete.php:37 www/account/lostlogin.php:39
+#: www/account/unsubscribe.php:37
#, fuzzy
msgid "Confirm Hash"
msgstr "確èª"
-#: www/account/change_email-complete.php:47 www/account/lostlogin.php:49
-#: www/account/unsubscribe.php:47
+#: www/account/change_email-complete.php:46 www/account/lostlogin.php:48
+#: www/account/unsubscribe.php:46
msgid "This confirm hash exists more than once."
msgstr "éå確èªç·¨ç¢¼ä¸åªåå¨äºä¸æ¬¡"
-#: www/account/change_email-complete.php:50 www/account/unsubscribe.php:50
+#: www/account/change_email-complete.php:49 www/account/unsubscribe.php:49
#, fuzzy
msgid "Invalid confirmation hash."
msgstr "ä¸æ£ç¢ºç確èªç·¨ç¢¼"
-#: www/account/change_email-complete.php:54 www/account/change_email.php:47
+#: www/account/change_email-complete.php:53 www/account/change_email.php:47
#: www/account/change_pw.php:33 www/account/editsshkeys.php:58
-#: www/account/index.php:37 www/account/lostlogin.php:56
-#: www/account/pending-resend.php:36 www/account/unsubscribe.php:56
+#: www/account/index.php:37 www/account/lostlogin.php:55
+#: www/account/pending-resend.php:36 www/account/unsubscribe.php:55
#: www/account/verify.php:46 www/admin/database.php:61
#: www/admin/unsubscribe.php:74 www/admin/useredit.php:41
#: www/admin/userlist.php:44 www/reporting/useract_graph.php:56
@@ -5906,11 +5908,11 @@ msgstr "ä¸æ£ç¢ºç確èªç·¨ç¢¼"
msgid "Could Not Get User"
msgstr "ç¡æ³å®æå·è¡"
-#: www/account/change_email-complete.php:67
+#: www/account/change_email-complete.php:66
msgid "Email Change Complete"
msgstr "Emailæ¹è®æå"
-#: www/account/change_email-complete.php:72
+#: www/account/change_email-complete.php:71
#, php-format
msgid ""
"Welcome, %1$s. Your email change is complete. Your new email address on file "
@@ -5918,8 +5920,8 @@ msgid ""
"this account."
msgstr ""
-#: www/account/change_email-complete.php:75 www/account/change_email.php:95
-#: www/account/lostpw.php:98 www/account/unsubscribe.php:79
+#: www/account/change_email-complete.php:74 www/account/change_email.php:95
+#: www/account/lostpw.php:98 www/account/unsubscribe.php:78
#: www/my/bookmark_edit.php:68
msgid "Return"
msgstr "è¿å"
@@ -6008,7 +6010,7 @@ msgstr "èçå¯ç¢¼ä¸æ£ç¢º"
msgid "You must supply valid password (at least 6 chars)"
msgstr "æ¨å¿
é æä¾ææçå¯ç¢¼ï¼è³å°6ååå
ï¼"
-#: www/account/change_pw.php:59 www/account/lostlogin.php:68
+#: www/account/change_pw.php:59 www/account/lostlogin.php:67
msgid "New passwords do not match."
msgstr "æ°å¯ç¢¼ä¸ä¸è´ã"
@@ -6045,7 +6047,7 @@ msgstr "èå¯ç¢¼"
msgid "New Password (at least 6 chars)"
msgstr "æ°å¯ç¢¼ï¼è³å°6ååå
ï¼"
-#: www/account/change_pw.php:93 www/account/lostlogin.php:96
+#: www/account/change_pw.php:93 www/account/lostlogin.php:95
msgid "New Password (repeat)"
msgstr "æ°å¯ç¢¼ï¼éè¤ï¼"
@@ -6096,7 +6098,7 @@ msgstr ""
"åå
ï¼å¨æ交ä¹å¾ï¼æª¢é©æ¨æªæ¡ä¸Keysçæ¸å¼æ¯æ¨æææçã"
#: www/account/editsshkeys.php:85 www/account/index.php:292
-#: www/account/lostlogin.php:99 www/admin/groupedit.php:203
+#: www/account/lostlogin.php:98 www/admin/groupedit.php:203
#: www/admin/trove/trove_cat_edit.php:154 www/admin/useredit.php:202
#: www/admin/vhost.php:190 www/forum/admin/ForumAdmin.class.php:356
#: www/forum/admin/index.php:177 www/forum/include/ForumHTML.class.php:328
@@ -6169,11 +6171,11 @@ msgstr "使ç¨è
ç·¨èï¼"
msgid "Login name:"
msgstr "使ç¨è
å稱ï¼"
-#: www/account/index.php:135 www/account/register.php:134
+#: www/account/index.php:135 www/account/register.php:135
msgid "First Name:"
msgstr "ååï¼"
-#: www/account/index.php:142 www/account/register.php:138
+#: www/account/index.php:142 www/account/register.php:139
msgid "Last Name:"
msgstr "å§æ°ï¼"
@@ -6181,7 +6183,7 @@ msgstr "å§æ°ï¼"
msgid "Language:"
msgstr "èªè¨ï¼"
-#: www/account/index.php:155 www/account/register.php:146
+#: www/account/index.php:155 www/account/register.php:147
msgid "Timezone:"
msgstr "æåé¸æï¼"
@@ -6189,7 +6191,7 @@ msgstr "æåé¸æï¼"
msgid "Theme:"
msgstr "ä½æ¯ï¼"
-#: www/account/index.php:167 www/account/register.php:154
+#: www/account/index.php:167 www/account/register.php:155
msgid "Country:"
msgstr "å家ï¼"
@@ -6202,42 +6204,42 @@ msgid "Change Email Addr"
msgstr "æ¹è®Email"
#: www/account/index.php:180 www/account/index.php:187
-#: www/account/register.php:175 www/account/register.php:179
+#: www/account/register.php:176 www/account/register.php:180
#: www/include/user_home.php:111
msgid "Address:"
msgstr "ä½åï¼"
-#: www/account/index.php:194 www/account/register.php:183
+#: www/account/index.php:194 www/account/register.php:184
#: www/include/user_home.php:118
msgid "Phone:"
msgstr "é»è©±ï¼"
-#: www/account/index.php:201 www/account/register.php:187
+#: www/account/index.php:201 www/account/register.php:188
#: www/include/user_home.php:129
msgid "FAX:"
msgstr "å³çï¼"
-#: www/account/index.php:208 www/account/register.php:130
+#: www/account/index.php:208 www/account/register.php:131
#: www/snippet/package.php:143
msgid "Title:"
msgstr "æ¨é¡"
-#: www/account/index.php:217 www/account/register.php:166
+#: www/account/index.php:217 www/account/register.php:167
msgid "Jabber Address:"
msgstr "Jabber ä¿¡ç®±ï¼"
-#: www/account/index.php:221 www/account/register.php:170
+#: www/account/index.php:221 www/account/register.php:171
msgid "Send auto-generated notices only to my Jabber address"
msgstr "èªåç¢ççéç¥åªç¼éå°æçJabberä¿¡ç®±"
-#: www/account/index.php:236 www/account/register.php:192
+#: www/account/index.php:236 www/account/register.php:193
msgid ""
"Receive Email about Site Updates (Very low traffic and includes security "
"notices. Highly Recommended.)"
msgstr ""
"æ¥åéæ¼æ¬ç¶²ç«æ´æ°çEmailï¼éé常å°ï¼ä¸¦ä¸å
æ¬å®å
¨éåï¼å¼·çæ¨è¦ãï¼"
-#: www/account/index.php:240 www/account/register.php:196
+#: www/account/index.php:240 www/account/register.php:197
msgid "Receive additional community mailings. (Low traffic.)"
msgstr "æ¥æ¶éå çå
Œ
±éä¿¡è«å£ã (éå¾å°)"
@@ -6333,46 +6335,41 @@ msgstr "[å¿äºå¯ç¢¼ï¼]"
msgid "[New Account]"
msgstr "[æ°å¸³è]"
-#: www/account/login.php:161 www/account/register.php:212
+#: www/account/login.php:161 www/account/register.php:213
msgid "[Resend confirmation email to a pending account]"
msgstr "[éæ°ç¼é確èªä¿¡å½çµ¦æªééç帳è]"
-#: www/account/lostlogin.php:40
-#, fuzzy
-msgid "Confirm Has"
-msgstr "確èª"
-
-#: www/account/lostlogin.php:52
+#: www/account/lostlogin.php:51
msgid "Invalid confirmation hash"
msgstr "ä¸æ£ç¢ºç確èªç·¨ç¢¼"
-#: www/account/lostlogin.php:64
+#: www/account/lostlogin.php:63
msgid "You must supply valid password (at least 6 chars)."
msgstr "æ¨å¿
é æä¾ä¸åææçå¯ç¢¼ï¼è³å°6ååå
ï¼ã"
-#: www/account/lostlogin.php:77
+#: www/account/lostlogin.php:76
#, php-format
msgid ""
"Password changed
Congratulations, you have re-set your account "
"password. You may login to the site now.
"
msgstr ""
-#: www/account/lostlogin.php:83 www/trove/TroveCategory.class.php:72
+#: www/account/lostlogin.php:82 www/trove/TroveCategory.class.php:72
#: www/trove/TroveCategory.class.php:98 www/trove/TroveCategory.class.php:110
msgid "ERROR"
msgstr "é¯èª¤"
-#: www/account/lostlogin.php:86
+#: www/account/lostlogin.php:85
#, fuzzy
msgid "Lost Password Login"
msgstr "[å¿äºå¯ç¢¼ï¼]"
-#: www/account/lostlogin.php:89
+#: www/account/lostlogin.php:88
#, php-format
msgid "Welcome, %s. You may now change your password."
msgstr ""
-#: www/account/lostlogin.php:94
+#: www/account/lostlogin.php:93
msgid "New Password (min. 6 chars)"
msgstr "æ°å¯ç¢¼ï¼è³å°6ååå
ï¼"
@@ -6472,38 +6469,38 @@ msgstr ""
"æåãæ¨å·²ç¶å¨ %1$s ä¸æå註åã
ä¸å°ç¢ºèªemailå·²ç¶ç¼éå°æ¨çemailä¿¡"
"ç®±ï¼ä»¥ç¢ºä¿æ¨emailä¿¡ç®±çæ£ç¢ºæ§ãé»æemailä¸çé£çµå°±å¯ä»¥ååæ¨ç帳èã"
-#: www/account/register.php:115
+#: www/account/register.php:116
msgid ""
"Login Name (no uppercase letters; leave empty to have it generated "
"automatically):"
msgstr ""
-#: www/account/register.php:117
+#: www/account/register.php:118
msgid "Login Name (do not use uppercase letters):"
msgstr "使ç¨è
å稱ï¼è«ä½¿ç¨å°å¯«è±æåæ¯ï¼å稱éé ä¸å¾ä½¿ç¨æ¸åï¼ï¼"
-#: www/account/register.php:122
+#: www/account/register.php:123
msgid "Password (min. 6 chars):"
msgstr "å¯ç¢¼ï¼è³å°6ååå
ï¼ï¼"
-#: www/account/register.php:126
+#: www/account/register.php:127
msgid "Password (repeat):"
msgstr "å¯ç¢¼ï¼éè¤ï¼ï¼"
-#: www/account/register.php:142
+#: www/account/register.php:143
msgid "Language Choice:"
msgstr "èªè¨é¸æï¼"
-#: www/account/register.php:150
+#: www/account/register.php:151
msgid "Theme"
msgstr "ä½æ¯ï¼"
-#: www/account/register.php:159
+#: www/account/register.php:160
#, fuzzy
msgid "Email Address:"
msgstr "Emailï¼"
-#: www/account/register.php:160
+#: www/account/register.php:161
#, php-format
msgid ""
"This email address will be verified before account activation. You will "
@@ -6511,26 +6508,26 @@ msgid ""
"to this address."
msgstr ""
-#: www/account/register.php:201
+#: www/account/register.php:202
#, php-format
msgid "Do you accept the terms of use for this site?"
msgstr ""
-#: www/account/register.php:206
+#: www/account/register.php:207
#, php-format
msgid "Fields marked with %s are mandatory."
msgstr ""
-#: www/account/register.php:209
+#: www/account/register.php:210
msgid "Register"
msgstr "註å"
-#: www/account/unsubscribe.php:64
+#: www/account/unsubscribe.php:63
#, fuzzy
msgid "Unsubscription Complete"
msgstr "註åå®æ"
-#: www/account/unsubscribe.php:68
+#: www/account/unsubscribe.php:67
#, php-format
msgid ""
"You have been unsubscribed from all %1$s mailings and notifications. In case "
@@ -6538,7 +6535,7 @@ msgid ""
"visit your Account Maintenance page."
msgstr ""
-#: www/account/unsubscribe.php:70
+#: www/account/unsubscribe.php:69
#, php-format
msgid ""
"You have been unsubscribed from %1$s site mailings. In case you will want to "
@@ -13449,6 +13446,8 @@ msgid ""
msgstr "æªç¼ç¾ç¬¦åé
ç® - æ²æé¨ä»½æä¾(檢æ¥æ¨çæ¬é)"
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:197
+#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
+#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
#, fuzzy, php-format
msgid "No matches found for %s"
msgstr "æ¾ä¸å°éæ¼ %1$s çè³æ"
@@ -13494,21 +13493,11 @@ msgstr "張貼æ¥æ"
msgid "Entire project search"
msgstr "é²éæå°"
-#: www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php:200
-#, fuzzy, php-format
-msgid "No matches found for %s "
-msgstr "æ¾ä¸å°éæ¼ %1$s çè³æ"
-
#: www/search/include/renderers/HtmlSearchRenderer.class.php:100
#, php-format
msgid "Search results for %1$s"
msgstr "%1$s çæå°çµæ"
-#: www/search/include/renderers/HtmlSearchRenderer.class.php:102
-#, php-format
-msgid "No matches found for %1$s"
-msgstr "æ¾ä¸å°éæ¼ %1$s çè³æ"
-
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:54
#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:56
#, fuzzy
@@ -14538,37 +14527,36 @@ msgstr ""
msgid "Is Active"
msgstr "åç¨ä¸"
-#: www/survey/admin/index.php:35 www/survey/admin/index.php:47
-#: www/survey/admin/index.php:57 www/survey/admin/index.php:58
-msgid "Survey Administration"
-msgstr "åå·ç®¡ç"
-
-#: www/survey/admin/index.php:54
+#: www/survey/admin/index.php:51
#, fuzzy
msgid "You are not a Project admin"
msgstr "æ¨å°æªé¸æææ¬æ¹å¼"
-#: www/survey/admin/index.php:62
+#: www/survey/admin/index.php:54 www/survey/admin/index.php:55
+msgid "Survey Administration"
+msgstr "åå·ç®¡ç"
+
+#: www/survey/admin/index.php:59
msgid "It's simple to create a survey."
msgstr ""
-#: www/survey/admin/index.php:66
+#: www/survey/admin/index.php:63
msgid "Create questions and comments using the forms above."
msgstr ""
-#: www/survey/admin/index.php:69
+#: www/survey/admin/index.php:66
msgid ""
"Create a survey, listing the questions in order (choose from your"
"strong> list of questions)."
msgstr ""
-#: www/survey/admin/index.php:72
+#: www/survey/admin/index.php:69
#, php-format
msgid ""
"Link to the survey using this format: %1$s where XX is the survey number"
msgstr ""
-#: www/survey/admin/index.php:77
+#: www/survey/admin/index.php:74
#, php-format
msgid ""
"You can now activate/deactivate surveys on the %1$s Edit Existing Surveys "
@@ -15867,7 +15855,7 @@ msgstr "åæ¢ç£è¦"
#: www/tracker/include/ArtifactTypeHtml.class.php:248
#: www/tracker/query.php:354
#, php-format
-msgid "(% for wildcards)"
+msgid "(%% for wildcards)"
msgstr ""
#: www/tracker/include/ArtifactTypeHtml.class.php:299 www/tracker/mod.php:209
@@ -16224,6 +16212,17 @@ msgstr "帳è"
msgid "Project info"
msgstr "å°æ¡è³è¨"
+#~ msgid "No matches found for %1$s"
+#~ msgstr "æ¾ä¸å°éæ¼ %1$s çè³æ"
+
+#, fuzzy
+#~ msgid "No matches found for %s "
+#~ msgstr "æ¾ä¸å°éæ¼ %1$s çè³æ"
+
+#, fuzzy
+#~ msgid "Confirm Has"
+#~ msgstr "確èª"
+
#, fuzzy
#~ msgid "Error getting member object"
#~ msgstr "建ç«ç¾¤çµç©ä»¶æç¼çé¯èª¤"
diff --git a/src/utils/manage-translations.sh b/src/utils/manage-translations.sh
index 9902490044..b0962de1a6 100755
--- a/src/utils/manage-translations.sh
+++ b/src/utils/manage-translations.sh
@@ -25,10 +25,19 @@ print_stats () {
done
}
+check_syntax () {
+ for l in $(echo $locales | xargs -n 1 | sort) ; do
+ msgfmt -c -o /dev/null translations/$l.po
+ done
+}
+
case $1 in
stats)
print_stats
;;
+ check)
+ check_syntax
+ ;;
refresh)
rm translations/gforge.pot
diff --git a/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php b/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
index 4a30a1fe28..c8d9f4ee76 100644
--- a/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
@@ -197,7 +197,7 @@ class FullProjectHtmlSearchRenderer extends HtmlGroupSearchRenderer {
} elseif(method_exists($renderer, 'getSections') && (count($renderer->getSections($this->groupId)) == 0)) {
$result .= ''.sprintf(_('No matches found for %s - No sections available (check your permissions)'), $query['words']).'
';
} else {
- $result .= ''.sprintf(_('No matches found for %s '), $query['words']).'
';
+ $result .= ''.sprintf(_('No matches found for %s'), $query['words']).'
';
}
return $result;
}
diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
index 544d42cd40..ee90afcfef 100644
--- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
@@ -99,7 +99,7 @@ class HtmlSearchRenderer extends SearchRenderer {
$html = ''.sprintf(_('Search results for %1$s'), $query['words']).'
';
if(!$searchQuery->getResult() || $searchQuery->getRowsCount() < 1) {
- $html .= ''.sprintf(_('No matches found for %1$s'), $query['words']).'
';
+ $html .= ''.sprintf(_('No matches found for %s'), $query['words']).'
';
$html .= db_error();
} else {
$html .= $GLOBALS['HTML']->listTableTop($this->tableHeaders);
diff --git a/src/www/tracker/include/ArtifactTypeHtml.class.php b/src/www/tracker/include/ArtifactTypeHtml.class.php
index fdb84256ac..aef857aba3 100644
--- a/src/www/tracker/include/ArtifactTypeHtml.class.php
+++ b/src/www/tracker/include/ArtifactTypeHtml.class.php
@@ -238,14 +238,14 @@ class ArtifactTypeHtml extends ArtifactType {
$str = $this->renderTextField($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']);
if ($mode == 'QUERY') {
- $post_name = ' '._('(% for wildcards)').' ';
+ $post_name = ' '._('(%% for wildcards)').' ';
}
} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_TEXTAREA) {
$str = $this->renderTextArea($efarr[$i]['extra_field_id'],$selected[$efarr[$i]['extra_field_id']],$efarr[$i]['attribute1'],$efarr[$i]['attribute2']);
if ($mode == 'QUERY') {
- $post_name = ' '._('(% for wildcards)').' ';
+ $post_name = ' '._('(%% for wildcards)').' ';
}
} elseif ($efarr[$i]['field_type'] == ARTIFACT_EXTRAFIELDTYPE_MULTISELECT) {
diff --git a/src/www/tracker/query.php b/src/www/tracker/query.php
index cecc9e1984..082beadecb 100644
--- a/src/www/tracker/query.php
+++ b/src/www/tracker/query.php
@@ -351,7 +351,7 @@ if (forge_check_perm ('tracker', $ath->getID(), 'manager')) {
}
array_multisort($order_name_arr, $order_arr);
- $tips = ''._('(% for wildcards)').' ';
+ $tips = ''._('(%% for wildcards)').' ';
echo '
diff --git a/tests/code/syntax/SyntaxTest.php b/tests/code/syntax/SyntaxTest.php
index 8709768ae3..c8bb793509 100644
--- a/tests/code/syntax/SyntaxTest.php
+++ b/tests/code/syntax/SyntaxTest.php
@@ -85,6 +85,15 @@ class Syntax_Tests extends PHPUnit_Framework_TestCase
$output = `cd .. ; find src tests -name '*.php' -type f | while read i ; do [ -s \$i ] && [ -z "\$(tail -n 1 \$i)" ] && echo \$i ; done`;
$this->assertEquals('', $output);
}
+
+ /**
+ * Validate syntax of gettextfiles
+ */
+ public function testGettextSyntax()
+ {
+ $output = `cd ../src ; ./utils/manage-translations.sh check 2>&1`;
+ $this->assertEquals('', $output);
+ }
}
// Local Variables:
--
2.30.2