user name => username

1 files changed, 8 insertions, 8 deletions

diff --git a/language/bs.po b/language/bs.po
index 83ee28aa29..7e2db2912b 100644
--- a/language/bs.po
+++ b/language/bs.po
@@ -896,7 +896,7 @@ msgid "A new password has been created and emailed to %s. You can change this pa
 msgstr ""
 
 #: login.php:254
-msgid "A new password has been requested for your user name."
+msgid "A new password has been requested for your username."
 msgstr ""
 
 #. I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address
@@ -5195,7 +5195,7 @@ msgid "Desired password"
 msgstr ""
 
 #: login.php:436
-msgid "Desired user name"
+msgid "Desired username"
 msgstr ""
 
 #. I18N: gedcom tag DEST
@@ -5442,7 +5442,7 @@ msgid "Duplicate email address. A user with that email already exists."
 msgstr "Dupla email adresa. Korisnika sa tom email adresom već postoji."
 
 #: admin_users.php:71 edituser.php:58 login.php:284
-msgid "Duplicate user name. A user with that user name already exists. Please choose another user name."
+msgid "Duplicate username. A user with that username already exists. Please choose another username."
 msgstr "Duplo korisničko ime. Korisnik sa tim imenom već postoji. Molimo odaberite drugo korisničko ime."
 
 #: help_text.php:293
@@ -13708,7 +13708,7 @@ msgid "The administrator at the webtrees site %s has approved your application f
 msgstr ""
 
 #: login.php:612
-msgid "The administrator has been informed. As soon as they give you permission to sign in, you can sign in with your user name and password."
+msgid "The administrator has been informed. As soon as they give you permission to sign in, you can sign in with your username and password."
 msgstr ""
 
 #. I18N: %s is the name of an individual, source or other record
@@ -14114,7 +14114,7 @@ msgstr ""
 
 #. I18N: Help text for the "Username" site configuration setting
 #: admin_site_config.php:388
-msgid "The user name required for authentication with the SMTP server."
+msgid "The username required for authentication with the SMTP server."
 msgstr ""
 
 #: login.php:82 login.php:87
@@ -15884,7 +15884,7 @@ msgstr ""
 
 #: login.php:386
 #, php-format
-msgid "We will now send a confirmation email to the address <b>%s</b>. You must verify your account request by following instructions in the confirmation email. If you do not confirm your account request within seven days, your application will be rejected automatically. You will have to apply again.<br><br>After you have followed the instructions in the confirmation email, the administrator still has to approve your request before your account can be used.<br><br>To sign in to this website, you will need to know your user name and password."
+msgid "We will now send a confirmation email to the address <b>%s</b>. You must verify your account request by following instructions in the confirmation email. If you do not confirm your account request within seven days, your application will be rejected automatically. You will have to apply again.<br><br>After you have followed the instructions in the confirmation email, the administrator still has to approve your request before your account can be used.<br><br>To sign in to this website, you will need to know your username and password."
 msgstr ""
 
 #. I18N: Menu entry
@@ -16243,7 +16243,7 @@ msgid "You must enter a real name."
 msgstr "Morate unijeti pravo ime."
 
 #: edituser.php:124
-msgid "You must enter a user name."
+msgid "You must enter a username."
 msgstr "Morate unijeti korisničko ime."
 
 #: setup.php:418
@@ -16322,7 +16322,7 @@ msgid "You should not approve an account unless you know that the email address
 msgstr ""
 
 #: login.php:325
-msgid "You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the user name. The new user will not be able to sign in until you activate the account."
+msgid "You will be informed by email when this prospective user has confirmed the request. You can then complete the process by activating the username. The new user will not be able to sign in until you activate the account."
 msgstr ""
 
 #: setup.php:432