feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: replace "user name" with "username"

Browse Source 
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>
This commit is contained in:
Leena Miettinen
2014-07-18 12:20:04 +02:00
parent 7f6673eae7
commit ec953e6b43
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/linux-mobile/linuxdev.qdoc
View File

@@ -78,8 +78,8 @@
enter the host name or IP address of the device. enter the host name or IP address of the device.
This value will be available in the variable \c %{CurrentDevice:HostAddress}. This value will be available in the variable \c %{CurrentDevice:HostAddress}.
\li In the \gui {The user name to log into the device} field, \li In the \gui {The username to log into the device} field,
enter the user name to log into the device and run the enter the username to log into the device and run the
application as. application as.
This value will be available in the variable \c %{CurrentDevice:UserName}. This value will be available in the variable \c %{CurrentDevice:UserName}.

2
src/plugins/mercurial/authenticationdialog.ui
View File

@@ -19,7 +19,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="usernameLabel"> <widget class="QLabel" name="usernameLabel">
<property name="text"> <property name="text">
<string>User name:</string> <string>Username:</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -1091,7 +1091,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
[]() { return variableValue(Constants::VAR_CURRENTDEVICE_SSHPORT); }); []() { return variableValue(Constants::VAR_CURRENTDEVICE_SSHPORT); });
VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_USERNAME, 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); }); []() { return variableValue(Constants::VAR_CURRENTDEVICE_USERNAME); });
VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE, VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE,

2
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui
View File

@@ -58,7 +58,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="userNameLabel"> <widget class="QLabel" name="userNameLabel">
<property name="text"> <property name="text">
<string>The user name to log into the device:</string> <string>The username to log into the device:</string>
</property> </property>
</widget> </widget>
</item> </item>