diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-11-06 16:46:31 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-11-07 00:47:32 +0000 |
commit | 72c70b6abebb413c7119c2db2e2f0a2ee2da5525 (patch) | |
tree | 703fa9a9ce6097ebe9877b614962614279cb5aa0 /ui | |
parent | 28e19b6b2333f21091a2dba462b1b87b7e7f1edb (diff) |
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>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/main_window_preferences_frame.cpp | 2 | ||||
-rw-r--r-- | ui/qt/main_window_preferences_frame.ui | 2 | ||||
-rw-r--r-- | ui/qt/wireshark_application.cpp | 2 | ||||
-rw-r--r-- | ui/qt/wireshark_de.ts | 2 | ||||
-rw-r--r-- | ui/qt/wireshark_en.ts | 2 | ||||
-rw-r--r-- | ui/qt/wireshark_fr.ts | 4 | ||||
-rw-r--r-- | ui/qt/wireshark_it.ts | 4 | ||||
-rw-r--r-- | ui/qt/wireshark_ja_JP.ts | 4 | ||||
-rw-r--r-- | ui/qt/wireshark_pl.ts | 4 | ||||
-rw-r--r-- | ui/qt/wireshark_zh_CN.ts | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/ui/qt/main_window_preferences_frame.cpp b/ui/qt/main_window_preferences_frame.cpp index db4f5cabad..0223cad18f 100644 --- a/ui/qt/main_window_preferences_frame.cpp +++ b/ui/qt/main_window_preferences_frame.cpp @@ -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) { diff --git a/ui/qt/main_window_preferences_frame.ui b/ui/qt/main_window_preferences_frame.ui index 043d9924c6..7d4e901979 100644 --- a/ui/qt/main_window_preferences_frame.ui +++ b/ui/qt/main_window_preferences_frame.ui @@ -312,7 +312,7 @@ </property> <item> <property name="text"> - <string>Auto</string> + <string>Use system setting</string> </property> </item> </widget> diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp index a4f3595438..9f04a6ef47 100644 --- a/ui/qt/wireshark_application.cpp +++ b/ui/qt/wireshark_application.cpp @@ -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; diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 59f7ccd584..e4470a60d7 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -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> diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 901c19c684..bddc725ee3 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -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> diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index 84b3506225..0e4094f501 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -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"/> diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 807d4b7659..0ad5530539 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -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"/> diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index d9b8250bc4..9de88c27f6 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -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"/> diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index cf87dafc72..505faf681c 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -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> diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 03a8217b34..3741225355 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -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> |