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

Android: Fix punctuation and wording of messages

Browse Source 
Task-number: QTCREATORBUG-27055
Change-Id: I4180717163ec52a405c40e1a932713dda27c3f38
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Leena Miettinen
2022-02-16 17:56:12 +01:00
parent e4ff13e529
commit 1f3e6b4c7a
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
share/qtcreator/translations/qtcreator_ru.ts
View File

@@ -1758,12 +1758,12 @@ Cancelling pending operations...
<context>
<name>Android::Internal::AndroidServiceWidget::AndroidServiceModel</name>
<message>
<source>The name of the class implementing the service</source>
<translation>Имя класса, реализующего сервис</translation>
<source>The name of the class implementing the service.</source>
<translation>Имя класса, реализующего сервис.</translation>
</message>
<message>
<source>Checked if the service is run in an external process</source>
<translation>Отмечено, если сервис работает во внешнем процессе</translation>
<source>Checked if the service is run in an external process.</source>
<translation>Отмечено, если сервис работает во внешнем процессе.</translation>
</message>
<message>
<source>The name of the external process.
@@ -1772,52 +1772,52 @@ Prefix with : if the process is private, use a lowercase name if the process is
Если имя начинается с двоеточия, то процесс приватный, если написано в нижнем регистре, то процесс глобальный.</translation>
</message>
<message>
<source>Checked if the service is in a separate dynamic library</source>
<translation>Отмечено, если сервис в отдельной динамической библиотеке</translation>
<source>Checked if the service is in a separate dynamic library.</source>
<translation>Отмечено, если сервис в отдельной динамической библиотеке.</translation>
</message>
<message>
<source>The name of the separate dynamic library</source>
<translation>Имя отдельной динамической библиотеки</translation>
<source>The name of the separate dynamic library.</source>
<translation>Имя отдельной динамической библиотеки.</translation>
</message>
<message>
<source>The arguments for telling the app to run the service instead of the main activity</source>
<translation>Параметры запуска сервиса вместо основной функциональности приложения</translation>
<source>The arguments for telling the app to run the service instead of the main activity.</source>
<translation>Параметры запуска сервиса вместо основной функциональности приложения.</translation>
</message>
<message>
<source>Service class name</source>
<translation>Имя класса сервиса</translation>
<source>Service class name.</source>
<translation>Имя класса сервиса.</translation>
</message>
<message>
<source>Run in external process</source>
<translation>Работа во внешнем процессе</translation>
<source>Run in external process.</source>
<translation>Работа во внешнем процессе.</translation>
</message>
<message>
<source>Process name</source>
<translation>Имя процесса</translation>
<source>Process name.</source>
<translation>Имя процесса.</translation>
</message>
<message>
<source>Run in external library</source>
<translation>Работа во внешней библиотеке</translation>
<source>Run in external library.</source>
<translation>Работа во внешней библиотеке.</translation>
</message>
<message>
<source>Library name</source>
<translation>Имя библиотеки</translation>
<source>Library name.</source>
<translation>Имя библиотеки.</translation>
</message>
<message>
<source>Service arguments</source>
<translation>Параметры сервиса</translation>
<source>Service arguments.</source>
<translation>Параметры сервиса.</translation>
</message>
<message>
<source>The class name must be set</source>
<translation>Должно быть задано имя класса</translation>
<source>The class name must be set.</source>
<translation>Должно быть задано имя класса.</translation>
</message>
<message>
<source>The process name must be set for a service run in an external process</source>
<translation>Имя процесса должно быть задано для сервиса, работающего во внешнем процессе</translation>
<source>The process name must be set for a service run in an external process.</source>
<translation>Имя процесса должно быть задано для сервиса, работающего во внешнем процессе.</translation>
</message>
<message>
<source>The library name must be set for a service run in an external library</source>
<translation>Имя библиотеки должно быть задано для сервиса, работающего во внешней библиотеке</translation>
<source>The library name must be set for a service run in an external library.</source>
<translation>Имя библиотеки должно быть задано для сервиса, работающего во внешней библиотеке.</translation>
</message>
<message>
<source>The service arguments must be set for a service not run in an external library</source>

32
src/plugins/android/androidservicewidget.cpp
View File

@@ -204,31 +204,31 @@ QVariant AndroidServiceWidget::AndroidServiceModel::headerData(int section, Qt::
{
if (role == Qt::ToolTipRole && orientation == Qt::Horizontal) {
if (section == 0)
return tr("The name of the class implementing the service");
return tr("The name of the class implementing the service.");
else if (section == 1)
return tr("Checked if the service is run in an external process");
return tr("Checked if the service is run in an external process.");
else if (section == 2)
return tr("The name of the external process.\n"
"Prefix with : if the process is private, use a lowercase name if the process is global.");
else if (section == 3)
return tr("Checked if the service is in a separate dynamic library");
return tr("Checked if the service is in a separate dynamic library.");
else if (section == 4)
return tr("The name of the separate dynamic library");
return tr("The name of the separate dynamic library.");
else if (section == 5)
return tr("The arguments for telling the app to run the service instead of the main activity");
return tr("The arguments for telling the app to run the service instead of the main activity.");
} else if (role == Qt::DisplayRole && orientation == Qt::Horizontal) {
if (section == 0)
return tr("Service class name");
return tr("Service class name.");
else if (section == 1)
return tr("Run in external process");
return tr("Run in external process.");
else if (section == 2)
return tr("Process name");
return tr("Process name.");
else if (section == 3)
return tr("Run in external library");
return tr("Run in external library.");
else if (section == 4)
return tr("Library name");
return tr("Library name.");
else if (section == 5)
return tr("Service arguments");
return tr("Service arguments.");
}
return {};
}
@@ -247,22 +247,22 @@ QVariant AndroidServiceWidget::AndroidServiceModel::data(const QModelIndex &inde
if (index.column() == 0)
return m_services[index.row()].className();
else if (index.column() == 1)
return tr("Run in external process");
return tr("Run in external process.");
else if (index.column() == 2)
return m_services[index.row()].externalProcessName();
else if (index.column() == 3)
return tr("Run in external library");
return tr("Run in external library.");
else if (index.column() == 4)
return m_services[index.row()].externalLibraryName();
else if (index.column() == 5)
return m_services[index.row()].serviceArguments();
} else if (role == Qt::ToolTipRole) {
if (index.column() == 0 && m_services[index.row()].className().isEmpty())
return tr("The class name must be set");
return tr("The class name must be set.");
else if (index.column() == 2 && m_services[index.row()].isRunInExternalProcess())
return tr("The process name must be set for a service run in an external process");
return tr("The process name must be set for a service run in an external process.");
else if (index.column() == 4 && m_services[index.row()].isRunInExternalLibrary())
return tr("The library name must be set for a service run in an external library");
return tr("The library name must be set for a service run in an external library.");
} else if (role == Qt::EditRole) {
if (index.column() == 0)
return m_services[index.row()].className();

2
src/plugins/android/androidsettingswidget.ui
View File

@@ -65,7 +65,7 @@
<item>
<widget class="QPushButton" name="makeDefaultNdkButton">
<property name="toolTip">
<string>Force a specific NDK installation to be used by all Android kits.&lt;br/&gt;Note that the forced NDK might not be compatible with all Qt registered versions.</string>
<string>Force a specific NDK installation to be used by all Android kits.&lt;br/&gt;Note that the forced NDK might not be compatible with all registered Qt versions.</string>
</property>
</widget>
</item>