summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gui/kernel/qapplication.cpp7
-rw-r--r--src/gui/kernel/qcocoamenuloader_mac.mm3
-rw-r--r--src/gui/widgets/qmenu_mac.mm22
-rw-r--r--translations/qt_da.ts15
-rw-r--r--translations/qt_de.ts15
-rw-r--r--translations/qt_es.ts15
-rw-r--r--translations/qt_fr.ts15
-rw-r--r--translations/qt_ja_JP.ts15
-rw-r--r--translations/qt_pl.ts15
-rw-r--r--translations/qt_pt.ts15
-rw-r--r--translations/qt_ru.ts15
-rw-r--r--translations/qt_sv.ts15
-rw-r--r--translations/qt_zh_CN.ts15
-rw-r--r--translations/qt_zh_TW.ts15
14 files changed, 179 insertions, 18 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index fea8c37..a2666f7 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -2309,12 +2309,14 @@ static bool qt_detectRTLLanguage()
" languages or to 'RTL' in right-to-left languages (such as Hebrew"
" and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
}
-#if defined(QT_MAC_USE_COCOA)
static const char *application_menu_strings[] = {
QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","Services"),
QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","Hide %1"),
QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","Hide Others"),
- QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","Show All")
+ QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","Show All"),
+ QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","Preferences..."),
+ QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","Quit %1"),
+ QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","About %1")
};
QString qt_mac_applicationmenu_string(int type)
{
@@ -2322,7 +2324,6 @@ QString qt_mac_applicationmenu_string(int type)
application_menu_strings[type]);
}
#endif
-#endif
/*!\reimp
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm
index 35d156a..b58fd7c 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/src/gui/kernel/qcocoamenuloader_mac.mm
@@ -231,6 +231,9 @@ QT_USE_NAMESPACE
[hideItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(1).arg(qAppName()))];
[hideAllOthersItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(2))];
[showAllItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(3))];
+ [preferencesItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(4))];
+ [quitItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(5).arg(qAppName()))];
+ [aboutItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(6).arg(qAppName()))];
#endif
}
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 627043d..9a14ce6 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -909,6 +909,7 @@ static NSMenuItem *qt_mac_menu_merge_action(OSMenuRef merge, QMacMenuAction *act
static QString qt_mac_menu_merge_text(QMacMenuAction *action)
{
QString ret;
+ extern QString qt_mac_applicationmenu_string(int type);
#ifdef QT_MAC_USE_COCOA
QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = getMenuLoader();
#endif
@@ -916,34 +917,25 @@ static QString qt_mac_menu_merge_text(QMacMenuAction *action)
ret = action->action->text();
#ifndef QT_MAC_USE_COCOA
else if (action->command == kHICommandAbout)
- ret = QMenuBar::tr("About %1").arg(qAppName());
+ ret = qt_mac_applicationmenu_string(6).arg(qAppName());
else if (action->command == kHICommandAboutQt)
ret = QMenuBar::tr("About Qt");
else if (action->command == kHICommandPreferences)
- ret = QMenuBar::tr("Preferences");
+ ret = qt_mac_applicationmenu_string(4);
else if (action->command == kHICommandQuit)
- ret = QMenuBar::tr("Quit %1").arg(qAppName());
+ ret = qt_mac_applicationmenu_string(5).arg(qAppName());
#else
else if (action->menuItem == [loader aboutMenuItem]) {
- if (action->action->text() == QString("About %1").arg(qAppName()))
- ret = QMenuBar::tr("About %1").arg(qAppName());
- else
- ret = action->action->text();
+ ret = qt_mac_applicationmenu_string(6).arg(qAppName());
} else if (action->menuItem == [loader aboutQtMenuItem]) {
if (action->action->text() == QString("About Qt"))
ret = QMenuBar::tr("About Qt");
else
ret = action->action->text();
} else if (action->menuItem == [loader preferencesMenuItem]) {
- if (action->action->text() == QString("Preferences"))
- ret = QMenuBar::tr("Preferences");
- else
- ret = action->action->text();
+ ret = qt_mac_applicationmenu_string(4);
} else if (action->menuItem == [loader quitMenuItem]) {
- if (action->action->text() == QString("Quit %1").arg(qAppName()))
- ret = QMenuBar::tr("About %1").arg(qAppName());
- else
- ret = action->action->text();
+ ret = qt_mac_applicationmenu_string(5).arg(qAppName());
}
#endif
return ret;
diff --git a/translations/qt_da.ts b/translations/qt_da.ts
index 515ed50..6d52fc2 100644
--- a/translations/qt_da.ts
+++ b/translations/qt_da.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>Vis alle</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>Indstillinger…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>Slut %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>Om %1</translation>
+ </message>
</context>
<context>
<name>AudioOutput</name>
diff --git a/translations/qt_de.ts b/translations/qt_de.ts
index 2108774..6289834 100644
--- a/translations/qt_de.ts
+++ b/translations/qt_de.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>Alle anzeigen</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>Einstellungen …</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>%1 beenden</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>Über %1</translation>
+ </message>
</context>
<context>
<name>CloseButton</name>
diff --git a/translations/qt_es.ts b/translations/qt_es.ts
index 596864a..4fa4762 100644
--- a/translations/qt_es.ts
+++ b/translations/qt_es.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>Mostrar todo</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>Preferencias…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>Salir de %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>Acerca de %1</translation>
+ </message>
</context>
<context>
<name>AudioOutput</name>
diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts
index 322fb65..7a69cbe 100644
--- a/translations/qt_fr.ts
+++ b/translations/qt_fr.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>Tout afficher</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>Préférences…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>Quitter %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>À propos de %1</translation>
+ </message>
</context>
<context>
<name>AudioOutput</name>
diff --git a/translations/qt_ja_JP.ts b/translations/qt_ja_JP.ts
index f0dae3a..e6f92b7 100644
--- a/translations/qt_ja_JP.ts
+++ b/translations/qt_ja_JP.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>すべてを表示</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>環境設定...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>%1 を終了</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>%1 について</translation>
+ </message>
</context>
<context>
<name>CloseButton</name>
diff --git a/translations/qt_pl.ts b/translations/qt_pl.ts
index bf6e1fe..db7d2c5 100644
--- a/translations/qt_pl.ts
+++ b/translations/qt_pl.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>Pokaż wszystko</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>Preferencje…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>Zakończ %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>%1…</translation>
+ </message>
</context>
<context>
<name>CloseButton</name>
diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts
index 7ca7fe7..97afd4f 100644
--- a/translations/qt_pt.ts
+++ b/translations/qt_pt.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>Mostrar Tudo</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>Preferências…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>Encerrar %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>Sobre o %1</translation>
+ </message>
</context>
<context>
<name>AudioOutput</name>
diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts
index 641d7aa..e9cdfd4 100644
--- a/translations/qt_ru.ts
+++ b/translations/qt_ru.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>Показать все</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>Настройки…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>Завершить %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>О программе %1</translation>
+ </message>
</context>
<context>
<name>CloseButton</name>
diff --git a/translations/qt_sv.ts b/translations/qt_sv.ts
index 391af4a..d4c8977 100644
--- a/translations/qt_sv.ts
+++ b/translations/qt_sv.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>Visa alla</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>Inställningar…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>Avsluta %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>Om %1</translation>
+ </message>
</context>
<context>
<name>AudioOutput</name>
diff --git a/translations/qt_zh_CN.ts b/translations/qt_zh_CN.ts
index d6a995d..df23f43 100644
--- a/translations/qt_zh_CN.ts
+++ b/translations/qt_zh_CN.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>全部显示</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>偏好设置…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>退出 %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>关于 %1</translation>
+ </message>
</context>
<context>
<name>AudioOutput</name>
diff --git a/translations/qt_zh_TW.ts b/translations/qt_zh_TW.ts
index 50c0048..b29c879 100644
--- a/translations/qt_zh_TW.ts
+++ b/translations/qt_zh_TW.ts
@@ -23,6 +23,21 @@
<source>Show All</source>
<translation>顯示全部</translation>
</message>
+ <message>
+ <location line="+1"/>
+ <source>Preferences...</source>
+ <translation>偏好設定⋯</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Quit %1</source>
+ <translation>結束 %1</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>About %1</source>
+ <translation>關於 %1</translation>
+ </message>
</context>
<context>
<name>AudioOutput</name>
generated by cgit v0.12 at 2024-11-01 08:20:40 (GMT)