Item13294: Improve translation of WikiName & related

Also add translations to the WikiName and LoginName topics.

LoginName probably ought to be relocated into core, rather than being
TopicUserMapping specific.

TopicUserMappingContrib/data/System/DefaultUserRegistration.txt

@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1425781381" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1426205601" format="1.1" version="1"}%
 <noautolink>
 <!--
 	Read general customisation instructions in %SYSTEMWEB%.UserAuthentication
@@ -270,9 +270,9 @@ text="<style type='text/css' media='all'>
     "Fwk1FirstName":"%MAKETEXT{"Please enter your first name."}%",
     "Fwk1LastName":"%MAKETEXT{"Please enter your last name."}%",
     "Fwk1WikiName": {
-      "required": "%MAKETEXT{"Please enter a Wiki name."}%",
-      "wikiword": "%MAKETEXT{"This is not a valid Wiki name."}%",
-      "remote": "%MAKETEXT{"This Wiki name is already in use."}%"
+      "required": "%MAKETEXT{"Please enter a WikiName."}%",
+      "wikiword": "%MAKETEXT{"This is not a valid WikiName."}%",
+      "remote": "%MAKETEXT{"This WikiName is already in use."}%"
     },
     "Fwk1Email": "%MAKETEXT{"Please enter a valid email address."}%",
     "Fwk1LoginName": {
@@ -316,17 +316,16 @@ text="<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/DefaultUserRe
 <!--
 	Required field wiki name
 -->
-%STARTSECTION{"requiredField_wikiName"}%<li><label class="desc" for="Fwk1WikiName"><span class="required">*</span>%MAKETEXT{"Wiki name:"}%</label>
-<div><input type="text" id="Fwk1WikiName" name="Fwk1WikiName" size="40" class="foswikiInputField" value="" tabindex="3" /><label class="expl">%MAKETEXT{"Your name as displayed online. [_1]" args="%POPUPWINDOW{"%SYSTEMWEB%.WikiName" label="%MAKETEXT{"This must be a unique Wiki name."}%"}%"}%</label></div></li>%JQREQUIRE{"popupwindow"}%%ENDSECTION{"requiredField_wikiName"}%
+%STARTSECTION{"requiredField_wikiName"}%<li><label class="desc" for="Fwk1WikiName"><span class="required">*</span>%MAKETEXT{"WikiName:"}%</label>
+<div><input type="text" id="Fwk1WikiName" name="Fwk1WikiName" size="40" class="foswikiInputField" value="" tabindex="3" /><label class="expl">%MAKETEXT{"Your name as displayed by [_1]. [_2]" args="%WIKITOOLNAME% %POPUPWINDOW{"%SYSTEMWEB%.WikiName" label="%MAKETEXT{"This must be a unique WikiName."}%"}%"}%</label></div></li>%JQREQUIRE{"popupwindow"}%%ENDSECTION{"requiredField_wikiName"}%
 
 
 <!--
 	Required field login name
 	Only shown if ALLOWLOGINNAME is true.
 -->
 %STARTSECTION{"requiredField_loginName"}%<li><label class="desc" for="Fwk1LoginName"><span class="required">*</span>%MAKETEXT{"Login name:"}%</label>
-<div><input type="text" id="Fwk1LoginName" name="Fwk1LoginName" size="40" class="foswikiInputField" value="%REMOTE_USER%" tabindex="4" /><label class="expl">%MAKETEXT{"The login name you use to sign in."}%</label></div></li>%ENDSECTION{"requiredField_loginName"}%
-
+<div><input type="text" id="Fwk1LoginName" name="Fwk1LoginName" size="40" class="foswikiInputField" value="%REMOTE_USER%" tabindex="4" /><label class="expl">%MAKETEXT{"The user name that identifies you to the signon system. [_1]" args="%POPUPWINDOW{"%SYSTEMWEB%.LoginName" label="%MAKETEXT{"This must be a valid login name."}%"}%"}%</label></div></li>%JQREQUIRE{"popupwindow"}%%ENDSECTION{"requiredField_loginName"}%
 
 <!--
 	Required field email

TopicUserMappingContrib/data/System/LoginName.txt

@@ -1,13 +1,18 @@
-%META:TOPICINFO{author="ProjectContributor" date="1418937051" format="1.1" version="1"}%
-%META:TOPICPARENT{name="ChangePassword"}%
----+ The name you log in with
+%META:TOPICINFO{author="ProjectContributor" date="1426205003" format="1.1" version="1"}%
+%META:TOPICPARENT{name="GlossaryOfTerms"}%
+---+ %MAKETEXT{"The name you log in with"}%
 
-A login name is a sequence of alphanumeric characters and underscores.
+%MAKETEXT{"A login name is a sequence of alphanumeric characters and underscores that
+uniquely identifies you to the system. The exact format of the login name will
+depend upon how your system is configured.  If your system is not configured
+to use login names, then you will log in using your [[[_1].WikiName][WikiName]]." args="%SYSTEMWEB%"}%
 
-You cannot alter your !LoginName: you have to get the administrator to do this for you.
+%MAKETEXT{"You cannot alter your login name: you have to get the administrator to do this for you."}%
 
 ---++ How to Find Yours
 
+%T% %MAKETEXT{"These steps may not be applicable to your system."}%
+
 Look in %USERSWEB%.WikiUsers - if your name is followed by a dash and a word, usually lowercase, this is what you log in with.
 
 e.g.

core/data/System/WikiName.txt

@@ -1,10 +1,11 @@
-%META:TOPICINFO{author="ProjectContributor" date="1416592876" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1426205003" format="1.1" version="1"}%
 %META:TOPICPARENT{name="GlossaryOfTerms"}%
----+ Wiki name
-Your name, usually your first and last name connected without a space.
+---+ %MAKETEXT{"!WikiName"}%
+%MAKETEXT{"Your name, usually your first and last name connected without a space."}%
 
-For example, Tim Berners-Lee's <nop>WikiName is TimBernersLee.
+%MAKETEXT{"For example, Tim Berners-Lee's !WikiName is [[TimBernersLee]]"}%.
 
-<div class="foswikiHelp">%X% Your name is also a potentially valid WikiWord when used within a topic. However the home pages of registered users on this site are stored in the *%USERSWEB%* web. When you sign your username in a topic, prefix it with =%USERSWEB%.= (including the dot). That is, write ==%USERSWEB%.%WIKINAME%== to link to %USERSWEB%.%WIKINAME%, your personal home page in the %USERSWEB% web. For convenience, your signature is also provided for copying and pasting when editing a topic.
+<div class="foswikiHelp">%X% %MAKETEXT{"Your name is also a potentially valid [[[_1].WikiWord][WikiWord]] when used within a topic. However the home pages of registered users on this site are stored in the *[_2]* web. 
+When you sign your username in a topic, prefix it with =[_2].= (including the dot). That is, write ==[_2].[_3]== to link to [_2].[_3], your personal home page in the [_2] web." args="%SYSTEMWEB%, %USERSWEB%, %WIKINAME%"}%
 
-%Y% Though rarely used in common practice, you can use the special ==%<nop>USERSWEB%== [[%SYSTEMWEB%.Macros][macro]] prefix for user names, for example, ==%<nop>USERSWEB%.%WIKINAME%==.</div>
+%Y% %MAKETEXT{"Though rarely used in common practice, you can use the special ==%<nop>USERSWEB%== [[[_1].Macros][macro]] prefix for user names, for example, ==%<nop>USERSWEB%.%WIKINAME%==." args="%SYSTEMWEB%"}% </div>