[Fusionforge-commits] r17606 - in trunk/src: translations www/admin www/project/admin www/search/include/renderers www/top

Marc-Etienne VARGENAU vargenau at fusionforge.org
Mon Jul 22 12:16:10 CEST 2013


Author: vargenau
Date: 2013-07-22 12:16:10 +0200 (Mon, 22 Jul 2013)
New Revision: 17606

Modified:
   trunk/src/translations/bg.po
   trunk/src/translations/ca.po
   trunk/src/translations/de.po
   trunk/src/translations/en.po
   trunk/src/translations/es.po
   trunk/src/translations/eu.po
   trunk/src/translations/fr.po
   trunk/src/translations/fusionforge.pot
   trunk/src/translations/gl.po
   trunk/src/translations/it.po
   trunk/src/translations/ja.po
   trunk/src/translations/ko.po
   trunk/src/translations/nl.po
   trunk/src/translations/pl.po
   trunk/src/translations/pt.po
   trunk/src/translations/ru.po
   trunk/src/translations/sv.po
   trunk/src/translations/th.po
   trunk/src/translations/zh_CN.po
   trunk/src/translations/zh_TW.po
   trunk/src/www/admin/globalroleedit.php
   trunk/src/www/admin/search.php
   trunk/src/www/admin/useredit.php
   trunk/src/www/project/admin/users.php
   trunk/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
   trunk/src/www/top/toplist.php
   trunk/src/www/top/topusers.php
Log:
Less strings

Modified: trunk/src/translations/bg.po
===================================================================
--- trunk/src/translations/bg.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/bg.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-02-01 14:38+0100\n"
 "Last-Translator: \n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1659,7 +1659,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2591,7 +2592,7 @@
 msgid "Failed to find user %s"
 msgstr ""
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Обновено успешно"
@@ -2968,7 +2969,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3298,7 +3299,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4531,7 +4532,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4791,7 +4792,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr ""
 
@@ -5974,8 +5976,8 @@
 msgid "Existing Responses"
 msgstr ""
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr ""
@@ -8859,8 +8861,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Истинско Име"
@@ -9188,7 +9194,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "Проекти на потребителя"
@@ -13902,8 +13908,7 @@
 msgid "Member since:"
 msgstr "Член от:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "Потребителско ID"
@@ -14675,50 +14680,46 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Липсващи Параметри"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "Паролата сменена успешно"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "Паролата сменена успешно"
 
-#: www/admin/globalroleedit.php:102
-#, fuzzy
-msgid "User added successfully"
-msgstr "Обновено успешно"
-
-#: www/admin/globalroleedit.php:104
+#: www/admin/globalroleedit.php:106
 msgid "Error while adding user to role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Версия"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Обновено успешно"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, php-format
 msgid "Error while removing user %s from role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+msgid "Cannot remove user from this type of role"
 msgstr ""
 
 #: www/admin/globalroleedit.php:143
@@ -14726,14 +14727,6 @@
 msgid "Current users with this role"
 msgstr "Версия"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "Истинско Име"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -14747,34 +14740,34 @@
 msgid "Add User"
 msgstr "Добавяне"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Файл"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Изтриване на съобщение"
@@ -14864,8 +14857,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Име"
@@ -15386,11 +15379,14 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
-msgstr ""
+#, fuzzy
+msgid "Real Name"
+msgstr "Фамилия:"
 
 #: www/admin/search.php:76
 msgid "Member since"
@@ -15408,6 +15404,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Име"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Пълно наименование"
@@ -15549,12 +15551,6 @@
 msgid "user_id"
 msgstr ""
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Фамилия:"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr ""
@@ -15600,9 +15596,9 @@
 msgid "Account Information"
 msgstr ""
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr ""
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Потребителско ID"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -19826,12 +19822,6 @@
 msgid "No Matching Users Found"
 msgstr "Няма въпроси към това проучване"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Име"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -20657,6 +20647,7 @@
 msgstr ""
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr ""
 
@@ -22387,7 +22378,7 @@
 msgid "View Other Top Categories"
 msgstr ""
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "Проекти на потребителя"
@@ -22405,10 +22396,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr ""
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr ""
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""
@@ -22668,6 +22655,14 @@
 msgid "That user does not exist."
 msgstr "Това потребителско име вече е заето."
 
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Обновено успешно"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Истинско Име"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "Невалиден хеш за потвърждение"
 
@@ -23264,9 +23259,6 @@
 #~ msgid "License:"
 #~ msgstr "Лизенз:"
 
-#~ msgid "User Id"
-#~ msgstr "Потребителско ID"
-
 #~ msgid "No Forums Found For %1$s"
 #~ msgstr "Няма намерени форуми за %1$s"
 

Modified: trunk/src/translations/ca.po
===================================================================
--- trunk/src/translations/ca.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/ca.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-02-01 14:38+0100\n"
 "Last-Translator: \n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1674,7 +1674,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2609,7 +2610,7 @@
 msgid "Failed to find user %s"
 msgstr "No s'ha pogut afegit l'habilitat"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Usuari afegit amb èxit"
@@ -2995,7 +2996,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3400,7 +3401,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr "Administració del lloc"
@@ -4683,7 +4684,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4953,7 +4954,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Id"
 
@@ -6163,8 +6165,8 @@
 msgid "Existing Responses"
 msgstr "Respostes existents"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID"
@@ -9113,8 +9115,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Nom d'usuari"
@@ -9449,7 +9455,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "Nom del nou projecte"
@@ -14279,8 +14285,7 @@
 msgid "Member since:"
 msgstr "Membre des de:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "Id usuari"
@@ -15074,66 +15079,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Paràmetre perdut"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "Element creat amb èxit"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "Afegits amb èxit"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "Usuari afegit amb èxit"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "Error durant l'activació del compte"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Versió"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Usuari suprimit amb èxit"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "Error durant l'activació del compte"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "No es pot afegir una entrada de la base de dades"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "Versió"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "Nom d'usuari:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15148,34 +15142,34 @@
 msgid "Add User"
 msgstr "Afegeix un usuari"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Nom del rol"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Suprimeix el fitxer"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Suprimeix aquest rastrejador permanentment."
@@ -15267,8 +15261,8 @@
 msgid "Register Time"
 msgstr "Temps de registre"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Nom Unix"
@@ -15797,10 +15791,13 @@
 msgstr[0] "Cerca d'usuari amb criteris"
 msgstr[1] "Cerca d'usuari amb criteris"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Nom real"
 
 #: www/admin/search.php:76
@@ -15819,6 +15816,11 @@
 msgstr[0] "Cerca d'usuari amb criteris"
 msgstr[1] "Cerca d'usuari amb criteris"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr "Nom Unix"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Nom complet"
@@ -15972,12 +15974,6 @@
 msgid "user_id"
 msgstr "Id d'usuari"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Nom real"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Correu del lloc."
@@ -16023,9 +16019,9 @@
 msgid "Account Information"
 msgstr "Informació del compte"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Nom d'usuari:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Id usuari"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20392,11 +20388,6 @@
 msgid "No Matching Users Found"
 msgstr "No s'han trobat usuaris que coincideixin"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr "Nom Unix"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "Finalitza"
@@ -21276,6 +21267,7 @@
 msgstr "Data tancada"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Visites de la pàgina"
 
@@ -23060,7 +23052,7 @@
 msgid "View Other Top Categories"
 msgstr "Visualitza altres màximes categories"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "Nom del nou projecte"
@@ -23081,10 +23073,6 @@
 "Màxim nombre de visites setmanals de pàgines de projecte a *.%1$s (de "
 "impressions del logo %2$s)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Visites de la pàgina"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""
@@ -23363,6 +23351,23 @@
 msgid "That user does not exist."
 msgstr "Aquesta categoria no existeix"
 
+#~ msgid "User name:"
+#~ msgstr "Nom d'usuari:"
+
+#~ msgid "Real name"
+#~ msgstr "Nom real"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Usuari afegit amb èxit"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Nom d'usuari:"
+
+#~ msgid "Pageviews"
+#~ msgstr "Visites de la pàgina"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "clau hash de confirmació no vàlida"
 
@@ -24787,9 +24792,6 @@
 #~ msgid "Add, Delete, or Edit Licenses"
 #~ msgstr "Llicències d'afegit, suprimit o edició"
 
-#~ msgid "User Id"
-#~ msgstr "Id usuari"
-
 #, fuzzy
 #~ msgid "Customize"
 #~ msgstr "Nom del camp extra"

Modified: trunk/src/translations/de.po
===================================================================
--- trunk/src/translations/de.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/de.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2010-07-16 10:07+0200\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
@@ -1681,7 +1681,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2650,7 +2651,7 @@
 msgid "Failed to find user %s"
 msgstr "Nutzer %s finden fehlgeschlagen."
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Benutzer erfolgreich hinzugefügt"
@@ -3038,7 +3039,7 @@
 msgstr "Fehler: Datenbank: project_assigned_to %d: %s"
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr "Konnte die Rolle nicht bekommen"
@@ -3426,7 +3427,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4714,7 +4715,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4979,7 +4980,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "ID"
 
@@ -6201,8 +6203,8 @@
 msgid "Existing Responses"
 msgstr "Existierende Antworten"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID"
@@ -9158,8 +9160,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Benutzername"
@@ -9485,7 +9491,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr "Projektname"
 
@@ -14402,8 +14408,7 @@
 msgid "Member since:"
 msgstr "Mitglied seit:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "Benutzer-ID"
@@ -15218,63 +15223,53 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Fehlende Parameter"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr "Erfolgreich neue Rolle angelegt"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr "Rolle erfolgreich aktualisiertt"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "Benutzer erfolgreich hinzugefügt"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "Fehler während der Account-Aktivierung"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Aktuelle Version"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Benutzer erfolgreich gelöscht"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "Fehler während der Account-Aktivierung"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "Kann das Kennzeichen nicht entfernen: %s"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "Aktuelle Version"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr "Benutzername"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15288,34 +15283,34 @@
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Rollenname"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "Sektion"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "Unterabschnitt"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "Einstellungen"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Datei löschen"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Diesen Tracker dauerhaft löschen."
@@ -15405,8 +15400,8 @@
 msgid "Register Time"
 msgstr "Registrierungszeit"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr "Unix Name"
 
@@ -15934,10 +15929,13 @@
 msgstr[0] "Benutzer-Suche mit Merkmalen <em>%1$s</em>: %2$s Übereinstimmung"
 msgstr[1] "Benutzer-Suche mit Merkmalen <em>%1$s</em>: %2$s Übereinstimmungen"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Richtiger Name"
 
 #: www/admin/search.php:76
@@ -15956,6 +15954,12 @@
 msgstr[0] "Gruppen-Suche mit Merkmalen <em>%s</em>: %d Übereinstimmung"
 msgstr[1] "Gruppen-Suche mit Merkmalen <em>%s</em>: %d Übereinstimmungen"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Unix Name"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Voller Name"
@@ -16115,12 +16119,6 @@
 msgid "user_id"
 msgstr "Benutzer_ID"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Richtiger Name"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Seiten-Mail."
@@ -16166,9 +16164,9 @@
 msgid "Account Information"
 msgstr "Account Information"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Benutzer-Name:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Benutzer-ID"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20653,12 +20651,6 @@
 msgid "No Matching Users Found"
 msgstr "<p>Keine übereinstimmenden Benutzer gefunden</p>"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Unix Name"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "Fertig"
@@ -21536,6 +21528,7 @@
 msgstr "Tracker Geschlossen"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Seitenzugriffe"
 
@@ -23344,7 +23337,7 @@
 msgid "View Other Top Categories"
 msgstr "Andere Top-Kategorien ansehen"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr "Projektname"
 
@@ -23364,10 +23357,6 @@
 "Top-wöchentliche Projektseitenzugriffe auf *.%1$s (von Impressionen des %2$s "
 "Logos)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Seitenzugriffe"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""
@@ -23638,6 +23627,22 @@
 msgid "That user does not exist."
 msgstr "Dieser Nutzer existiert nicht."
 
+#~ msgid "User name:"
+#~ msgstr "Benutzer-Name:"
+
+#~ msgid "Real name"
+#~ msgstr "Richtiger Name"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Benutzer erfolgreich hinzugefügt"
+
+#~ msgid "User name"
+#~ msgstr "Benutzername"
+
+#~ msgid "Pageviews"
+#~ msgstr "Seitenzugriffe"
+
 #~ msgid "ALL"
 #~ msgstr "ALLE"
 
@@ -25990,9 +25995,6 @@
 #~ msgid "The Attachment does not exist"
 #~ msgstr "Der Anhang existiert nicht"
 
-#~ msgid "User Id"
-#~ msgstr "Benutzer-ID"
-
 #~ msgid "Visibility: "
 #~ msgstr "Sichtbarkeit:"
 

Modified: trunk/src/translations/en.po
===================================================================
--- trunk/src/translations/en.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/en.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-01-13 16:27+0100\n"
 "Last-Translator: Roland Mas <lolando at debian.org>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1551,7 +1551,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2446,7 +2447,7 @@
 msgid "Failed to find user %s"
 msgstr ""
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 msgid "User Added Successfully"
 msgstr ""
 
@@ -2795,7 +2796,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr ""
@@ -3117,7 +3118,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr ""
@@ -4269,7 +4270,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4522,7 +4523,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr ""
 
@@ -5656,8 +5658,8 @@
 msgid "Existing Responses"
 msgstr ""
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr ""
@@ -8358,8 +8360,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 msgid "User Name"
 msgstr ""
 
@@ -8659,7 +8665,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr ""
 
@@ -13045,8 +13051,7 @@
 msgid "Member since:"
 msgstr ""
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 msgid "User Id:"
 msgstr ""
 
@@ -13784,59 +13789,48 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 msgid "Missing Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:102
-msgid "User added successfully"
-msgstr ""
-
-#: www/admin/globalroleedit.php:104
+#: www/admin/globalroleedit.php:106
 msgid "Error while adding user to role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
+#: www/admin/globalroleedit.php:110
+msgid "Cannot add user to this type of role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, php-format
 msgid "User %s removed successfully"
 msgstr ""
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, php-format
 msgid "Error while removing user %s from role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+msgid "Cannot remove user from this type of role"
 msgstr ""
 
 #: www/admin/globalroleedit.php:143
 msgid "Current users with this role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr ""
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -13849,33 +13843,33 @@
 msgid "Add User"
 msgstr ""
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 msgid "Delete role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 msgid "Really delete this role?"
 msgstr ""
 
@@ -13960,8 +13954,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr ""
 
@@ -14453,10 +14447,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+msgid "Real Name"
 msgstr ""
 
 #: www/admin/search.php:76
@@ -14474,6 +14470,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr ""
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr ""
@@ -14611,11 +14612,6 @@
 msgid "user_id"
 msgstr ""
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-msgid "Real Name"
-msgstr ""
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr ""
@@ -14659,8 +14655,8 @@
 msgid "Account Information"
 msgstr ""
 
-#: www/admin/useredit.php:139
-msgid "User name:"
+#: www/admin/useredit.php:130
+msgid "User Id"
 msgstr ""
 
 #: www/admin/useredit.php:157
@@ -18692,11 +18688,6 @@
 msgid "No Matching Users Found"
 msgstr ""
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr ""
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -19472,6 +19463,7 @@
 msgstr ""
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr ""
 
@@ -21139,7 +21131,7 @@
 msgid "View Other Top Categories"
 msgstr ""
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr ""
 
@@ -21156,10 +21148,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr ""
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr ""
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""

Modified: trunk/src/translations/es.po
===================================================================
--- trunk/src/translations/es.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/es.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2013-02-11 13:42+0100\n"
 "Last-Translator: skymix <skymix.es at gmail.com>\n"
 "Language-Team: Spanish/Spain\n"
@@ -1613,7 +1613,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2547,7 +2548,7 @@
 msgid "Failed to find user %s"
 msgstr "Falló al buscar usuario %s"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 msgid "User Added Successfully"
 msgstr "Usuario Añadido Correctamente"
 
@@ -2917,7 +2918,7 @@
 msgstr "Error: BD: project_assigned_to %d: %s"
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr "No se pudo obtener el rol"
@@ -3304,7 +3305,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr "Administración del sitio"
@@ -4537,7 +4538,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4795,7 +4796,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Id"
 
@@ -5967,8 +5969,8 @@
 msgid "Existing Responses"
 msgstr "Respuestas existentes"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID"
@@ -8842,8 +8844,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 msgid "User Name"
 msgstr "Nombre de Usuario"
 
@@ -9144,7 +9150,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr "Nombre proyecto"
 
@@ -13869,8 +13875,7 @@
 msgid "Member since:"
 msgstr "Miembro desde:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 msgid "User Id:"
 msgstr "ID Usuario:"
 
@@ -14666,60 +14671,51 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr "Error: Confirme el borrado del rol."
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Nombre de grupo no encontrado"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr "Nuevo Rol Creado Correctamente"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr "Rol Actualizado Correctamente"
 
-#: www/admin/globalroleedit.php:102
-msgid "User added successfully"
-msgstr "Usuario Añadido Correctamente"
-
-#: www/admin/globalroleedit.php:104
+#: www/admin/globalroleedit.php:106
 msgid "Error while adding user to role"
 msgstr "Error mientras se agregaba el rol del usuario"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
 msgstr "No puedo agregar al usurio a este tipo de rol"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr "ERROR: No ha marcado la casilla \"borrar realmente\"!"
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, php-format
 msgid "User %s removed successfully"
 msgstr "Usuario %s borrado correctamente"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, php-format
 msgid "Error while removing user %s from role"
 msgstr "Error al borrar usuario %s del rol"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
 msgstr "No puedo borrar al usuario de este tipo de rol"
 
 #: www/admin/globalroleedit.php:143
 msgid "Current users with this role"
 msgstr "Usuarios actuales con este rol"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr "Nombre de Usuario:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr "Borrar los usuarios marcados de este rol?"
@@ -14732,33 +14728,33 @@
 msgid "Add User"
 msgstr "Agregar Usuario"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Nombre del Rol"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr "Rol Publico (puede ser referenciado por proyectos)"
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "Sección"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "Subsección"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "Preferencias"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 msgid "Delete role"
 msgstr "Borrar rol"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 msgid "Really delete this role?"
 msgstr "¿Realmente quiere borrar este rol?"
 
@@ -14846,8 +14842,8 @@
 msgid "Register Time"
 msgstr "Fecha de registro"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr "Nombre Unix"
 
@@ -15354,10 +15350,12 @@
 msgstr[0] "Búsqueda de usuario con patrón <em>%1$s</em>: %2$s encontrado"
 msgstr[1] "Búsqueda de usuario con patrón <em>%1$s</em>: %2$s encontrados"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+msgid "Real Name"
 msgstr "Nombre real"
 
 #: www/admin/search.php:76
@@ -15376,6 +15374,11 @@
 msgstr[0] "Búsqueda con patrón <em>%s</em>: %d encontrado"
 msgstr[1] "Búsqueda de proyecto con patrón <em>%s</em>: %d encontrados"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr "Nombre Unix"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Nombre completo"
@@ -15524,11 +15527,6 @@
 msgid "user_id"
 msgstr "id_del_usuario"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-msgid "Real Name"
-msgstr "Nombre real"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Correo del Portal"
@@ -15572,9 +15570,9 @@
 msgid "Account Information"
 msgstr "Informacion de la cuenta"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Nombre de Usuario:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Id Usuario"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -19874,11 +19872,6 @@
 msgid "No Matching Users Found"
 msgstr "Ningún usuario encontrado"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr "Nombre Unix"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "Finalizar"
@@ -20752,6 +20745,7 @@
 msgstr "Cierre de tarea"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Visitas de páginas"
 
@@ -22537,7 +22531,7 @@
 msgid "View Other Top Categories"
 msgstr "Ver Otras Categorias Principales"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr "Nombre de proyecto"
 
@@ -22556,10 +22550,6 @@
 "Más Páginas vistas en la última semana *.%1$s (con las pulsaciones del logo "
 "de %2$s)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Páginas vistas"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "La información sobre esta clasificación no está disponible."
@@ -22808,6 +22798,21 @@
 msgid "That user does not exist."
 msgstr "El usuario no existe"
 
+#~ msgid "User name:"
+#~ msgstr "Nombre de Usuario:"
+
+#~ msgid "Real name"
+#~ msgstr "Nombre real"
+
+#~ msgid "User added successfully"
+#~ msgstr "Usuario Añadido Correctamente"
+
+#~ msgid "User name"
+#~ msgstr "Nombre de Usuario:"
+
+#~ msgid "Pageviews"
+#~ msgstr "Páginas vistas"
+
 #~ msgid "ALL"
 #~ msgstr "TODO"
 
@@ -24868,9 +24873,6 @@
 #~ msgid "Filters"
 #~ msgstr "Ficheros"
 
-#~ msgid "User Id"
-#~ msgstr "Id Usuario"
-
 #~ msgid "License:"
 #~ msgstr "Licencia:"
 

Modified: trunk/src/translations/eu.po
===================================================================
--- trunk/src/translations/eu.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/eu.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-02-19 23:28+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1671,7 +1671,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2607,7 +2608,7 @@
 msgid "Failed to find user %s"
 msgstr "Akatsa trebezia sartzean"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Ongi gehitutako erabiltzailea"
@@ -2987,7 +2988,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr "Ezin izan da rola eskuratu"
@@ -3388,7 +3389,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4663,7 +4664,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4930,7 +4931,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Id-a"
 
@@ -6142,8 +6144,8 @@
 msgid "Existing Responses"
 msgstr "Erregistratutako erantzunak"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID-a"
@@ -9074,8 +9076,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Erabiltzaile izena"
@@ -9405,7 +9411,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "Azpiproiektuaren izen berria"
@@ -14208,8 +14214,7 @@
 msgid "Member since:"
 msgstr "Noiztik bazkide"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "Erabiltzaile ID-a"
@@ -14991,66 +14996,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Parametro bat ahaztu zaizu"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "Arrakastaz sortutako artikulua"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "Arrakastaz sortutako artikulua"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "Ongi gehitutako erabiltzailea"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "Akatsa kontua aktibatzen zenuen bitartean"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Bertsioa"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Ongi ezabatutako erabiltzaileate"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "Akatsa kontua aktibatzen zenuen bitartean"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "Datu basearen sarrera ezin dut gehitu"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "Bertsioa"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "Erabiltzaile izena:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15065,34 +15059,34 @@
 msgid "Add User"
 msgstr "Erabiltzailea gehitu"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Rol Izena"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "Atala"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "Azpiatala"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "Ezaugarriak"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Fitxeroa ezabatu"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Erlazionatuak dauden erregistroko elementuak"
@@ -15184,8 +15178,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Unix izena"
@@ -15713,10 +15707,13 @@
 msgstr[0] "Erabiltzaileak bilatu hirizpide hauen arabera"
 msgstr[1] "Erabiltzaileak bilatu hirizpide hauen arabera"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Benetazko izena"
 
 #: www/admin/search.php:76
@@ -15735,6 +15732,12 @@
 msgstr[0] "Erabiltzaileak bilatu hirizpide hauen arabera"
 msgstr[1] "Erabiltzaileak bilatu hirizpide hauen arabera"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Unix izena"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Izen osoa"
@@ -15887,12 +15890,6 @@
 msgid "user_id"
 msgstr "erabiltzailearen_id-a"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Benetazko izena"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Web atariko posta"
@@ -15938,9 +15935,9 @@
 msgid "Account Information"
 msgstr "Kontuaren informazioa"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Erabiltzaile izena:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Erabiltzaile ID-a"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20283,12 +20280,6 @@
 msgid "No Matching Users Found"
 msgstr "Ez daude bat datozen atazik"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Unix izena"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -21157,6 +21148,7 @@
 msgstr "Ixte data"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Ikusitako orriak"
 
@@ -22931,7 +22923,7 @@
 msgid "View Other Top Categories"
 msgstr "Beste kategoria nagusiak ikusi"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "Azpiproiektuaren izen berria"
@@ -22950,10 +22942,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr "Azken * astean gehien ikusitako orriak (%2$s logoko joaldien arabera)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Ikusitako orriak"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "Sailkapen honen informazioa ez dago eskuragarria"
@@ -23224,6 +23212,23 @@
 msgid "That user does not exist."
 msgstr "Ez dago kategoria hau"
 
+#~ msgid "User name:"
+#~ msgstr "Erabiltzaile izena:"
+
+#~ msgid "Real name"
+#~ msgstr "Benetazko izena"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Ongi gehitutako erabiltzailea"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Erabiltzaile izena:"
+
+#~ msgid "Pageviews"
+#~ msgstr "Ikusitako orriak"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "'Hash' Baieztapen baliogabekoa"
 
@@ -24589,9 +24594,6 @@
 #~ msgid "Approve/Reject"
 #~ msgstr "Onartu/Baztertu"
 
-#~ msgid "User Id"
-#~ msgstr "Erabiltzaile ID-a"
-
 #, fuzzy
 #~ msgid "Customize"
 #~ msgstr "Eremu pertsonalizatu izena"

Modified: trunk/src/translations/fr.po
===================================================================
--- trunk/src/translations/fr.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/fr.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2013-06-03 17:17+0100\n"
 "Last-Translator: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent."
 "com>\n"
@@ -1581,7 +1581,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2517,7 +2518,7 @@
 msgid "Failed to find user %s"
 msgstr "Impossible de trouver l'utilisateur %s"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 msgid "User Added Successfully"
 msgstr "Utilisateur ajouté avec succès"
 
@@ -2884,7 +2885,7 @@
 msgstr "Erreur de base de données : project_assigned_to : %d / %s"
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr "Erreur lors de la création de l'objet Role"
@@ -3270,7 +3271,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr "Administration du site"
@@ -4506,7 +4507,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4765,7 +4766,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Numéro d'identifiant"
 
@@ -5943,8 +5945,8 @@
 msgid "Existing Responses"
 msgstr "Réponses existantes"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "Identifiant"
@@ -8857,8 +8859,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 msgid "User Name"
 msgstr "Nom de l'utilisateur"
 
@@ -9169,7 +9175,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr "Nom du projet"
 
@@ -13912,8 +13918,7 @@
 msgid "Member since:"
 msgstr "Membre depuis le :"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 msgid "User Id:"
 msgstr "Identifiant d'utilisateur"
 
@@ -14721,59 +14726,50 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr "Erreur : veuillez confirmer la suppression de ce rôle."
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 msgid "Missing Role Name"
 msgstr "Nom du rôle manquant"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr "Nouveau rôle créé avec succès"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr "Rôle mis à jour"
 
-#: www/admin/globalroleedit.php:102
-msgid "User added successfully"
-msgstr "Utilisateur ajouté avec succès"
-
-#: www/admin/globalroleedit.php:104
+#: www/admin/globalroleedit.php:106
 msgid "Error while adding user to role"
 msgstr "Erreur durant l'ajout de l'utilisateur au rôle"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
 msgstr "Impossible d'ajouter un utilisateur à un rôle de ce type."
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr "Erreur : vous n'avez pas coché la case « réellement supprimer »."
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, php-format
 msgid "User %s removed successfully"
 msgstr "Utilisateur %s enlevé avec succès"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, php-format
 msgid "Error while removing user %s from role"
 msgstr "Erreur lors de la révocation d'un rôle de l'utilisateur %s."
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
 msgstr "Impossible de supprimer un utilisateur de ce type de rôle."
 
 #: www/admin/globalroleedit.php:143
 msgid "Current users with this role"
 msgstr "Utilisateurs ayant actuellement ce rôle"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr "Nom d'utilisateur"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr "Réellement supprimer ce rôle pour l'utilisateur ?"
@@ -14786,33 +14782,33 @@
 msgid "Add User"
 msgstr "Ajouter un utilisateur"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Nom du rôle"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr "Rôle public (peut être référencé par des projets)"
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "Section"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "Sous-section"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "Paramètrage"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 msgid "Delete role"
 msgstr "Supprimer le rôle"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 msgid "Really delete this role?"
 msgstr "Supprimer irrémédiablement ce rôle ?"
 
@@ -14898,8 +14894,8 @@
 msgid "Register Time"
 msgstr "Date d'enregistrement"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr "Nom Unix"
 
@@ -15413,10 +15409,12 @@
 msgstr[1] ""
 "Recherche d'utilisateurs selon les critères <em>%1$s</em> : %2$s résultats"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+msgid "Real Name"
 msgstr "Nom complet"
 
 #: www/admin/search.php:76
@@ -15437,6 +15435,11 @@
 msgstr[1] ""
 "Recherche de groupes selon les critères <em>%1$s</em> : %2$d résultats"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr "Nom Unix"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Nom complet"
@@ -15587,11 +15590,6 @@
 msgid "user_id"
 msgstr "Identifiant utilisateur :"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-msgid "Real Name"
-msgstr "Nom complet"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Courrier"
@@ -15636,9 +15634,9 @@
 msgid "Account Information"
 msgstr "Informations du compte"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Nom d'utilisateur :"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Identifiant d'utilisateur"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20014,11 +20012,6 @@
 msgid "No Matching Users Found"
 msgstr "Aucun utilisateur correspondant."
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr "Nom Unix"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "Finir"
@@ -20896,6 +20889,7 @@
 msgstr "Tâche fermée"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "pages"
 
@@ -22689,7 +22683,7 @@
 msgid "View Other Top Categories"
 msgstr "Voir les autres catégories"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr "Nom du projet"
 
@@ -22708,10 +22702,6 @@
 "Le plus de pages vues sur *.%1$s (hebdomadaire, à partir de l'affichage du "
 "logo %2$s)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Nombre de pages vues"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""
@@ -22964,6 +22954,21 @@
 msgid "That user does not exist."
 msgstr "Cet utilisateur n'existe pas"
 
+#~ msgid "User name:"
+#~ msgstr "Nom d'utilisateur :"
+
+#~ msgid "Real name"
+#~ msgstr "Nom complet"
+
+#~ msgid "User added successfully"
+#~ msgstr "Utilisateur ajouté avec succès"
+
+#~ msgid "User name"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "Pageviews"
+#~ msgstr "Nombre de pages vues"
+
 #~ msgid "ALL"
 #~ msgstr "TOUT"
 
@@ -26785,9 +26790,6 @@
 #~ msgid "The Attachment does not exist"
 #~ msgstr "La pièce jointe n'existe pas."
 
-#~ msgid "User Id"
-#~ msgstr "Identifiant d'utilisateur"
-
 #~ msgid "Visibility: "
 #~ msgstr "Visibilité :"
 

Modified: trunk/src/translations/fusionforge.pot
===================================================================
--- trunk/src/translations/fusionforge.pot	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/fusionforge.pot	2013-07-22 10:16:10 UTC (rev 17606)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1551,7 +1551,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2446,7 +2447,7 @@
 msgid "Failed to find user %s"
 msgstr ""
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 msgid "User Added Successfully"
 msgstr ""
 
@@ -2795,7 +2796,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr ""
@@ -3117,7 +3118,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr ""
@@ -4267,7 +4268,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4520,7 +4521,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr ""
 
@@ -5654,8 +5656,8 @@
 msgid "Existing Responses"
 msgstr ""
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr ""
@@ -8354,8 +8356,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 msgid "User Name"
 msgstr ""
 
@@ -8655,7 +8661,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr ""
 
@@ -13035,8 +13041,7 @@
 msgid "Member since:"
 msgstr ""
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 msgid "User Id:"
 msgstr ""
 
@@ -13766,59 +13771,48 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 msgid "Missing Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:102
-msgid "User added successfully"
-msgstr ""
-
-#: www/admin/globalroleedit.php:104
+#: www/admin/globalroleedit.php:106
 msgid "Error while adding user to role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
+#: www/admin/globalroleedit.php:110
+msgid "Cannot add user to this type of role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, php-format
 msgid "User %s removed successfully"
 msgstr ""
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, php-format
 msgid "Error while removing user %s from role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+msgid "Cannot remove user from this type of role"
 msgstr ""
 
 #: www/admin/globalroleedit.php:143
 msgid "Current users with this role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr ""
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -13831,33 +13825,33 @@
 msgid "Add User"
 msgstr ""
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 msgid "Delete role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 msgid "Really delete this role?"
 msgstr ""
 
@@ -13942,8 +13936,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr ""
 
@@ -14435,10 +14429,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+msgid "Real Name"
 msgstr ""
 
 #: www/admin/search.php:76
@@ -14456,6 +14452,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr ""
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr ""
@@ -14593,11 +14594,6 @@
 msgid "user_id"
 msgstr ""
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-msgid "Real Name"
-msgstr ""
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr ""
@@ -14641,8 +14637,8 @@
 msgid "Account Information"
 msgstr ""
 
-#: www/admin/useredit.php:139
-msgid "User name:"
+#: www/admin/useredit.php:130
+msgid "User Id"
 msgstr ""
 
 #: www/admin/useredit.php:157
@@ -18673,11 +18669,6 @@
 msgid "No Matching Users Found"
 msgstr ""
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr ""
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -19452,6 +19443,7 @@
 msgstr ""
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr ""
 
@@ -21119,7 +21111,7 @@
 msgid "View Other Top Categories"
 msgstr ""
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr ""
 
@@ -21136,10 +21128,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr ""
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr ""
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""

Modified: trunk/src/translations/gl.po
===================================================================
--- trunk/src/translations/gl.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/gl.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-09-21 10:21+0100\n"
 "Last-Translator: José Manuel Castroagudín Silva <chavescesures at gmail.com>\n"
 "Language-Team: Galician <g11n at mancomun.org>\n"
@@ -1681,7 +1681,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2634,7 +2635,7 @@
 msgid "Failed to find user %s"
 msgstr "Non se puido atopar o usuario %s"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Engadiuse o usuario correctamente"
@@ -3020,7 +3021,7 @@
 msgstr "ERRO: BD: project_assigned_to %d: %s"
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr "Non se puido obter o Rol"
@@ -3409,7 +3410,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr "Administración do sitio"
@@ -4696,7 +4697,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4967,7 +4968,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Id"
 
@@ -6178,8 +6180,8 @@
 msgid "Existing Responses"
 msgstr "Respostas existentes"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID "
@@ -9173,8 +9175,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Nome de usuario "
@@ -9487,7 +9493,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr "Nome do proxecto"
 
@@ -14417,8 +14423,7 @@
 msgid "Member since:"
 msgstr "Membro desde: "
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "ID de usuario "
@@ -15228,63 +15233,53 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Esqueceu un parámetro "
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr "Creouse un rol novo correctamente"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr "Actualizouse o rol correctamente"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "Engadiuse o usuario correctamente"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "Produciuse un erro ao activar a conta "
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Versión actual"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Eliminouse o usuario correctamente"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "Produciuse un erro ao activar a conta "
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "Non se pode eliminar a etiqueta: %s"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "Versión actual"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr "Nome de usuario"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15299,34 +15294,34 @@
 msgid "Add User"
 msgstr "Engadir usuario"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Nome do rol"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "Sección"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "Subsección"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "Axuste"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Eliminar ficheiro "
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Eliminar permanentemente este rexistro."
@@ -15416,8 +15411,8 @@
 msgid "Register Time"
 msgstr "Hora de rexistro "
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr "Nome unix "
 
@@ -15945,10 +15940,13 @@
 msgstr[0] "Busca do usuario cos criterios <em>%1$s</em>: %2$s coincidencia"
 msgstr[1] "Busca do usuario cos criterios <em>%1$s</em>: %2$s coincidencias"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Nome verdadeiro "
 
 #: www/admin/search.php:76
@@ -15967,6 +15965,11 @@
 msgstr[0] "Busca do grupo cos criterios <em>%s</em>: %d coincidencia"
 msgstr[1] "Busca do grupo cos criterios <em>%s</em>: %d coincidencias"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr "Nome Unix"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Nome completo "
@@ -16124,12 +16127,6 @@
 msgid "user_id"
 msgstr "ID de usuario"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Nome verdadeiro "
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Correo do sitio."
@@ -16174,9 +16171,9 @@
 msgid "Account Information"
 msgstr "Información da conta "
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Nome de usuario: "
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "ID de usuario "
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20602,11 +20599,6 @@
 msgid "No Matching Users Found"
 msgstr "Non se atoparon usuarios coincidentes"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr "Nome Unix"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "Rematar"
@@ -21488,6 +21480,7 @@
 msgstr "Rexistro pechado"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Visualizacións de páxina"
 
@@ -23277,7 +23270,7 @@
 msgid "View Other Top Categories"
 msgstr "Ver outras categorías destacadas"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr "Nome do proxecto"
 
@@ -23296,10 +23289,6 @@
 "Os proxectos máis visitados na última semana en *.%1$s (segundo as "
 "impresións do logotipo de %2$s)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Páxinas vistas"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "A información sobre os usuarios mellor puntuados non está dispoñíbel."
@@ -23568,6 +23557,22 @@
 msgid "That user does not exist."
 msgstr "Ese usuario non existe. "
 
+#~ msgid "User name:"
+#~ msgstr "Nome de usuario: "
+
+#~ msgid "Real name"
+#~ msgstr "Nome verdadeiro "
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Engadiuse o usuario correctamente"
+
+#~ msgid "User name"
+#~ msgstr "Nome de usuario"
+
+#~ msgid "Pageviews"
+#~ msgstr "Páxinas vistas"
+
 #~ msgid "ALL"
 #~ msgstr "Todos "
 
@@ -25893,9 +25898,6 @@
 #~ msgid "The Attachment does not exist"
 #~ msgstr "O anexo non existe "
 
-#~ msgid "User Id"
-#~ msgstr "ID de usuario "
-
 #~ msgid "Visibility: "
 #~ msgstr "Visibilidade:"
 

Modified: trunk/src/translations/it.po
===================================================================
--- trunk/src/translations/it.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/it.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2010-10-06 15:06+0200\n"
 "Last-Translator: Reinhard Spisser <reinhard.spisser at fiditalia.it>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1677,7 +1677,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2634,7 +2635,7 @@
 msgid "Failed to find user %s"
 msgstr "Aggiunta competenza fallita"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Utente aggiunto con successo"
@@ -3021,7 +3022,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3413,7 +3414,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4687,7 +4688,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4957,7 +4958,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Id"
 
@@ -6170,8 +6172,8 @@
 msgid "Existing Responses"
 msgstr "Risposte esistenti"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID"
@@ -9134,8 +9136,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Nome utente"
@@ -9470,7 +9476,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "Nome progetto"
@@ -14300,8 +14306,7 @@
 msgid "Member since:"
 msgstr "Data registrazione:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "Id utente"
@@ -15096,66 +15101,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Parametro mancante"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "Elemento creato con successo"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "Aggiunto."
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "Utente aggiunto con successo"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "Errore durante l'attivazione dell'account"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "File corrente"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Utente eliminato con successo"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "Errore durante l'attivazione dell'account"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "Impossibile aggiungere database"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "File corrente"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "Nome utente:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15170,34 +15164,34 @@
 msgid "Add User"
 msgstr "Aggiungi utente"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Nome ruolo"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "Sezione"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "Sottosezione"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "Impostazione"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Rimuovi file"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Rimuovi in modo permanente questo tracker"
@@ -15289,8 +15283,8 @@
 msgid "Register Time"
 msgstr "Ora di registrazione"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Nome unix"
@@ -15822,10 +15816,13 @@
 msgstr[0] "Ricerca utente con criterio"
 msgstr[1] "Ricerca utente con criterio"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Nome reale"
 
 #: www/admin/search.php:76
@@ -15844,6 +15841,11 @@
 msgstr[0] "Ricerca utente con criterio"
 msgstr[1] "Ricerca utente con criterio"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr "Nome Unix"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Nome completo"
@@ -15994,12 +15996,6 @@
 msgid "user_id"
 msgstr "Id utente"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Nome reale"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Mail sito"
@@ -16045,9 +16041,9 @@
 msgid "Account Information"
 msgstr "Informazione account"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Nome utente:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Id utente"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20411,11 +20407,6 @@
 msgid "No Matching Users Found"
 msgstr "Nessun utente trovato"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr "Nome Unix"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "Termina"
@@ -21295,6 +21286,7 @@
 msgstr "Tracker chiusi"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Pagine visitate"
 
@@ -23081,7 +23073,7 @@
 msgid "View Other Top Categories"
 msgstr "Visualizza altre statistiche"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "Nome progetto"
@@ -23101,10 +23093,6 @@
 msgstr ""
 "Pagine di progetto più visitate su *.%1$s (dagli accessi al logo di %2$s)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Visite alle pagine"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "Informazione sugli utenti più valutati non è disponibile."
@@ -23382,6 +23370,23 @@
 msgid "That user does not exist."
 msgstr "La query non esiste"
 
+#~ msgid "User name:"
+#~ msgstr "Nome utente:"
+
+#~ msgid "Real name"
+#~ msgstr "Nome reale"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Utente aggiunto con successo"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Nome utente:"
+
+#~ msgid "Pageviews"
+#~ msgstr "Visite alle pagine"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "Il codice hash di conferma non è valido."
 
@@ -24914,9 +24919,6 @@
 #~ msgid "The Attachment does not exist"
 #~ msgstr "L'allegato non esiste"
 
-#~ msgid "User Id"
-#~ msgstr "Id utente"
-
 #, fuzzy
 #~ msgid "Customize"
 #~ msgstr "Nome campo personalizzato"

Modified: trunk/src/translations/ja.po
===================================================================
--- trunk/src/translations/ja.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/ja.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-01-15 14:05+0100\n"
 "Last-Translator: Roland Mas <lolando at debian.org>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1660,7 +1660,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2585,7 +2586,7 @@
 msgid "Failed to find user %s"
 msgstr ""
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "更新に成功しました。"
@@ -2958,7 +2959,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3319,7 +3320,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4552,7 +4553,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4811,7 +4812,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr ""
 
@@ -5987,8 +5989,8 @@
 msgid "Existing Responses"
 msgstr ""
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr ""
@@ -8847,8 +8849,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "プロジェクト管理"
@@ -9171,7 +9177,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "プロジェクト管理"
@@ -13835,8 +13841,7 @@
 msgid "Member since:"
 msgstr "メンバー登録日"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 msgid "User Id:"
 msgstr ""
 
@@ -14607,62 +14612,50 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "見あたらないパラメータ"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "更新に成功しました。"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "アカウントをアクティブにするときにエラーが発生しました"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
+#: www/admin/globalroleedit.php:110
+msgid "Cannot add user to this type of role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "更新に成功しました。"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "アカウントをアクティブにするときにエラーが発生しました"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+msgid "Cannot remove user from this type of role"
 msgstr ""
 
 #: www/admin/globalroleedit.php:143
 msgid "Current users with this role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr ""
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -14677,34 +14670,34 @@
 msgid "Add User"
 msgstr "タスク追加"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "ファイル"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "グループ編集"
@@ -14794,8 +14787,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr "ログイン名"
 
@@ -15307,11 +15300,14 @@
 msgid_plural "User search with criteria <em>%1$s</em>: %2$s matches"
 msgstr[0] ""
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
-msgstr ""
+#, fuzzy
+msgid "Real Name"
+msgstr "ログイン名:"
 
 #: www/admin/search.php:76
 msgid "Member since"
@@ -15328,6 +15324,12 @@
 msgid_plural "Group search with criteria <em>%s</em>: %d matches"
 msgstr[0] ""
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "ログイン名"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr ""
@@ -15470,12 +15472,6 @@
 msgid "user_id"
 msgstr ""
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "ログイン名:"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr ""
@@ -15521,9 +15517,10 @@
 msgid "Account Information"
 msgstr ""
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr ""
+#: www/admin/useredit.php:130
+#, fuzzy
+msgid "User Id"
+msgstr "プロジェクト管理"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -19685,12 +19682,6 @@
 msgid "No Matching Users Found"
 msgstr "ニュースアイテムは見つかりません"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "ログイン名"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -20507,6 +20498,7 @@
 msgstr ""
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr ""
 
@@ -22220,7 +22212,7 @@
 msgid "View Other Top Categories"
 msgstr ""
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "プロジェクト管理"
@@ -22238,10 +22230,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr ""
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr ""
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""
@@ -22492,6 +22480,10 @@
 msgid "That user does not exist."
 msgstr "そのユーザー名はすでに存在します。"
 
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "更新に成功しました。"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "(未訳:account_lostlogin.invalidconfirm)Invalid confirmation hash"
 

Modified: trunk/src/translations/ko.po
===================================================================
--- trunk/src/translations/ko.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/ko.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-02-01 14:36+0100\n"
 "Last-Translator: \n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1670,7 +1670,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2605,7 +2606,7 @@
 msgid "Failed to find user %s"
 msgstr "스킬 추가 작업이 실패하였습니다."
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "사용자가 성공적으로 추가되었습니다."
@@ -2987,7 +2988,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3384,7 +3385,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4637,7 +4638,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4901,7 +4902,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Id"
 
@@ -6110,8 +6112,8 @@
 msgid "Existing Responses"
 msgstr "존재하는 의견들"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID"
@@ -9028,8 +9030,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Username"
@@ -9357,7 +9363,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "새 프로젝트 이름"
@@ -14119,8 +14125,7 @@
 msgid "Member since:"
 msgstr "가입한 날:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "사용자 번호"
@@ -14901,66 +14906,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "인자가 빠졌습니다."
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "항목을 생성하였습니다."
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "항목을 생성하였습니다."
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "사용자가 성공적으로 추가되었습니다."
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "계정을 활성화하는 도중 오류가 발생하였습니다."
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Version"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "사용자가 성공적으로 삭제되었습니다."
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "계정을 활성화하는 도중 오류가 발생하였습니다."
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "database 항목을 추가할 수 없습니다."
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "Version"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "User name:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -14975,34 +14969,34 @@
 msgid "Add User"
 msgstr "사용자 추가"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "파일 삭제하기"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Related Tracker Items"
@@ -15094,8 +15088,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Unix 이름"
@@ -15618,10 +15612,13 @@
 msgid_plural "User search with criteria <em>%1$s</em>: %2$s matches"
 msgstr[0] "User search with criteria"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Real name"
 
 #: www/admin/search.php:76
@@ -15639,6 +15636,12 @@
 msgid_plural "Group search with criteria <em>%s</em>: %d matches"
 msgstr[0] "User search with criteria"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Unix 이름"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Full Name"
@@ -15793,12 +15796,6 @@
 msgid "user_id"
 msgstr "user_id"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Real name"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Site Mail."
@@ -15844,9 +15841,9 @@
 msgid "Account Information"
 msgstr "Account Information"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "User name:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "사용자 번호"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20165,12 +20162,6 @@
 msgid "No Matching Users Found"
 msgstr "해당하는 임무를 찾을 수 없음"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Unix 이름"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -21025,6 +21016,7 @@
 msgstr "종료일"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Page Views"
 
@@ -22792,7 +22784,7 @@
 msgid "View Other Top Categories"
 msgstr "다른 통계 상황 보기"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "새 프로젝트 이름"
@@ -22811,10 +22803,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr "주간 페이지뷰 순위 *.%1$s (%2$s 로고 클릭 횟수)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "페이지뷰"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "우수 사용자에 대한 정보가 없습니다."
@@ -23087,6 +23075,23 @@
 msgid "That user does not exist."
 msgstr "분류 기준이 존재하지 않습니다."
 
+#~ msgid "User name:"
+#~ msgstr "User name:"
+
+#~ msgid "Real name"
+#~ msgstr "Real name"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "사용자가 성공적으로 추가되었습니다."
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "User name:"
+
+#~ msgid "Pageviews"
+#~ msgstr "페이지뷰"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "확인에 사용된 hash값이 맞지 않습니다."
 
@@ -24107,9 +24112,6 @@
 #~ msgid "Approve/Reject"
 #~ msgstr "Approve/Reject"
 
-#~ msgid "User Id"
-#~ msgstr "사용자 번호"
-
 #~ msgid "User ID:"
 #~ msgstr "User ID:"
 

Modified: trunk/src/translations/nl.po
===================================================================
--- trunk/src/translations/nl.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/nl.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-02-01 14:36+0100\n"
 "Last-Translator: \n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1674,7 +1674,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2610,7 +2611,7 @@
 msgid "Failed to find user %s"
 msgstr "Toevoegen van vaardigheden niet gelukt."
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Gebruiker toegevoegd"
@@ -2996,7 +2997,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3394,7 +3395,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4675,7 +4676,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4946,7 +4947,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "ID"
 
@@ -6157,8 +6159,8 @@
 msgid "Existing Responses"
 msgstr "Bestaande antwoorden"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID"
@@ -9110,8 +9112,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Gebruikersnaam"
@@ -9446,7 +9452,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "Nieuwe projectnaam"
@@ -14288,8 +14294,7 @@
 msgid "Member since:"
 msgstr "Lid sinds"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "Gebruikers ID"
@@ -15086,66 +15091,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Ontbrekende parameter"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "Item aangemaakt"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "Toegevoegd"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "Gebruiker toegevoegd"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "Fout tijdens activeren account"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Versie"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Gebruiker verwijderd"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "Fout tijdens activeren account"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "Kan geen database element toevoegen"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "Versie"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "gebruikersnaam:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15160,34 +15154,34 @@
 msgid "Add User"
 msgstr "Gebruiker toevoegen"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Rolnaam"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "Sectie"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "Subsectie"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "Instelling"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Bestand wissen"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Deze tracker onherroepelijk verwijderen."
@@ -15279,8 +15273,8 @@
 msgid "Register Time"
 msgstr "Tijdregistratie"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Unixnaam"
@@ -15809,10 +15803,13 @@
 msgstr[0] "Gebruiker zoeken met criteria"
 msgstr[1] "Gebruiker zoeken met criteria"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Echte naam"
 
 #: www/admin/search.php:76
@@ -15831,6 +15828,12 @@
 msgstr[0] "Gebruiker zoeken met criteria"
 msgstr[1] "Gebruiker zoeken met criteria"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Unixnaam"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Volledige naam"
@@ -15979,12 +15982,6 @@
 msgid "user_id"
 msgstr "gebruikers ID"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Echte naam"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Site mail."
@@ -16030,9 +16027,9 @@
 msgid "Account Information"
 msgstr "Account informatie"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "gebruikersnaam:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Gebruikers ID"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20398,12 +20395,6 @@
 msgid "No Matching Users Found"
 msgstr "Geen matchende gebruikers gevonden"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Unixnaam"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "Eindigen"
@@ -21293,6 +21284,7 @@
 msgstr "Datum afgesloten"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Pagina bezoeken"
 
@@ -23084,7 +23076,7 @@
 msgid "View Other Top Categories"
 msgstr "Bekijk andere hoogste categorieën"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "Nieuwe projectnaam"
@@ -23104,10 +23096,6 @@
 msgstr ""
 "Hoogste aantal paginabezoeken per week op *.%1$s (klikken op het %2$s logo)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Paginabezoeken"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "Informatie over hoogst beoordeelde gebruikers is niet beschikbaar."
@@ -23386,6 +23374,23 @@
 msgid "That user does not exist."
 msgstr "Die Trove categorie bestaat niet"
 
+#~ msgid "User name:"
+#~ msgstr "gebruikersnaam:"
+
+#~ msgid "Real name"
+#~ msgstr "Echte naam"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Gebruiker toegevoegd"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "gebruikersnaam:"
+
+#~ msgid "Pageviews"
+#~ msgstr "Paginabezoeken"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "Ongeldige bevestigings hash"
 
@@ -24890,9 +24895,6 @@
 #~ msgid "Add, Delete, or Edit Licenses"
 #~ msgstr "Toevoegen, Verwijderen, of Wijzigen van licenties"
 
-#~ msgid "User Id"
-#~ msgstr "Gebruikers ID"
-
 #, fuzzy
 #~ msgid "Customize"
 #~ msgstr "Extra veldnaam"

Modified: trunk/src/translations/pl.po
===================================================================
--- trunk/src/translations/pl.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/pl.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-10-06 16:20+0200\n"
 "Last-Translator: Roland Mas <lolando at debian.org>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1643,7 +1643,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2556,7 +2557,7 @@
 msgid "Failed to find user %s"
 msgstr ""
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Grupa dokumentów: Nazwa jest wymagana"
@@ -2909,7 +2910,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr ""
@@ -3237,7 +3238,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr ""
@@ -4409,7 +4410,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4663,7 +4664,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr ""
 
@@ -5821,8 +5823,8 @@
 msgid "Existing Responses"
 msgstr ""
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr ""
@@ -8612,8 +8614,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Nazwisko:"
@@ -8918,7 +8924,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr ""
 
@@ -13535,8 +13541,7 @@
 msgid "Member since:"
 msgstr "Użytkownik od:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "ID użytkownika:"
@@ -14284,60 +14289,49 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Nazwa Pliku"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:102
-msgid "User added successfully"
-msgstr ""
-
-#: www/admin/globalroleedit.php:104
+#: www/admin/globalroleedit.php:106
 msgid "Error while adding user to role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
+#: www/admin/globalroleedit.php:110
+msgid "Cannot add user to this type of role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Grupa dokumentów: Nazwa jest wymagana"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, php-format
 msgid "Error while removing user %s from role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+msgid "Cannot remove user from this type of role"
 msgstr ""
 
 #: www/admin/globalroleedit.php:143
 msgid "Current users with this role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr ""
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -14350,34 +14344,34 @@
 msgid "Add User"
 msgstr ""
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Dodaj Grupę Dokumentów"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Edytuj grupę"
@@ -14463,8 +14457,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr ""
 
@@ -14963,11 +14957,14 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
-msgstr ""
+#, fuzzy
+msgid "Real Name"
+msgstr "Nazwa wydania:"
 
 #: www/admin/search.php:76
 msgid "Member since"
@@ -14985,6 +14982,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Brak wydań"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr ""
@@ -15123,12 +15126,6 @@
 msgid "user_id"
 msgstr ""
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Nazwa wydania:"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr ""
@@ -15173,9 +15170,10 @@
 msgid "Account Information"
 msgstr ""
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr ""
+#: www/admin/useredit.php:130
+#, fuzzy
+msgid "User Id"
+msgstr "ID użytkownika:"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -19253,12 +19251,6 @@
 msgid "No Matching Users Found"
 msgstr ""
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Brak wydań"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -20042,6 +20034,7 @@
 msgstr ""
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr ""
 
@@ -21726,7 +21719,7 @@
 msgid "View Other Top Categories"
 msgstr ""
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr ""
 
@@ -21743,10 +21736,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr ""
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr ""
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""

Modified: trunk/src/translations/pt.po
===================================================================
--- trunk/src/translations/pt.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/pt.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-02-01 14:35+0100\n"
 "Last-Translator: \n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1556,7 +1556,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2452,7 +2453,7 @@
 msgid "Failed to find user %s"
 msgstr ""
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 msgid "User Added Successfully"
 msgstr "Usuário Adicionado com Sucesso"
 
@@ -2805,7 +2806,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr ""
@@ -3134,7 +3135,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr "Administrador do Site"
@@ -4291,7 +4292,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4544,7 +4545,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Id"
 
@@ -5688,8 +5690,8 @@
 msgid "Existing Responses"
 msgstr "Respostas Existentes"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID"
@@ -8391,8 +8393,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 msgid "User Name"
 msgstr ""
 
@@ -8692,7 +8698,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr "Nome do Projeto"
 
@@ -13090,8 +13096,7 @@
 msgid "Member since:"
 msgstr "Membro desde:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 msgid "User Id:"
 msgstr ""
 
@@ -13833,59 +13838,48 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 msgid "Missing Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:102
-msgid "User added successfully"
-msgstr ""
-
-#: www/admin/globalroleedit.php:104
+#: www/admin/globalroleedit.php:106
 msgid "Error while adding user to role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
+#: www/admin/globalroleedit.php:110
+msgid "Cannot add user to this type of role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, php-format
 msgid "User %s removed successfully"
 msgstr ""
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, php-format
 msgid "Error while removing user %s from role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+msgid "Cannot remove user from this type of role"
 msgstr ""
 
 #: www/admin/globalroleedit.php:143
 msgid "Current users with this role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr ""
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -13898,33 +13892,33 @@
 msgid "Add User"
 msgstr ""
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 msgid "Delete role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 msgid "Really delete this role?"
 msgstr ""
 
@@ -14009,8 +14003,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr ""
 
@@ -14502,10 +14496,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+msgid "Real Name"
 msgstr "Nome real"
 
 #: www/admin/search.php:76
@@ -14523,6 +14519,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr "Nome Unix"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Nome Completo"
@@ -14663,11 +14664,6 @@
 msgid "user_id"
 msgstr "id do usuário"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-msgid "Real Name"
-msgstr "Nome real"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Correio do Site."
@@ -14711,9 +14707,9 @@
 msgid "Account Information"
 msgstr "Informações da Conta"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Nome do usuário:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Id de Usuário"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -18843,11 +18839,6 @@
 msgid "No Matching Users Found"
 msgstr ""
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr "Nome Unix"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -19646,6 +19637,7 @@
 msgstr ""
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Visual. de Pág."
 
@@ -21341,7 +21333,7 @@
 msgid "View Other Top Categories"
 msgstr "Ver Outras Categorias"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr ""
 
@@ -21360,10 +21352,6 @@
 "Projeto Mais Visualizado Semanalmente no *.%1$s (por impressões do logotipo "
 "do %2$s)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Visual. de Pág."
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "Informação sobre os usuários melhor pontuados não está disponível."
@@ -21606,6 +21594,15 @@
 msgid "That user does not exist."
 msgstr ""
 
+#~ msgid "User name:"
+#~ msgstr "Nome do usuário:"
+
+#~ msgid "Real name"
+#~ msgstr "Nome real"
+
+#~ msgid "Pageviews"
+#~ msgstr "Visual. de Pág."
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "Hash de confirmação inválido"
 
@@ -22150,9 +22147,6 @@
 #~ msgid "Approve/Reject"
 #~ msgstr "Aprovar/Rejeitar"
 
-#~ msgid "User Id"
-#~ msgstr "Id de Usuário"
-
 #~ msgid "User ID:"
 #~ msgstr "ID de Usuário:"
 

Modified: trunk/src/translations/ru.po
===================================================================
--- trunk/src/translations/ru.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/ru.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-02-18 16:52+0100\n"
 "Last-Translator: Aleksey Bragin <aleksey at reactos.org>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1682,7 +1682,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2614,7 +2615,7 @@
 msgid "Failed to find user %s"
 msgstr "Навыки не добавлены"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Вы добавили участника в проект"
@@ -2998,7 +2999,7 @@
 msgstr "Ошибка базы данных назначения проекта %d: %s"
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr "Ошибка, не указана роль"
@@ -3383,7 +3384,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4680,7 +4681,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4950,7 +4951,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "Идентификатор"
 
@@ -6167,8 +6169,8 @@
 msgid "Existing Responses"
 msgstr "Плоученые ответы"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "<small><u>категория</u> :</small>"
@@ -9168,8 +9170,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Имя участника"
@@ -9505,7 +9511,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "Название проекта"
@@ -14521,8 +14527,7 @@
 msgid "Member since:"
 msgstr "Дата регистрации участника:"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "Id участника"
@@ -15329,65 +15334,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Неуказан параметр"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "Элемент успешно создан"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "Квоты успешно обновлены"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "Вы добавили участника в проект"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "Ошибка при авторизации"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Текущая версия"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Участник успешно удален"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "Ошибка при авторизации"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "Невозможно добавить запись в базу данных"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "Текущая версия"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr "Имя пользователя"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15402,34 +15397,34 @@
 msgid "Add User"
 msgstr "Добавить участника"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "Название роли"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "Секция"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "Подразделение"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "Установка"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Удалить файл"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Полностью удалить трекер."
@@ -15521,8 +15516,8 @@
 msgid "Register Time"
 msgstr "Время регистрации"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr "Уникальное имя (Unix)"
 
@@ -16061,10 +16056,13 @@
 msgstr[1] "Поиск по параметру <em>%1$s</em>: %2$s совпадения"
 msgstr[2] "Поиск по параметру <em>%1$s</em>: %2$s совпадений"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Реальное имя"
 
 #: www/admin/search.php:76
@@ -16084,6 +16082,12 @@
 msgstr[1] "Поиск группы по параметру<em>%1$s</em>: %2$s совпадения"
 msgstr[2] "Поиск группы по параметру <em>%1$s</em>: %2$s совпадений"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Уникальное имя (Unix)"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Полное имя"
@@ -16240,12 +16244,6 @@
 msgid "user_id"
 msgstr "Идентификатор пользователя"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Реальное имя"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Почта Сайта"
@@ -16291,9 +16289,9 @@
 msgid "Account Information"
 msgstr "Информация аккаунта"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Имя пользователя:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Id участника"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20718,12 +20716,6 @@
 msgid "No Matching Users Found"
 msgstr "<p>Соответствий не найдено</p>"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Уникальное имя (Unix)"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "Завершить"
@@ -21616,6 +21608,7 @@
 msgstr "Трекер закрыт"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Просмотров страницы"
 
@@ -23404,7 +23397,7 @@
 msgid "View Other Top Categories"
 msgstr "Просмотр других топ категорий"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr "Название проекта"
 
@@ -23423,10 +23416,6 @@
 "Высший уровень посещаемости страниц проекта за неделю *.%1$s (показов %2$s "
 "заставки)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Виды страниц"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "Нет информации об участниках высшего ранга "
@@ -23701,6 +23690,22 @@
 msgid "That user does not exist."
 msgstr "Пользователь с таким именем не существует."
 
+#~ msgid "User name:"
+#~ msgstr "Имя пользователя:"
+
+#~ msgid "Real name"
+#~ msgstr "Реальное имя"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Вы добавили участника в проект"
+
+#~ msgid "User name"
+#~ msgstr "Имя пользователя"
+
+#~ msgid "Pageviews"
+#~ msgstr "Виды страниц"
+
 #~ msgid "ALL"
 #~ msgstr "ВСЕ"
 
@@ -25769,9 +25774,6 @@
 #~ msgid "The Attachment does not exist"
 #~ msgstr "Такой прикрепленной части нет"
 
-#~ msgid "User Id"
-#~ msgstr "Id участника"
-
 #, fuzzy
 #~ msgid "Customize"
 #~ msgstr "Название нового поля"

Modified: trunk/src/translations/sv.po
===================================================================
--- trunk/src/translations/sv.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/sv.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-07-19 01:41+0200\n"
 "Last-Translator: Martin Bagge <brother at bsnet.se>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1668,7 +1668,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2612,7 +2613,7 @@
 msgid "Failed to find user %s"
 msgstr "Misslyckdes att lägga till kompetens"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "Tillägg av användare lyckades"
@@ -2991,7 +2992,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3396,7 +3397,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4654,7 +4655,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4918,7 +4919,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "ID"
 
@@ -6129,8 +6131,8 @@
 msgid "Existing Responses"
 msgstr "Existerande svar"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "ID"
@@ -9056,8 +9058,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "Användarnamn"
@@ -9386,7 +9392,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "Nytt projektnamn"
@@ -14163,8 +14169,7 @@
 msgid "Member since:"
 msgstr "Medlem sedan"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "Användar-ID"
@@ -14945,66 +14950,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "Parameter saknas"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "Lyckades skapa post"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "Lyckades skapa post"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "Tillägg av användare lyckades"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "Fel under aktiveringen av konto"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "Version"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "Borttag av användare lyckades"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "Fel under aktiveringen av konto"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "Kan inte lägga till databas post"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "Version"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "Användarnamn:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15019,34 +15013,34 @@
 msgid "Add User"
 msgstr "Lägg till användare"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "Ta bort fil"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "Relaterade poster i ordningslista"
@@ -15138,8 +15132,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Unixnamn"
@@ -15665,10 +15659,13 @@
 msgstr[0] "Användarsökning med urval"
 msgstr[1] "Användarsökning med urval"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "Verkligt namn"
 
 #: www/admin/search.php:76
@@ -15687,6 +15684,12 @@
 msgstr[0] "Användarsökning med urval"
 msgstr[1] "Användarsökning med urval"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Unixnamn"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "Fullt namn"
@@ -15837,12 +15840,6 @@
 msgid "user_id"
 msgstr "användar-ID"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "Verkligt namn"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "Webbplatspost."
@@ -15888,9 +15885,9 @@
 msgid "Account Information"
 msgstr "Kontoinformation"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "Användarnamn:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "Användar-ID"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20221,12 +20218,6 @@
 msgid "No Matching Users Found"
 msgstr "Hittade inga matchande uppgifter"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Unixnamn"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -21094,6 +21085,7 @@
 msgstr "Datum stängd"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "Sidläsningar"
 
@@ -22866,7 +22858,7 @@
 msgid "View Other Top Categories"
 msgstr "Se andra topkategorier"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "Nytt projektnamn"
@@ -22887,10 +22879,6 @@
 "Flest veckovisa projektsidläsningar på *.%1$s (från tryckningar på %2$s "
 "logon)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "Sidträffar"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "Information om högst rankad användare är inte tillgänglig"
@@ -23165,6 +23153,23 @@
 msgid "That user does not exist."
 msgstr "Den resurskategorin existerar inte"
 
+#~ msgid "User name:"
+#~ msgstr "Användarnamn:"
+
+#~ msgid "Real name"
+#~ msgstr "Verkligt namn"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "Tillägg av användare lyckades"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "Användarnamn:"
+
+#~ msgid "Pageviews"
+#~ msgstr "Sidträffar"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "Ogiltig bekräftelsenyckel"
 
@@ -24326,9 +24331,6 @@
 #~ msgid "Approve/Reject"
 #~ msgstr "Godkänn/Avslå"
 
-#~ msgid "User Id"
-#~ msgstr "Användar-ID"
-
 #~ msgid "User ID:"
 #~ msgstr "Användar-ID:"
 

Modified: trunk/src/translations/th.po
===================================================================
--- trunk/src/translations/th.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/th.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-10-06 16:32+0200\n"
 "Last-Translator: Roland Mas <lolando at debian.org>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1555,7 +1555,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2450,7 +2451,7 @@
 msgid "Failed to find user %s"
 msgstr ""
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 msgid "User Added Successfully"
 msgstr ""
 
@@ -2799,7 +2800,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 msgid "Could Not Get Role"
 msgstr ""
@@ -3121,7 +3122,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 msgid "Site Admin"
 msgstr ""
@@ -4271,7 +4272,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4524,7 +4525,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr ""
 
@@ -5658,8 +5660,8 @@
 msgid "Existing Responses"
 msgstr ""
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr ""
@@ -8355,8 +8357,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 msgid "User Name"
 msgstr ""
 
@@ -8656,7 +8662,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 msgid "Project Name"
 msgstr ""
 
@@ -13026,8 +13032,7 @@
 msgid "Member since:"
 msgstr ""
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 msgid "User Id:"
 msgstr ""
 
@@ -13757,59 +13762,48 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 msgid "Missing Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 msgid "Successfully Created New Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 msgid "Successfully Updated Role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:102
-msgid "User added successfully"
-msgstr ""
-
-#: www/admin/globalroleedit.php:104
+#: www/admin/globalroleedit.php:106
 msgid "Error while adding user to role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
+#: www/admin/globalroleedit.php:110
+msgid "Cannot add user to this type of role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, php-format
 msgid "User %s removed successfully"
 msgstr ""
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, php-format
 msgid "Error while removing user %s from role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
+#: www/admin/globalroleedit.php:135
+msgid "Cannot remove user from this type of role"
 msgstr ""
 
 #: www/admin/globalroleedit.php:143
 msgid "Current users with this role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-msgid "User name"
-msgstr ""
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -13822,33 +13816,33 @@
 msgid "Add User"
 msgstr ""
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr ""
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr ""
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr ""
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr ""
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 msgid "Delete role"
 msgstr ""
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 msgid "Really delete this role?"
 msgstr ""
 
@@ -13933,8 +13927,8 @@
 msgid "Register Time"
 msgstr ""
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 msgid "Unix name"
 msgstr ""
 
@@ -14425,10 +14419,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+msgid "Real Name"
 msgstr ""
 
 #: www/admin/search.php:76
@@ -14446,6 +14442,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+msgid "Unix Name"
+msgstr ""
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr ""
@@ -14583,11 +14584,6 @@
 msgid "user_id"
 msgstr ""
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-msgid "Real Name"
-msgstr ""
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr ""
@@ -14631,8 +14627,8 @@
 msgid "Account Information"
 msgstr ""
 
-#: www/admin/useredit.php:139
-msgid "User name:"
+#: www/admin/useredit.php:130
+msgid "User Id"
 msgstr ""
 
 #: www/admin/useredit.php:157
@@ -18658,11 +18654,6 @@
 msgid "No Matching Users Found"
 msgstr ""
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-msgid "Unix Name"
-msgstr ""
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr ""
@@ -19437,6 +19428,7 @@
 msgstr ""
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr ""
 
@@ -21104,7 +21096,7 @@
 msgid "View Other Top Categories"
 msgstr ""
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 msgid "Project name"
 msgstr ""
 
@@ -21121,10 +21113,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr ""
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr ""
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr ""

Modified: trunk/src/translations/zh_CN.po
===================================================================
--- trunk/src/translations/zh_CN.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/zh_CN.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2010-10-06 15:07+0200\n"
 "Last-Translator: 邱承 <qiucheng1 at sina.com>\n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1676,7 +1676,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2629,7 +2630,7 @@
 msgid "Failed to find user %s"
 msgstr "增加技能失败"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "用户添加成功"
@@ -3010,7 +3011,7 @@
 msgstr "错误:数据库:项目被指定给 %d: %s"
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3369,7 +3370,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4641,7 +4642,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4911,7 +4912,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "编号"
 
@@ -6121,8 +6123,8 @@
 msgid "Existing Responses"
 msgstr "已存在回应"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "编号"
@@ -9063,8 +9065,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "帐号"
@@ -9399,7 +9405,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "新项目名称"
@@ -14210,8 +14216,7 @@
 msgid "Member since:"
 msgstr "帐号创建日期"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "用户编号"
@@ -14986,66 +14991,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "缺少参数"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "项目成功创造"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "成功添加"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "用户添加成功"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "启用帐号过程中错误"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "版本"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "用户删除成功"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "启用帐号过程中错误"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "无法增加数据库分类"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "版本"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "名称:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15060,34 +15054,34 @@
 msgid "Add User"
 msgstr "增加用户"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "角色名称"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "区域"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "子区域"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "设置"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "删除文件"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "永久地删除这个跟踪系统。"
@@ -15179,8 +15173,8 @@
 msgid "Register Time"
 msgstr "注册时间"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Unix帐号"
@@ -15707,10 +15701,13 @@
 msgstr[0] "依照条件搜索用户"
 msgstr[1] "依照条件搜索用户"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "真实姓名"
 
 #: www/admin/search.php:76
@@ -15729,6 +15726,12 @@
 msgstr[0] "依照条件搜索用户"
 msgstr[1] "依照条件搜索用户"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Unix帐号"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "全名"
@@ -15878,12 +15881,6 @@
 msgid "user_id"
 msgstr "用户编号"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "真实姓名"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "站内信箱"
@@ -15929,9 +15926,9 @@
 msgid "Account Information"
 msgstr "帐号信息"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "名称:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "用户编号"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20230,12 +20227,6 @@
 msgid "No Matching Users Found"
 msgstr "<p>未发现符合的用户</p>"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Unix帐号"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "完成"
@@ -21103,6 +21094,7 @@
 msgstr "关闭日期"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "页面浏览次数"
 
@@ -22864,7 +22856,7 @@
 msgid "View Other Top Categories"
 msgstr "浏览其它的排行分类"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "新项目名称"
@@ -22883,10 +22875,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr "每周项目页面浏览排行榜在 *.%1$s (从 %2$s 标志的印象)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "页面浏览数"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "关于最高排名用户的信息未提供"
@@ -23164,6 +23152,23 @@
 msgid "That user does not exist."
 msgstr "查询不存在"
 
+#~ msgid "User name:"
+#~ msgstr "名称:"
+
+#~ msgid "Real name"
+#~ msgstr "真实姓名"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "用户添加成功"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "名称:"
+
+#~ msgid "Pageviews"
+#~ msgstr "页面浏览数"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "不正确的确认编码"
 
@@ -24582,9 +24587,6 @@
 #~ msgid "Add, Delete, or Edit Licenses"
 #~ msgstr "添加、删除或编辑授权方式"
 
-#~ msgid "User Id"
-#~ msgstr "用户编号"
-
 #, fuzzy
 #~ msgid "Customize"
 #~ msgstr "订制栏位名称"

Modified: trunk/src/translations/zh_TW.po
===================================================================
--- trunk/src/translations/zh_TW.po	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/translations/zh_TW.po	2013-07-22 10:16:10 UTC (rev 17606)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: FusionForge 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-22 11:57+0200\n"
+"POT-Creation-Date: 2013-07-22 12:14+0200\n"
 "PO-Revision-Date: 2009-02-01 14:34+0100\n"
 "Last-Translator: \n"
 "Language-Team: FusionForge team <fusionforge-general at lists.fusionforge.org>\n"
@@ -1676,7 +1676,8 @@
 #: www/account/verify.php:76 www/account/verify.php:78
 #: www/account/verify.php:86 www/admin/massmail.php:94
 #: www/admin/massmail.php:113 www/admin/massmail.php:116
-#: www/admin/massmail.php:142 www/admin/useredit.php:148
+#: www/admin/massmail.php:142 www/admin/useredit.php:130
+#: www/admin/useredit.php:139 www/admin/useredit.php:148
 #: www/admin/useredit.php:157 www/admin/useredit.php:211
 #: www/frs/reporting/downloads.php:105 www/frs/reporting/downloads.php:107
 #: www/frs/reporting/downloads.php:109 www/pm/admin/index.php:211
@@ -2609,7 +2610,7 @@
 msgid "Failed to find user %s"
 msgstr "增加技能失敗"
 
-#: common/import/import_users.php:416
+#: common/import/import_users.php:416 www/admin/globalroleedit.php:104
 #, fuzzy
 msgid "User Added Successfully"
 msgstr "會員新增成功"
@@ -2995,7 +2996,7 @@
 msgstr ""
 
 #: common/include/Group.class.php:2143 www/admin/globalroledelete.php:37
-#: www/admin/globalroleedit.php:41 www/project/admin/roledelete.php:46
+#: www/admin/globalroleedit.php:43 www/project/admin/roledelete.php:46
 #: www/project/admin/roleedit.php:53
 #, fuzzy
 msgid "Could Not Get Role"
@@ -3380,7 +3381,7 @@
 
 #: common/include/Navigation.class.php:292
 #: plugins/quota_management/www/quota_admin.php:38
-#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:138
+#: plugins/quota_management/www/quota.php:36 www/admin/globalroleedit.php:29
 #: www/admin/index.php:39
 #, fuzzy
 msgid "Site Admin"
@@ -4652,7 +4653,7 @@
 #: plugins/scmhg/common/HgPlugin.class.php:632
 #: www/account/pending-resend.php:79 www/activity/index.php:191
 #: www/admin/admin_table.php:222 www/admin/cronman.php:37
-#: www/admin/globalroleedit.php:247 www/admin/index.php:166
+#: www/admin/globalroleedit.php:248 www/admin/index.php:166
 #: www/admin/pending-news.php:163 www/forum/admin/index.php:412
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/my/diary.php:189
@@ -4922,7 +4923,8 @@
 
 #: common/tracker/actions/browse.php:195 common/tracker/actions/browse.php:554
 #: common/tracker/actions/query.php:197 www/admin/massmail.php:136
-#: www/pm/admin/index.php:187 www/project/admin/editimages.php:265
+#: www/admin/search.php:72 www/admin/search.php:148 www/pm/admin/index.php:187
+#: www/project/admin/editimages.php:265
 msgid "Id"
 msgstr "編號"
 
@@ -6131,8 +6133,8 @@
 msgid "Existing Responses"
 msgstr "已存在回應"
 
-#: common/tracker/views/form-addcanned.php:40 www/admin/search.php:72
-#: www/admin/search.php:148 www/my/dashboard.php:63 www/pm/index.php:98
+#: common/tracker/views/form-addcanned.php:40 www/my/dashboard.php:63
+#: www/pm/index.php:98
 #: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:56
 msgid "ID"
 msgstr "編號"
@@ -9073,8 +9075,12 @@
 #: plugins/globaldashboard/www/admin/edit_account_page.php:77
 #: plugins/globaldashboard/www/admin/manage_accounts.php:81
 #: plugins/globaldashboard/www/admin/manage_accounts.php:117
-#: www/account/verify.php:38 www/admin/unsubscribe.php:113
-#: www/project/memberlist.php:50 www/stats/lastlogins.php:51
+#: www/account/verify.php:38 www/admin/globalroleedit.php:149
+#: www/admin/search.php:73 www/admin/unsubscribe.php:113
+#: www/admin/useredit.php:139 www/project/admin/users.php:300
+#: www/project/memberlist.php:50
+#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
+#: www/stats/lastlogins.php:51 www/top/topusers.php:63
 #, fuzzy
 msgid "User Name"
 msgstr "帳號"
@@ -9409,7 +9415,7 @@
 
 #: plugins/globalsearch/www/index.php:168
 #: www/search/include/renderers/ProjectHtmlSearchRenderer.class.php:44
-#: www/stats/site_stats_utils.php:230
+#: www/stats/site_stats_utils.php:230 www/top/toplist.php:53
 #, fuzzy
 msgid "Project Name"
 msgstr "新專案名稱"
@@ -14239,8 +14245,7 @@
 msgid "Member since:"
 msgstr "帳號建立日期"
 
-#: www/account/index.php:151 www/admin/useredit.php:130
-#: www/include/user_profile.php:68
+#: www/account/index.php:151 www/include/user_profile.php:68
 #, fuzzy
 msgid "User Id:"
 msgstr "使用者編號"
@@ -15012,66 +15017,55 @@
 msgid "Error: Please confirm the deletion of the role."
 msgstr ""
 
-#: www/admin/globalroleedit.php:74 www/project/admin/roleedit.php:86
+#: www/admin/globalroleedit.php:76 www/project/admin/roleedit.php:86
 #, fuzzy
 msgid "Missing Role Name"
 msgstr "缺少參數"
 
-#: www/admin/globalroleedit.php:81 www/project/admin/roleedit.php:93
+#: www/admin/globalroleedit.php:83 www/project/admin/roleedit.php:93
 #, fuzzy
 msgid "Successfully Created New Role"
 msgstr "項目成功創造"
 
-#: www/admin/globalroleedit.php:90 www/project/admin/roleedit.php:102
+#: www/admin/globalroleedit.php:92 www/project/admin/roleedit.php:102
 #, fuzzy
 msgid "Successfully Updated Role"
 msgstr "成功新增"
 
-#: www/admin/globalroleedit.php:102
+#: www/admin/globalroleedit.php:106
 #, fuzzy
-msgid "User added successfully"
-msgstr "會員新增成功"
-
-#: www/admin/globalroleedit.php:104
-#, fuzzy
 msgid "Error while adding user to role"
 msgstr "啟動帳號過程中錯誤"
 
-#: www/admin/globalroleedit.php:108
-msgid "Can't add user to this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:110
+#, fuzzy
+msgid "Cannot add user to this type of role"
+msgstr "版本"
 
-#: www/admin/globalroleedit.php:115
+#: www/admin/globalroleedit.php:117
 msgid "ERROR: You did not tick the “really remove” box!"
 msgstr ""
 
-#: www/admin/globalroleedit.php:123
+#: www/admin/globalroleedit.php:125
 #, fuzzy, php-format
 msgid "User %s removed successfully"
 msgstr "會員刪除成功"
 
-#: www/admin/globalroleedit.php:127
+#: www/admin/globalroleedit.php:129
 #, fuzzy, php-format
 msgid "Error while removing user %s from role"
 msgstr "啟動帳號過程中錯誤"
 
-#: www/admin/globalroleedit.php:133
-msgid "Can't remove user from this type of role"
-msgstr ""
+#: www/admin/globalroleedit.php:135
+#, fuzzy
+msgid "Cannot remove user from this type of role"
+msgstr "無法增加資料庫分類"
 
 #: www/admin/globalroleedit.php:143
 #, fuzzy
 msgid "Current users with this role"
 msgstr "版本"
 
-#: www/admin/globalroleedit.php:149 www/admin/search.php:73
-#: www/project/admin/users.php:300
-#: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:44
-#: www/top/topusers.php:63
-#, fuzzy
-msgid "User name"
-msgstr "名稱:"
-
 #: www/admin/globalroleedit.php:172
 msgid "Really remove ticked users from role?"
 msgstr ""
@@ -15086,34 +15080,34 @@
 msgid "Add User"
 msgstr "增加會員"
 
-#: www/admin/globalroleedit.php:201 www/admin/globalroleedit.php:208
+#: www/admin/globalroleedit.php:202 www/admin/globalroleedit.php:209
 #: www/project/admin/roleedit.php:123 www/project/admin/roleedit.php:126
 msgid "Role Name"
 msgstr "角色名稱"
 
-#: www/admin/globalroleedit.php:206
+#: www/admin/globalroleedit.php:207
 msgid "Public role (can be referenced by projects)"
 msgstr ""
 
-#: www/admin/globalroleedit.php:211 www/project/admin/roleedit.php:134
+#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:134
 msgid "Section"
 msgstr "區域"
 
-#: www/admin/globalroleedit.php:212 www/project/admin/roleedit.php:135
+#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:135
 msgid "Subsection"
 msgstr "子區域"
 
-#: www/admin/globalroleedit.php:213 www/project/admin/roleedit.php:136
+#: www/admin/globalroleedit.php:214 www/project/admin/roleedit.php:136
 msgid "Setting"
 msgstr "設定"
 
-#: www/admin/globalroleedit.php:254 www/admin/globalroleedit.php:256
+#: www/admin/globalroleedit.php:255 www/admin/globalroleedit.php:257
 #: www/project/admin/users.php:412
 #, fuzzy
 msgid "Delete role"
 msgstr "刪除文件"
 
-#: www/admin/globalroleedit.php:255
+#: www/admin/globalroleedit.php:256
 #, fuzzy
 msgid "Really delete this role?"
 msgstr "永久地刪除這個追蹤系統。"
@@ -15205,8 +15199,8 @@
 msgid "Register Time"
 msgstr "註冊時間"
 
-#: www/admin/grouplist.php:67 www/admin/search.php:149
-#: www/admin/useredit.php:263 www/admin/useredit.php:293
+#: www/admin/grouplist.php:67 www/admin/useredit.php:263
+#: www/admin/useredit.php:293
 #, fuzzy
 msgid "Unix name"
 msgstr "Unix帳號"
@@ -15732,10 +15726,13 @@
 msgstr[0] "依照條件搜尋會員"
 msgstr[1] "依照條件搜尋會員"
 
-#: www/admin/search.php:74 www/admin/useredit.php:148
+#: www/admin/search.php:74 www/admin/unsubscribe.php:114
+#: www/admin/useredit.php:148 www/project/admin/massadd.php:90
+#: www/project/admin/massfinish.php:74
 #: www/search/include/renderers/PeopleHtmlSearchRenderer.class.php:45
 #: www/top/topusers.php:64
-msgid "Real name"
+#, fuzzy
+msgid "Real Name"
 msgstr "真實姓名"
 
 #: www/admin/search.php:76
@@ -15754,6 +15751,12 @@
 msgstr[0] "依照條件搜尋會員"
 msgstr[1] "依照條件搜尋會員"
 
+#: www/admin/search.php:149 www/project/admin/massadd.php:91
+#: www/project/admin/massfinish.php:75 www/register/index.php:226
+#, fuzzy
+msgid "Unix Name"
+msgstr "Unix帳號"
+
 #: www/admin/search.php:150 www/register/index.php:178
 msgid "Full Name"
 msgstr "全名"
@@ -15903,12 +15906,6 @@
 msgid "user_id"
 msgstr "使用者編號"
 
-#: www/admin/unsubscribe.php:114 www/project/admin/massadd.php:90
-#: www/project/admin/massfinish.php:74
-#, fuzzy
-msgid "Real Name"
-msgstr "真實姓名"
-
 #: www/admin/unsubscribe.php:116
 msgid "Site Mail."
 msgstr "站內信箱"
@@ -15954,9 +15951,9 @@
 msgid "Account Information"
 msgstr "帳號資訊"
 
-#: www/admin/useredit.php:139
-msgid "User name:"
-msgstr "名稱:"
+#: www/admin/useredit.php:130
+msgid "User Id"
+msgstr "使用者編號"
 
 #: www/admin/useredit.php:157
 msgid "Web account status"
@@ -20255,12 +20252,6 @@
 msgid "No Matching Users Found"
 msgstr "<p>未發現符合的使用者</p>"
 
-#: www/project/admin/massadd.php:91 www/project/admin/massfinish.php:75
-#: www/register/index.php:226
-#, fuzzy
-msgid "Unix Name"
-msgstr "Unix帳號"
-
 #: www/project/admin/massadd.php:116
 msgid "Finish"
 msgstr "完成"
@@ -21126,6 +21117,7 @@
 msgstr "關閉日期"
 
 #: www/reporting/projectact_graph.php:145 www/stats/site_stats_utils.php:231
+#: www/top/toplist.php:38
 msgid "Page Views"
 msgstr "頁面瀏覽次數"
 
@@ -22887,7 +22879,7 @@
 msgid "View Other Top Categories"
 msgstr "瀏覽其它的排行分類"
 
-#: www/top/mostactive.php:52 www/top/toplist.php:53
+#: www/top/mostactive.php:52
 #, fuzzy
 msgid "Project name"
 msgstr "新專案名稱"
@@ -22906,10 +22898,6 @@
 msgid "Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)"
 msgstr "每週專案頁面瀏覽排行榜在 *.%1$s (從 %2$s 標誌的印象)"
 
-#: www/top/toplist.php:38
-msgid "Pageviews"
-msgstr "頁面瀏覽數"
-
 #: www/top/topusers.php:52
 msgid "Information about highest ranked users is not available."
 msgstr "關於最高排名使用者的資訊未提供"
@@ -23187,6 +23175,23 @@
 msgid "That user does not exist."
 msgstr "查詢不存在"
 
+#~ msgid "User name:"
+#~ msgstr "名稱:"
+
+#~ msgid "Real name"
+#~ msgstr "真實姓名"
+
+#, fuzzy
+#~ msgid "User added successfully"
+#~ msgstr "會員新增成功"
+
+#, fuzzy
+#~ msgid "User name"
+#~ msgstr "名稱:"
+
+#~ msgid "Pageviews"
+#~ msgstr "頁面瀏覽數"
+
 #~ msgid "Invalid confirmation hash"
 #~ msgstr "不正確的確認編碼"
 
@@ -24533,9 +24538,6 @@
 #~ msgid "Add, Delete, or Edit Licenses"
 #~ msgstr "新增、刪除或編輯授權方式"
 
-#~ msgid "User Id"
-#~ msgstr "使用者編號"
-
 #, fuzzy
 #~ msgid "Customize"
 #~ msgstr "訂製欄位名稱"

Modified: trunk/src/www/admin/globalroleedit.php
===================================================================
--- trunk/src/www/admin/globalroleedit.php	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/www/admin/globalroleedit.php	2013-07-22 10:16:10 UTC (rev 17606)
@@ -26,6 +26,8 @@
 require_once $gfwww.'admin/admin_utils.php';
 require_once $gfwww.'include/role_utils.php';
 
+site_admin_header(array('title'=>_('Site Admin')));
+
 $role_id = getIntFromRequest('role_id');
 $data = getStringFromRequest('data');
 
@@ -99,13 +101,13 @@
 		$u = user_get_object_by_name ($user_name) ;
 		if ($u && $u instanceof GFUser && !$u->isError()) {
 			if ($role->addUser ($u)) {
-				$feedback .= _('User added successfully') ;
+				$feedback .= _('User Added Successfully') ;
 			} else {
 				$error_msg .= _("Error while adding user to role") ;
 			}
 		}
 	} else {
-		$error_msg .= _("Can't add user to this type of role") ;
+		$error_msg .= _("Cannot add user to this type of role") ;
 	}
 }
 
@@ -130,13 +132,11 @@
 			}
 		}
 	} else {
-		$error_msg .= _("Can't remove user from this type of role") ;
+		$error_msg .= _("Cannot remove user from this type of role") ;
 	}
 }
 
 
-site_admin_header(array('title'=>_('Site Admin')));
-
 if ($role instanceof RoleExplicit) {
 	$users = $role->getUsers () ;
 	if (count ($users) > 0) {
@@ -146,7 +146,7 @@
 		<form action="'.util_make_url('/admin/globalroleedit.php').'" method="post">
 		<input type="hidden" name="role_id" value="'.$role_id.'" />
 		<table><thead><tr>
-			<th>'._('User name').'</th>
+			<th>'._('User Name').'</th>
 			<th>'._('Remove').'</th>
 		</tr></thead><tbody>';
 
@@ -194,16 +194,17 @@
 }
 
 echo '
+<p>
 <form action="'.util_make_url('/admin/globalroleedit.php').'" method="post">';
-echo '<input type="hidden" name="role_id" value="'.$role_id.'" />';
-
+echo '<input type="hidden" name="role_id" value="'.$role_id.'" />' ;
+		
 if ($role instanceof RoleExplicit) {
-	echo '<p><strong>'._('Role Name').'</strong><br /><input type="text" name="role_name" value="'.$role->getName().'" /></p>';
+	echo '<p><strong>'._('Role Name').'</strong><br /><input type="text" name="role_name" value="'.$role->getName().'"></p>';
 	echo '<input type="checkbox" name="public" value="1"' ;
 	if ($role->isPublic()) {
 		echo ' checked="checked"' ;
 	}
-	echo '/> '._('Public role (can be referenced by projects)');
+	echo '/> '._('Public role (can be referenced by projects)').'</p>' ;
 } else {
 	echo '<p><strong>'._('Role Name').'</strong><br />'.$role->getName().'</p>';
 }

Modified: trunk/src/www/admin/search.php
===================================================================
--- trunk/src/www/admin/search.php	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/www/admin/search.php	2013-07-22 10:16:10 UTC (rev 17606)
@@ -69,9 +69,9 @@
 
 	if (db_numrows($result) >= 1) {
 		$title=array();
-		$title[]=_('ID');
-		$title[]=_('User name');
-		$title[]=_('Real name');
+		$title[]=_('Id');
+		$title[]=_('User Name');
+		$title[]=_('Real Name');
 		$title[]=_('Email');
 		$title[]=_('Member since');
 		$title[]=_('Status');
@@ -145,8 +145,8 @@
 		print '<p><strong>'.sprintf(ngettext('Group search with criteria <em>%s</em>: %d match', 'Group search with criteria <em>%s</em>: %d matches', count($rows)), $crit_desc, count($rows)).'</strong></p>';
 
 		$title=array();
-		$title[]=_('ID');
-		$title[]=_('Unix name');
+		$title[]=_('Id');
+		$title[]=_('Unix Name');
 		$title[]=_('Full Name');
 		$title[]=_('Registered');
 		$title[]=_('Status');

Modified: trunk/src/www/admin/useredit.php
===================================================================
--- trunk/src/www/admin/useredit.php	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/www/admin/useredit.php	2013-07-22 10:16:10 UTC (rev 17606)
@@ -124,10 +124,10 @@
 <input type="hidden" name="action" value="update_user" />
 <input type="hidden" name="user_id" value="<?php print $user_id; ?>" />
 
-<table>
+<table class="infotable">
 <tr>
 <td>
-<?php echo _('User Id:'); ?>
+<?php echo _('User Id')._(':'); ?>
 </td>
 <td>
 <?php echo $u->getID(); ?>
@@ -136,7 +136,7 @@
 
 <tr>
 <td>
-<?php echo _('User name:'); ?>
+<?php echo _('User Name')._(':'); ?>
 </td>
 <td>
 <?php echo $u->getUnixName(); ?>
@@ -145,7 +145,7 @@
 
 <tr>
 <td>
-<?php echo _('Real name') . _(':'); ?>
+<?php echo _('Real Name')._(':'); ?>
 </td>
 <td>
 <?php echo $u->getRealName(); ?>

Modified: trunk/src/www/project/admin/users.php
===================================================================
--- trunk/src/www/project/admin/users.php	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/www/project/admin/users.php	2013-07-22 10:16:10 UTC (rev 17606)
@@ -44,7 +44,7 @@
 // get current information
 $group = group_get_object($group_id);
 if (!$group || !is_object($group)) {
-    exit_no_group();
+	exit_no_group();
 } elseif ($group->isError()) {
 	exit_error($group->getErrorMessage(),'admin');
 }
@@ -297,7 +297,7 @@
 $members = $group->getUsers() ;
 
 echo '<table width="100%"><thead><tr>';
-echo '<th>'._('User name').'</th>';
+echo '<th>'._('User Name').'</th>';
 echo '<th>'._('Role').'</th>';
 echo '<th style="text-align:right">'._('Action').'</th>';
 echo '</tr></thead><tbody>';

Modified: trunk/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php
===================================================================
--- trunk/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/www/search/include/renderers/PeopleHtmlSearchRenderer.class.php	2013-07-22 10:16:10 UTC (rev 17606)
@@ -41,8 +41,8 @@
 		$this->HtmlSearchRenderer(SEARCH__TYPE_IS_PEOPLE, $words, $isExact, $searchQuery);
 
 		$this->tableHeaders = array(
-			_('User name'),
-			_('Real name')
+			_('User Name'),
+			_('Real Name')
 		);
 	}
 

Modified: trunk/src/www/top/toplist.php
===================================================================
--- trunk/src/www/top/toplist.php	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/www/top/toplist.php	2013-07-22 10:16:10 UTC (rev 17606)
@@ -35,7 +35,7 @@
 if ($type == 'pageviews_proj') {
 	$res_top = $stats->getTopPageViews();
 	$title = sprintf(_('Top Weekly Project Pageviews at *.%1$s (from impressions of %2$s logo)'), forge_get_config('web_host'), forge_get_config ('forge_name'));
-	$column1 = _('Pageviews');
+	$column1 = _('Page Views');
 }
 else if ($type == 'forumposts_week') {
 	$res_top = $stats->getTopMessagesPosted();
@@ -50,7 +50,7 @@
 }
 $HTML->header(array('title'=>$title));
 print '<p>'.util_make_link ('/top/','['._('View Other Top Categories').']').'</p>';
-$arr=array(_('Rank'),_('Project name'),"$column1");
+$arr=array(_('Rank'),_('Project Name'),"$column1");
 echo $HTML->listTableTop($arr);
 
 echo db_error();
@@ -74,7 +74,7 @@
 		continue;
 	}
 	$display_rank++;
-	print '<tr '. $HTML->boxGetAltRowStyle($i) .'><td>  '.$display_rank
+	print '<tr '. $HTML->boxGetAltRowStyle($i) .'><td class="align-right">'.$display_rank
 		.'</td><td>'.util_make_link_g (strtolower($row_top['unix_group_name']),@$row_top['group_id'],stripslashes($row_top['group_name']))
 		.'</td><td class="align-right">'.$row_top['items']
 		.'   </td>'

Modified: trunk/src/www/top/topusers.php
===================================================================
--- trunk/src/www/top/topusers.php	2013-07-22 10:13:05 UTC (rev 17605)
+++ trunk/src/www/top/topusers.php	2013-07-22 10:16:10 UTC (rev 17606)
@@ -60,8 +60,8 @@
 
 $tableHeaders = array(
 	_('Rank'),
-	_('User name'),
-	_('Real name'),
+	_('User Name'),
+	_('Real Name'),
 	_('Rating'),
 	_('Last Rank'),
 	_('Change')




More information about the Fusionforge-commits mailing list