diff options
| author | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2014-07-18 12:20:04 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2014-07-18 16:25:56 +0200 |
| commit | ec953e6b43e97b7316e43f5921165a8ef8db897b (patch) | |
| tree | 377d3b298b9b76b4d2d359171d206ef2a2f8c7ce | |
| parent | 7f6673eae7793561f0e381a0dc94d248d65f915f (diff) | |
| download | qt-creator-ec953e6b43e97b7316e43f5921165a8ef8db897b.tar.gz | |
Doc: replace "user name" with "username"
In the UI and docs, when in the context of
authentication.
Change-Id: I643b5c831ba1d63cf41e8ab31ec98735a2d07dc7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index 74367cd249..08e9d0f7a6 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -78,8 +78,8 @@ enter the host name or IP address of the device. This value will be available in the variable \c %{CurrentDevice:HostAddress}. - \li In the \gui {The user name to log into the device} field, - enter the user name to log into the device and run the + \li In the \gui {The username to log into the device} field, + enter the username to log into the device and run the application as. This value will be available in the variable \c %{CurrentDevice:UserName}. diff --git a/src/plugins/mercurial/authenticationdialog.ui b/src/plugins/mercurial/authenticationdialog.ui index c2c9bdaa17..3d12e2c1f7 100644 --- a/src/plugins/mercurial/authenticationdialog.ui +++ b/src/plugins/mercurial/authenticationdialog.ui @@ -19,7 +19,7 @@ <item row="0" column="0"> <widget class="QLabel" name="usernameLabel"> <property name="text"> - <string>User name:</string> + <string>Username:</string> </property> </widget> </item> diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index c5f185ab35..8f6a7fe800 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1091,7 +1091,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er []() { return variableValue(Constants::VAR_CURRENTDEVICE_SSHPORT); }); VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_USERNAME, - tr("The user name with which to log into the device in the currently active kit."), + tr("The username with which to log into the device in the currently active kit."), []() { return variableValue(Constants::VAR_CURRENTDEVICE_USERNAME); }); VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE, diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui index bbfb6b2c00..4b0efcef56 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui @@ -58,7 +58,7 @@ <item row="2" column="0"> <widget class="QLabel" name="userNameLabel"> <property name="text"> - <string>The user name to log into the device:</string> + <string>The username to log into the device:</string> </property> </widget> </item> |