osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Call the default language preference setting "Use system setting". 

That more correctly describes it - it doesn't do any form of automatic
detection of anything, it just picks up the system settings from
wherever Qt picks them up.

Change-Id: I62d40719728cc9735e3b8f3e4202b7e61fc3f43b
Reviewed-on: https://code.wireshark.org/review/5165
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-11-06 16:46:31 -08:00
parent 28e19b6b23
commit 72c70b6abe
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/main_window_preferences_frame.cpp
View File

@ -96,7 +96,7 @@ MainWindowPreferencesFrame::MainWindowPreferencesFrame(QWidget *parent) :
ui->languageComboBox->addItem(ico, lang, locale);
}
ui->languageComboBox->setItemData(0, "auto");
ui->languageComboBox->setItemData(0, "system");
ui->languageComboBox->model()->sort(0);
for (int i = 0; i < ui->languageComboBox->count(); i += 1) {

2
ui/qt/main_window_preferences_frame.ui
View File

@ -312,7 +312,7 @@
</property>
<item>
<property name="text">
<string>Auto</string>
<string>Use system setting</string>
</property>
</item>
</widget>

2
ui/qt/wireshark_application.cpp
View File

@ -883,7 +883,7 @@ void WiresharkApplication::loadLanguage(const QString& newLanguage)
QLocale locale;
QString localeLanguage;
if (newLanguage.isEmpty() || newLanguage == "auto") {
if (newLanguage.isEmpty() || newLanguage == "system") {
localeLanguage = QLocale::system().name();
} else {
localeLanguage = newLanguage;

2
ui/qt/wireshark_de.ts
View File

@ -3005,7 +3005,7 @@ live packets from your network</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-Detect</source>
<source>Use system setting</source>
<translation type="unfinished"></translation>
</message>
<message>

2
ui/qt/wireshark_en.ts
View File

@ -3780,7 +3780,7 @@ more about Wireshark</source>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="315"/>
<source>Auto-Detect</source>
<source>Use system setting</source>
<translation type="unfinished"></translation>
</message>
<message>

4
ui/qt/wireshark_fr.ts
View File

@ -3907,8 +3907,8 @@ Voulez-vous arrêter la capture et enregistrer les paquets capturés</translatio
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="315"/>
<source>Auto-Detect</source>
<translation>Auto-Dectection</translation>
<source>Use system setting</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="320"/>

4
ui/qt/wireshark_it.ts
View File

@ -5981,8 +5981,8 @@ altro su Wireshark</translation>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="315"/>
<source>Auto-Detect</source>
<translation>Rileva automaticamente</translation>
<source>Use system setting</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="320"/>

4
ui/qt/wireshark_ja_JP.ts
View File

@ -5837,8 +5837,8 @@ more about Wireshark</source>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="315"/>
<source>Auto-Detect</source>
<translation>自動検出</translation>
<source>Use system setting</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="320"/>

4
ui/qt/wireshark_pl.ts
View File

@ -4746,8 +4746,8 @@ more about Wireshark</source>
<translation>Główny pasek stylów:</translation>
</message>
<message>
<source>Auto-Detect</source>
<translation>Wykryj język</translation>
<source>Use system setting</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>English</source>

2
ui/qt/wireshark_zh_CN.ts
View File

@ -3881,7 +3881,7 @@ Wireshark 的更多信息</translation>
</message>
<message>
<location filename="main_window_preferences_frame.ui" line="315"/>
<source>Auto-Detect</source>
<source>Use system setting</source>
<translation type="unfinished"></translation>
</message>
<message>