Merge pull request #13803 from JoshuaVandaele/msgmerge-sort

Translation: Remove deprecated --sorted-output/-s option

Languages/po/qt-strings.pot

@@ -2,6 +2,7 @@
 # and may be accessed in applications which use Qt. Extracted from Qt 5.15.1.
 msgid ""
 msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
 
 #: qtbase/src/gui/kernel/qguiapplication.cpp:234
 msgctxt ""

Languages/update-source-strings.sh

@@ -7,8 +7,8 @@ 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' | \
+find $SRCDIR -name '*.cpp' -o -name '*.h' -o -name '*.c' | sort -fd | \
-	xgettext -s -p ./Languages/po -o dolphin-emu.pot --package-name="Dolphin Emulator" \
+	xgettext -p ./Languages/po -o dolphin-emu.pot --package-name="Dolphin Emulator" \
 	--keyword=_ \
 	--keyword=AskYesNoFmtT \
 	--keyword=CriticalAlertFmtT \
@@ -24,7 +24,7 @@ find $SRCDIR -name '*.cpp' -o -name '*.h' -o -name '*.c' | \
 	--add-comments=i18n --from-code=utf-8 -f -
 
 # Copy strings from qt-strings.pot to dolphin-emu.pot
-xgettext -s -p ./Languages/po -o dolphin-emu.pot --package-name="Dolphin Emulator" \
+xgettext -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

Languages/update-translated-strings.sh

@@ -7,4 +7,4 @@
 
 cd "$(dirname "$0")/.."
 POTFILE=./Languages/po/dolphin-emu.pot
-find ./Languages/po -name '*.po' -exec msgmerge --quiet --update -N --backup=none -s {} $POTFILE \;
+find ./Languages/po -name '*.po' -exec msgmerge --quiet --update -N --backup=none {} $POTFILE \;

Source/Core/DolphinQt/CMakeLists.txt

@@ -574,7 +574,7 @@ if(GETTEXT_MSGFMT_EXECUTABLE)
     else()
       add_custom_command(OUTPUT ${mo}
         COMMAND ${CMAKE_COMMAND} -E make_directory ${mo_dir}
-        COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${po} ${pot_file}
+        COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${po} ${pot_file}
         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${mo} ${po}
         DEPENDS ${po}
       )