Merge pull request #12138 from Chocobo1/dist

Update Qt translations

INSTALL

@@ -17,7 +17,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   - pkg-config (compile-time only)
 
-  - Python >= 2.7.9 / 3.3.0 (optional, runtime only)
+  - Python >= 3.3.0 (optional, runtime only)
       * Required by the internal search engine
 
 2a) Compile and install qBittorrent with Qt graphical interface

dist/mac/Info.plist

@@ -84,7 +84,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.bittorrent.torrent</string>
 			<key>UTTypeReferenceURL</key>
-			<string>http://www.bittorrent.org/beps/bep_0000.html</string>
+			<string>https://www.bittorrent.org/beps/bep_0000.html</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>com.apple.ostype</key>

dist/windows/installer.nsi

@@ -32,41 +32,16 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
   File "qbittorrent.exe"
   File "qbittorrent.pdb"
   File "qt.conf"
-  File /oname=translations\qt_ar.qm "translations\qt_ar.qm"
-  File /oname=translations\qt_bg.qm "translations\qt_bg.qm"
-  File /oname=translations\qt_ca.qm "translations\qt_ca.qm"
-  File /oname=translations\qt_cs.qm "translations\qt_cs.qm"
-  File /oname=translations\qt_da.qm "translations\qt_da.qm"
-  File /oname=translations\qt_de.qm "translations\qt_de.qm"
-  File /oname=translations\qt_es.qm "translations\qt_es.qm"
-  File /oname=translations\qt_eu.qm "translations\qt_eu.qm"
-  File /oname=translations\qt_fa.qm "translations\qt_fa.qm"
-  File /oname=translations\qt_fi.qm "translations\qt_fi.qm"
-  File /oname=translations\qt_fr.qm "translations\qt_fr.qm"
-  File /oname=translations\qt_gl.qm "translations\qt_gl.qm"
-  File /oname=translations\qt_he.qm "translations\qt_he.qm"
-  File /oname=translations\qt_hu.qm "translations\qt_hu.qm"
-  File /oname=translations\qt_it.qm "translations\qt_it.qm"
-  File /oname=translations\qt_ja.qm "translations\qt_ja.qm"
-  File /oname=translations\qt_ko.qm "translations\qt_ko.qm"
-  File /oname=translations\qt_lt.qm "translations\qt_lt.qm"
-  File /oname=translations\qt_nl.qm "translations\qt_nl.qm"
-  File /oname=translations\qt_pl.qm "translations\qt_pl.qm"
-  File /oname=translations\qt_pt.qm "translations\qt_pt.qm"
-  File /oname=translations\qt_pt_BR.qm "translations\qt_pt_BR.qm"
-  File /oname=translations\qt_ru.qm "translations\qt_ru.qm"
-  File /oname=translations\qt_sk.qm "translations\qt_sk.qm"
-  File /oname=translations\qt_sl.qm "translations\qt_sl.qm"
-  File /oname=translations\qt_sv.qm "translations\qt_sv.qm"
-  File /oname=translations\qt_tr.qm "translations\qt_tr.qm"
-  File /oname=translations\qt_uk.qm "translations\qt_uk.qm"
-  File /oname=translations\qt_zh_CN.qm "translations\qt_zh_CN.qm"
-  File /oname=translations\qt_zh_TW.qm "translations\qt_zh_TW.qm"
+  File /oname=translations\qtbase_ar.qm "translations\qtbase_ar.qm"
+  File /oname=translations\qtbase_bg.qm "translations\qtbase_bg.qm"
   File /oname=translations\qtbase_ca.qm "translations\qtbase_ca.qm"
   File /oname=translations\qtbase_cs.qm "translations\qtbase_cs.qm"
+  File /oname=translations\qtbase_da.qm "translations\qtbase_da.qm"
   File /oname=translations\qtbase_de.qm "translations\qtbase_de.qm"
+  File /oname=translations\qtbase_es.qm "translations\qtbase_es.qm"
   File /oname=translations\qtbase_fi.qm "translations\qtbase_fi.qm"
   File /oname=translations\qtbase_fr.qm "translations\qtbase_fr.qm"
+  File /oname=translations\qtbase_gd.qm "translations\qtbase_gd.qm"
   File /oname=translations\qtbase_he.qm "translations\qtbase_he.qm"
   File /oname=translations\qtbase_hu.qm "translations\qtbase_hu.qm"
   File /oname=translations\qtbase_it.qm "translations\qtbase_it.qm"
@@ -77,6 +52,14 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
   File /oname=translations\qtbase_ru.qm "translations\qtbase_ru.qm"
   File /oname=translations\qtbase_sk.qm "translations\qtbase_sk.qm"
   File /oname=translations\qtbase_uk.qm "translations\qtbase_uk.qm"
+  File /oname=translations\qtbase_zh_TW.qm "translations\qtbase_zh_TW.qm"
+  File /oname=translations\qt_fa.qm "translations\qt_fa.qm"
+  File /oname=translations\qt_gl.qm "translations\qt_gl.qm"
+  File /oname=translations\qt_lt.qm "translations\qt_lt.qm"
+  File /oname=translations\qt_pt.qm "translations\qt_pt.qm"
+  File /oname=translations\qt_sl.qm "translations\qt_sl.qm"
+  File /oname=translations\qt_sv.qm "translations\qt_sv.qm"
+  File /oname=translations\qt_zh_CN.qm "translations\qt_zh_CN.qm"
 
   ; Write the installation path into the registry
   WriteRegStr HKLM "Software\qBittorrent" "InstallLocation" "$INSTDIR"
@@ -210,7 +193,7 @@ Function .onInit
 
   !insertmacro Init "installer"
   !insertmacro MUI_LANGDLL_DISPLAY
-  
+
   ${IfNot} ${AtLeastWin7}
     MessageBox MB_OK|MB_ICONEXCLAMATION $(inst_requires_win7)
     Abort

dist/windows/uninstaller.nsi

@@ -5,41 +5,16 @@
   Delete "$INSTDIR\qbittorrent.exe"
   Delete "$INSTDIR\qbittorrent.pdb"
   Delete "$INSTDIR\qt.conf"
-  Delete "$INSTDIR\translations\qt_ar.qm"
-  Delete "$INSTDIR\translations\qt_bg.qm"
-  Delete "$INSTDIR\translations\qt_ca.qm"
-  Delete "$INSTDIR\translations\qt_cs.qm"
-  Delete "$INSTDIR\translations\qt_da.qm"
-  Delete "$INSTDIR\translations\qt_de.qm"
-  Delete "$INSTDIR\translations\qt_es.qm"
-  Delete "$INSTDIR\translations\qt_eu.qm"
-  Delete "$INSTDIR\translations\qt_fa.qm"
-  Delete "$INSTDIR\translations\qt_fi.qm"
-  Delete "$INSTDIR\translations\qt_fr.qm"
-  Delete "$INSTDIR\translations\qt_gl.qm"
-  Delete "$INSTDIR\translations\qt_he.qm"
-  Delete "$INSTDIR\translations\qt_hu.qm"
-  Delete "$INSTDIR\translations\qt_it.qm"
-  Delete "$INSTDIR\translations\qt_ja.qm"
-  Delete "$INSTDIR\translations\qt_ko.qm"
-  Delete "$INSTDIR\translations\qt_lt.qm"
-  Delete "$INSTDIR\translations\qt_nl.qm"
-  Delete "$INSTDIR\translations\qt_pl.qm"
-  Delete "$INSTDIR\translations\qt_pt_BR.qm"
-  Delete "$INSTDIR\translations\qt_pt.qm"
-  Delete "$INSTDIR\translations\qt_ru.qm"
-  Delete "$INSTDIR\translations\qt_sk.qm"
-  Delete "$INSTDIR\translations\qt_sl.qm"
-  Delete "$INSTDIR\translations\qt_sv.qm"
-  Delete "$INSTDIR\translations\qt_tr.qm"
-  Delete "$INSTDIR\translations\qt_uk.qm"
-  Delete "$INSTDIR\translations\qt_zh_CN.qm"
-  Delete "$INSTDIR\translations\qt_zh_TW.qm"
+  Delete "$INSTDIR\translations\qtbase_ar.qm"
+  Delete "$INSTDIR\translations\qtbase_bg.qm"
   Delete "$INSTDIR\translations\qtbase_ca.qm"
   Delete "$INSTDIR\translations\qtbase_cs.qm"
+  Delete "$INSTDIR\translations\qtbase_da.qm"
   Delete "$INSTDIR\translations\qtbase_de.qm"
+  Delete "$INSTDIR\translations\qtbase_es.qm"
   Delete "$INSTDIR\translations\qtbase_fi.qm"
   Delete "$INSTDIR\translations\qtbase_fr.qm"
+  Delete "$INSTDIR\translations\qtbase_gd.qm"
   Delete "$INSTDIR\translations\qtbase_he.qm"
   Delete "$INSTDIR\translations\qtbase_hu.qm"
   Delete "$INSTDIR\translations\qtbase_it.qm"
@@ -50,6 +25,14 @@
   Delete "$INSTDIR\translations\qtbase_ru.qm"
   Delete "$INSTDIR\translations\qtbase_sk.qm"
   Delete "$INSTDIR\translations\qtbase_uk.qm"
+  Delete "$INSTDIR\translations\qtbase_zh_TW.qm"
+  Delete "$INSTDIR\translations\qt_fa.qm"
+  Delete "$INSTDIR\translations\qt_gl.qm"
+  Delete "$INSTDIR\translations\qt_lt.qm"
+  Delete "$INSTDIR\translations\qt_pt.qm"
+  Delete "$INSTDIR\translations\qt_sl.qm"
+  Delete "$INSTDIR\translations\qt_sv.qm"
+  Delete "$INSTDIR\translations\qt_zh_CN.qm"
   Delete "$INSTDIR\uninst.exe"
 
   ; Remove directories used

macxconf.pri

@@ -22,41 +22,16 @@ QMAKE_BUNDLE_DATA += qt_conf
 
 qt_translations.path = Contents/translations
 qt_translations.files = \
-    $$QT_LANG_PATH/qt_ar.qm \
-    $$QT_LANG_PATH/qt_bg.qm \
-    $$QT_LANG_PATH/qt_ca.qm \
-    $$QT_LANG_PATH/qt_cs.qm \
-    $$QT_LANG_PATH/qt_da.qm \
-    $$QT_LANG_PATH/qt_de.qm \
-    $$QT_LANG_PATH/qt_es.qm \
-    $$QT_LANG_PATH/qt_eu.qm \
-    $$QT_LANG_PATH/qt_fa.qm \
-    $$QT_LANG_PATH/qt_fi.qm \
-    $$QT_LANG_PATH/qt_fr.qm \
-    $$QT_LANG_PATH/qt_gl.qm \
-    $$QT_LANG_PATH/qt_he.qm \
-    $$QT_LANG_PATH/qt_hu.qm \
-    $$QT_LANG_PATH/qt_it.qm \
-    $$QT_LANG_PATH/qt_ja.qm \
-    $$QT_LANG_PATH/qt_ko.qm \
-    $$QT_LANG_PATH/qt_lt.qm \
-    $$QT_LANG_PATH/qt_nl.qm \
-    $$QT_LANG_PATH/qt_pl.qm \
-    $$QT_LANG_PATH/qt_pt.qm \
-    $$QT_LANG_PATH/qt_pt_BR.qm \
-    $$QT_LANG_PATH/qt_ru.qm \
-    $$QT_LANG_PATH/qt_sk.qm \
-    $$QT_LANG_PATH/qt_sl.qm \
-    $$QT_LANG_PATH/qt_sv.qm \
-    $$QT_LANG_PATH/qt_tr.qm \
-    $$QT_LANG_PATH/qt_uk.qm \
-    $$QT_LANG_PATH/qt_zh_CN.qm \
-    $$QT_LANG_PATH/qt_zh_TW.qm \
+    $$QT_LANG_PATH/qtbase_ar.qm \
+    $$QT_LANG_PATH/qtbase_bg.qm \
     $$QT_LANG_PATH/qtbase_ca.qm \
     $$QT_LANG_PATH/qtbase_cs.qm \
+    $$QT_LANG_PATH/qtbase_da.qm \
     $$QT_LANG_PATH/qtbase_de.qm \
+    $$QT_LANG_PATH/qtbase_es.qm \
     $$QT_LANG_PATH/qtbase_fi.qm \
     $$QT_LANG_PATH/qtbase_fr.qm \
+    $$QT_LANG_PATH/qtbase_gd.qm \
     $$QT_LANG_PATH/qtbase_he.qm \
     $$QT_LANG_PATH/qtbase_hu.qm \
     $$QT_LANG_PATH/qtbase_it.qm \
@@ -66,7 +41,15 @@ qt_translations.files = \
     $$QT_LANG_PATH/qtbase_pl.qm \
     $$QT_LANG_PATH/qtbase_ru.qm \
     $$QT_LANG_PATH/qtbase_sk.qm \
-    $$QT_LANG_PATH/qtbase_uk.qm
+    $$QT_LANG_PATH/qtbase_uk.qm \
+    $$QT_LANG_PATH/qtbase_zh_TW.qm \
+    $$QT_LANG_PATH/qt_fa.qm \
+    $$QT_LANG_PATH/qt_gl.qm \
+    $$QT_LANG_PATH/qt_lt.qm \
+    $$QT_LANG_PATH/qt_pt.qm \
+    $$QT_LANG_PATH/qt_sl.qm \
+    $$QT_LANG_PATH/qt_sv.qm \
+    $$QT_LANG_PATH/qt_zh_CN.qm
 QMAKE_BUNDLE_DATA += qt_translations
 
 ICON = $$DIST_PATH/qbittorrent_mac.icns

src/app/CMakeLists.txt

@@ -116,34 +116,34 @@ if (APPLE)
             MACOSX_PACKAGE_LOCATION Resources)
     set(QT_TR_DIR "${qBittorrent_SOURCE_DIR}/dist/qt-translations")
     set(QT_TRANSLATIONS
-        ${QT_TR_DIR}/qt_ar.qm
-        ${QT_TR_DIR}/qt_bg.qm
-        ${QT_TR_DIR}/qt_ca.qm
-        ${QT_TR_DIR}/qt_cs.qm
-        ${QT_TR_DIR}/qt_da.qm
-        ${QT_TR_DIR}/qt_de.qm
-        ${QT_TR_DIR}/qt_es.qm
-        ${QT_TR_DIR}/qt_eu.qm
-        ${QT_TR_DIR}/qt_fi.qm
-        ${QT_TR_DIR}/qt_fr.qm
+        ${QT_TR_DIR}/qtbase_ar.qm
+        ${QT_TR_DIR}/qtbase_bg.qm
+        ${QT_TR_DIR}/qtbase_ca.qm
+        ${QT_TR_DIR}/qtbase_cs.qm
+        ${QT_TR_DIR}/qtbase_da.qm
+        ${QT_TR_DIR}/qtbase_de.qm
+        ${QT_TR_DIR}/qtbase_es.qm
+        ${QT_TR_DIR}/qtbase_fi.qm
+        ${QT_TR_DIR}/qtbase_fr.qm
+        ${QT_TR_DIR}/qtbase_gd.qm
+        ${QT_TR_DIR}/qtbase_he.qm
+        ${QT_TR_DIR}/qtbase_hu.qm
+        ${QT_TR_DIR}/qtbase_it.qm
+        ${QT_TR_DIR}/qtbase_ja.qm
+        ${QT_TR_DIR}/qtbase_ko.qm
+        ${QT_TR_DIR}/qtbase_lv.qm
+        ${QT_TR_DIR}/qtbase_pl.qm
+        ${QT_TR_DIR}/qtbase_ru.qm
+        ${QT_TR_DIR}/qtbase_sk.qm
+        ${QT_TR_DIR}/qtbase_uk.qm
+        ${QT_TR_DIR}/qtbase_zh_TW.qm
+        ${QT_TR_DIR}/qt_fa.qm
         ${QT_TR_DIR}/qt_gl.qm
-        ${QT_TR_DIR}/qt_he.qm
-        ${QT_TR_DIR}/qt_hu.qm
-        ${QT_TR_DIR}/qt_it.qm
-        ${QT_TR_DIR}/qt_ja.qm
-        ${QT_TR_DIR}/qt_ko.qm
         ${QT_TR_DIR}/qt_lt.qm
-        ${QT_TR_DIR}/qt_nl.qm
-        ${QT_TR_DIR}/qt_pl.qm
         ${QT_TR_DIR}/qt_pt.qm
-        ${QT_TR_DIR}/qt_pt_BR.qm
-        ${QT_TR_DIR}/qt_ru.qm
-        ${QT_TR_DIR}/qt_sk.qm
+        ${QT_TR_DIR}/qt_sl.qm
         ${QT_TR_DIR}/qt_sv.qm
-        ${QT_TR_DIR}/qt_tr.qm
-        ${QT_TR_DIR}/qt_uk.qm
         ${QT_TR_DIR}/qt_zh_CN.qm
-        ${QT_TR_DIR}/qt_zh_TW.qm
     )
     list(APPEND QBT_APP_RESOURCE_SOURCE ${QT_TRANSLATIONS})
     set_source_files_properties(${QT_TRANSLATIONS}