From 12628c8c45f7350240305dfb1fba53796ddef2b5 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Mon, 19 Oct 2020 15:58:51 +0200
Subject: [PATCH 1/2] Fix predefined Qt strings not getting translated

https://bugs.dolphin-emu.org/issues/11507
---
 Languages/po/qt-strings.pot        | 76 ++++++++++++++++++++++++++++++
 Languages/update-source-strings.sh |  6 +++
 2 files changed, 82 insertions(+)
 create mode 100644 Languages/po/qt-strings.pot

diff --git a/Languages/po/qt-strings.pot b/Languages/po/qt-strings.pot
new file mode 100644
index 0000000000..2dfca16fee
--- /dev/null
+++ b/Languages/po/qt-strings.pot
@@ -0,0 +1,76 @@
+# This file contains strings which are defined in Qt's source code
+# and may be shown in applications which use Qt. Extracted from Qt 5.15.1.
+msgid ""
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:708
+msgid "OK"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:710
+msgid "Save"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:712
+msgid "Save All"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:714
+msgid "Open"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:716
+msgid "&Yes"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:718
+msgid "Yes to &All"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:720
+msgid "&No"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:722
+msgid "N&o to All"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:724
+msgid "Abort"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:726
+msgid "Retry"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:728
+msgid "Ignore"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:730
+msgid "Close"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:732
+msgid "Cancel"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:734
+msgid "Discard"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:736
+msgid "Help"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:738
+msgid "Apply"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:740
+msgid "Reset"
+msgstr ""
+
+#: qtbase/src/gui/kernel/qplatformtheme.cpp:742
+msgid "Restore Defaults"
+msgstr ""
diff --git a/Languages/update-source-strings.sh b/Languages/update-source-strings.sh
index 0d86964e56..845135150d 100755
--- a/Languages/update-source-strings.sh
+++ b/Languages/update-source-strings.sh
@@ -4,6 +4,8 @@
 # the source code.
 
 cd "$(dirname "$0")/.."
+
+# Scan the source code for strings and put them in dolphin-emu.pot
 SRCDIR=Source
 find $SRCDIR -name '*.cpp' -o -name '*.h' -o -name '*.c' | \
 	xgettext -d dolphin-emu -s --keyword=_ --keyword=wxTRANSLATE --keyword=SuccessAlertT \
@@ -13,6 +15,10 @@ find $SRCDIR -name '*.cpp' -o -name '*.h' -o -name '*.c' | \
 	--add-comments=i18n -p ./Languages/po -o dolphin-emu.pot -f - --package-name="Dolphin Emulator" \
 	--from-code=utf-8
 
+# Copy strings from qt-strings.pot to dolphin-emu.pot
+xgettext -d dolphin-emu -s -p ./Languages/po -o dolphin-emu.pot --package-name="Dolphin Emulator" \
+  -j ./Languages/po/qt-strings.pot
+
 sed -i "s/SOME DESCRIPTIVE TITLE\./Translation of dolphin-emu.pot to LANGUAGE/" Languages/po/dolphin-emu.pot
 sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2003-2013/" Languages/po/dolphin-emu.pot
 sed -i "s/license as the PACKAGE package/license as the dolphin-emu package/" Languages/po/dolphin-emu.pot

From 3112a33f96530eccc7c1ee123b57baff1d9eae77 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Mon, 19 Oct 2020 16:29:47 +0200
Subject: [PATCH 2/2] Reorder xgettext arguments

Just so that both xgettext invocations start off the
same way, for ease of comparison.

I also removed -d because -o makes it redundant.
---
 Languages/update-source-strings.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Languages/update-source-strings.sh b/Languages/update-source-strings.sh
index 845135150d..2bf3bdcd28 100755
--- a/Languages/update-source-strings.sh
+++ b/Languages/update-source-strings.sh
@@ -8,15 +8,14 @@ cd "$(dirname "$0")/.."
 # Scan the source code for strings and put them in dolphin-emu.pot
 SRCDIR=Source
 find $SRCDIR -name '*.cpp' -o -name '*.h' -o -name '*.c' | \
-	xgettext -d dolphin-emu -s --keyword=_ --keyword=wxTRANSLATE --keyword=SuccessAlertT \
-	--keyword=PanicAlertT --keyword=PanicYesNoT --keyword=AskYesNoT --keyword=CriticalAlertT \
-	--keyword=GetStringT --keyword=_trans --keyword=tr:1,1t --keyword=tr:1,2c --keyword=QT_TR_NOOP \
-	--keyword=FmtFormatT \
-	--add-comments=i18n -p ./Languages/po -o dolphin-emu.pot -f - --package-name="Dolphin Emulator" \
-	--from-code=utf-8
+	xgettext -s -p ./Languages/po -o dolphin-emu.pot --package-name="Dolphin Emulator" \
+	--keyword=_ --keyword=wxTRANSLATE --keyword=SuccessAlertT --keyword=PanicAlertT \
+	--keyword=PanicYesNoT --keyword=AskYesNoT --keyword=CriticalAlertT --keyword=GetStringT \
+	--keyword=_trans --keyword=tr:1,1t --keyword=tr:1,2c --keyword=QT_TR_NOOP --keyword=FmtFormatT \
+	--add-comments=i18n --from-code=utf-8 -f -
 
 # Copy strings from qt-strings.pot to dolphin-emu.pot
-xgettext -d dolphin-emu -s -p ./Languages/po -o dolphin-emu.pot --package-name="Dolphin Emulator" \
+xgettext -s -p ./Languages/po -o dolphin-emu.pot --package-name="Dolphin Emulator" \
   -j ./Languages/po/qt-strings.pot
 
 sed -i "s/SOME DESCRIPTIVE TITLE\./Translation of dolphin-emu.pot to LANGUAGE/" Languages/po/dolphin-emu.pot