Item13294: xgettext run for login / username changes

core/locale/Foswiki.pot

@@ -191,10 +191,6 @@ msgstr ""
 msgid "%1 was renamed or moved from %2 on %3 by %4"
 msgstr ""
 
-#: TopicUserMappingContrib/data/System/ChangeEmailAddress.txt:37
-msgid "%1.LoginName:"
-msgstr ""
-
 #: PatternSkin/templates/foswiki.pattern.tmpl:16
 msgid "&Cancel"
 msgstr ""
@@ -208,7 +204,7 @@ msgid "&Sequential"
 msgstr ""
 
 #: core/templates/registermessages.tmpl:219
-msgid "'%1' is not a valid [[%2][Login name]]."
+msgid "'%1' is not a valid [[%2][login username]]."
 msgstr ""
 
 #: core/data/System/WebTopicCreator.txt:3
@@ -364,7 +360,8 @@ msgstr ""
 #: TopicUserMappingContrib/data/System/ChangeEmailAddress.txt:23
 msgid ""
 "*Administrators:* You can change user's e-mail address using this form. "
-"Enter the users Login or WikiName and the new e-mail address."
+"Enter the users [[%1][username]] or [[%1][WikiName]] and the new e-mail "
+"address."
 msgstr ""
 
 #: core/templates/attachagain.tmpl:18
@@ -498,7 +495,7 @@ msgstr ""
 
 #: core/templates/messages.tmpl:366
 msgid ""
-"A new system-generated password for your login name '%1' (!WikiName %2) has "
+"A new system-generated password for your username '%1' (!WikiName %2) has "
 "been sent to your registered e-mail address. If your e-mail address is no "
 "longer valid, please contact %3."
 msgstr ""
@@ -1123,9 +1120,9 @@ msgstr ""
 msgid "Contact %1 if you have any questions."
 msgstr ""
 
-#: TopicUserMappingContrib/data/System/LoginName.txt:16
+#: core/data/System/UserName.txt:20
 msgid ""
-"Contact <a href='mailto:%1'>your site administrator</a> for further "
+"Contact <a href=\\'mailto:%1\\'>your site administrator</a> for further "
 "assistance."
 msgstr ""
 
@@ -2085,11 +2082,6 @@ msgstr ""
 msgid "Incorrect Prefix"
 msgstr ""
 
-#: core/templates/registermessages.tmpl:211
-#: core/templates/registermessages.tmpl:218
-msgid "Incorrect [[%1][Login name]]"
-msgstr ""
-
 #: core/templates/registermessages.tmpl:114
 msgid "Incorrect [[%1][WikiName]]"
 msgstr ""
@@ -2098,6 +2090,11 @@ msgstr ""
 msgid "Incorrect [[%1][WikiNames:]]"
 msgstr ""
 
+#: core/templates/registermessages.tmpl:211
+#: core/templates/registermessages.tmpl:218
+msgid "Incorrect [[%1][username]]"
+msgstr ""
+
 #: core/templates/messages.tmpl:300
 msgid "Incorrect parameters to the =%1= script"
 msgstr ""
@@ -2354,12 +2351,8 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: core/templates/mailresetpassword.tmpl:13
-msgid "Login name %1"
-msgstr ""
-
 #: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:327
-msgid "Login name:"
+msgid "Login username:"
 msgstr ""
 
 #: core/templates/login.tmpl:77
@@ -2719,6 +2712,12 @@ msgstr ""
 msgid "Older revision:"
 msgstr ""
 
+#: core/data/System/UserName.txt:11
+msgid ""
+"On this system, once you are registered, you may also log in using your "
+"email address."
+msgstr ""
+
 #: core/templates/registermessages.tmpl:347
 msgid "Only administrators are allowed to remove other accounts."
 msgstr ""
@@ -2866,7 +2865,7 @@ msgid "Please enter a WikiName."
 msgstr ""
 
 #: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:279
-msgid "Please enter a login name."
+msgid "Please enter a login username."
 msgstr ""
 
 #: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:283
@@ -2932,7 +2931,7 @@ msgstr ""
 
 #: core/templates/registermessages.tmpl:279
 msgid ""
-"Please make sure you spelled the [[%1][Login name]] correctly and try again. "
+"Please make sure you spelled the [[%1][username]] correctly and try again. "
 "If you get stuck, please contact %2."
 msgstr ""
 
@@ -3114,12 +3113,26 @@ msgstr ""
 msgid "Regular expression search"
 msgstr ""
 
+#: core/data/System/UserName.txt:44
+msgid "Related Topics for Administrators:"
+msgstr ""
+
+#: core/data/System/SiteTools.txt:150
+#: core/data/System/SkinTemplateTokens.txt:181
+#: core/data/System/UserAuthentication.txt:307
+msgid "Related Topics:"
+msgstr ""
+
+#: TopicUserMappingContrib/data/System/BulkRegistration.txt:109
 #: TopicUserMappingContrib/data/System/ChangeEmailAddress.txt:71
 #: TopicUserMappingContrib/data/System/ChangePassword.txt:46
 #: TopicUserMappingContrib/data/System/ResetPassword.txt:43
 #: TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm:1003
 #: TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm:1016
 #: core/data/Main/GroupViewTemplate.txt:33
+#: core/data/System/CommandAndCGIScripts.txt:669
+#: core/data/System/FormattedSearch.txt:400
+#: core/data/System/GlossaryOfTerms.txt:25
 #: core/data/System/SkinTemplateViewTemplate.txt:9
 #: core/templates/messages.tmpl:385 core/templates/messages.tmpl:398
 msgid "Related topics:"
@@ -3282,6 +3295,10 @@ msgstr ""
 msgid "Return to %1"
 msgstr ""
 
+#: core/templates/registermessages.tmpl:342
+msgid "Return to %1 and supply a [[%2][WikiName or [[%3][username]]."
+msgstr ""
+
 #: core/templates/registermessages.tmpl:296
 msgid "Return to %1."
 msgstr ""
@@ -3290,10 +3307,6 @@ msgstr ""
 msgid "Return to [_0]"
 msgstr ""
 
-#: core/templates/registermessages.tmpl:342
-msgid "Return to [_0] and supply a WikiName or Login name"
-msgstr ""
-
 #: TopicUserMappingContrib/data/System/ChangePassword.txt:27
 msgid "Retype new password:"
 msgstr ""
@@ -3848,21 +3861,22 @@ msgstr ""
 msgid "The Free and Open Source Wiki."
 msgstr ""
 
+#: core/templates/registermessages.tmpl:115
+msgid ""
+"The [[%1][WikiName]] field must be your first and last name written as a "
+"[[%2][WikiWord]], e.g. your capitalized first and last name with spaces "
+"removed."
+msgstr ""
+
 #: core/templates/registermessages.tmpl:205
 msgid ""
-"The [[%1][Login name]] (%2) is not allowed for this installation. "
+"The [[%1][login username]] (%2) is not allowed for this installation. "
 "Registration rejected."
 msgstr ""
 
 #: core/templates/registermessages.tmpl:212
-msgid "The [[%1][Login name]] is a required parameter. Registration rejected."
-msgstr ""
-
-#: core/templates/registermessages.tmpl:115
 msgid ""
-"The [[%1][WikiName]] field must be your first and last name written as a "
-"[[%2][WikiWord]], e.g. your capitalized first and last name with spaces "
-"removed."
+"The [[%1][login username]] is a required parameter. Registration rejected."
 msgstr ""
 
 #: core/templates/registermessages.tmpl:80
@@ -3970,17 +3984,11 @@ msgstr ""
 msgid "The lease on this topic expired %1 ago."
 msgstr ""
 
-#: TopicUserMappingContrib/data/System/LoginName.txt:12
-msgid ""
-"The login name is checked for invalid characters using the below filter. Any "
-"characters matching this filter will invalidate the login name."
-msgstr ""
-
 #: core/templates/messages.tmpl:90
 msgid "The name of the topic must not be empty."
 msgstr ""
 
-#: TopicUserMappingContrib/data/System/LoginName.txt:3
+#: core/data/System/UserName.txt:3
 msgid "The name you log in with"
 msgstr ""
 
@@ -4029,8 +4037,14 @@ msgstr ""
 msgid "The user has probably been already verified and/or approved."
 msgstr ""
 
+#: core/data/System/UserName.txt:17
+msgid ""
+"The username is checked for invalid characters using the below filter. Any "
+"characters matching this filter will invalidate the username."
+msgstr ""
+
 #: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:328
-msgid "The user name that identifies you to the signon system. %1"
+msgid "The username that identifies you to the signon system. %1"
 msgstr ""
 
 #: core/templates/messages.tmpl:166
@@ -4069,7 +4083,7 @@ msgstr ""
 msgid "There were errors removing %1 from the %2 group."
 msgstr ""
 
-#: TopicUserMappingContrib/data/System/LoginName.txt:20
+#: core/data/System/UserName.txt:25
 msgid "These steps may not be applicable to your system."
 msgstr ""
 
@@ -4151,16 +4165,12 @@ msgid ""
 "[Register]] if you do not have an account yet."
 msgstr ""
 
-#: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:280
-msgid "This login name is already in use."
-msgstr ""
-
 #: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:320
 msgid "This must be a unique WikiName."
 msgstr ""
 
 #: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:328
-msgid "This must be a valid login name."
+msgid "This must be a valid login username."
 msgstr ""
 
 #: core/templates/renamedelete.tmpl:31
@@ -4191,10 +4201,18 @@ msgstr ""
 msgid "This site requires at least %1 character passwords"
 msgstr ""
 
+#: core/data/System/UserName.txt:9
+msgid "This system is configured to use usernames"
+msgstr ""
+
 #: core/templates/viewprint.tmpl:14
 msgid "This topic:"
 msgstr ""
 
+#: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:280
+msgid "This username is already in use."
+msgstr ""
+
 #: core/templates/messages.tmpl:29
 msgid ""
 "Those changes have been merged with yours to create Rev %1. Text fields will "
@@ -4206,7 +4224,7 @@ msgstr ""
 #: core/data/System/WikiName.txt:11
 msgid ""
 "Though rarely used in common practice, you can use the special =="
-"%<nop>USERSWEB%== [[%1.Macros][macro]] prefix for user names, for example, =="
+"%<nop>USERSWEB%== [[%1.Macros][macro]] prefix for !WikiNames, for example, =="
 "%<nop>USERSWEB%.%WIKINAME%==."
 msgstr ""
 
@@ -4426,7 +4444,7 @@ msgid "Unsubscribe from this topic (s)"
 msgstr ""
 
 #: core/templates/registermessages.tmpl:204
-msgid "Unsupported [[%1][Login name]]"
+msgid "Unsupported [[%1][username]]"
 msgstr ""
 
 #: core/data/System/SiteChanges.txt:43 core/data/System/SiteChanges.txt:96
@@ -4547,6 +4565,10 @@ msgid ""
 "change the password at the same time."
 msgstr ""
 
+#: core/templates/mailresetpassword.tmpl:13
+msgid "User name %1."
+msgstr ""
+
 #: core/templates/login.tmpl:48
 msgid "Username"
 msgstr ""
@@ -4882,10 +4904,10 @@ msgid ""
 "You cannot add users to a missing group unless the create option is set."
 msgstr ""
 
-#: TopicUserMappingContrib/data/System/LoginName.txt:10
+#: core/data/System/UserName.txt:15
 msgid ""
-"You cannot alter your login name: you have to get the administrator to do "
-"this for you."
+"You cannot alter your username: you have to get the administrator to do this "
+"for you."
 msgstr ""
 
 #: core/templates/messages.tmpl:477
@@ -4962,10 +4984,14 @@ msgstr ""
 msgid "You will receive an e-mail when your registration has been approved."
 msgstr ""
 
+#: core/data/System/UserName.txt:13
+msgid "Your [[%1][Wikiname]] is %2 and your username is =%3=."
+msgstr ""
+
 #: TopicUserMappingContrib/data/System/ChangeEmailAddress.txt:37
 #: TopicUserMappingContrib/data/System/ChangePassword.txt:24
 #: TopicUserMappingContrib/data/System/ResetPassword.txt:23
-msgid "Your %1.LoginName:"
+msgid "Your [[%1][username]]:"
 msgstr ""
 
 #: core/templates/registermessages.tmpl:147
@@ -5063,13 +5089,17 @@ msgstr ""
 
 #: core/templates/registermessages.tmpl:220
 msgid ""
-"[[%1][Click here]] for guidance on creating a valid login name for this site"
+"[[%1][Click here]] for guidance on creating a valid username for this site"
 msgstr ""
 
 #: core/templates/messages.tmpl:209
 msgid "[[%1][Debug topic text]]."
 msgstr ""
 
+#: TopicUserMappingContrib/data/System/ChangeEmailAddress.txt:37
+msgid "[[%1][username]]:"
+msgstr ""
+
 #: NatEditPlugin/templates/settings.natedit.tmpl:29
 #: core/templates/settings.tmpl:27
 msgid ""