Remove six languages from Blender UI (rational: very low level of translation, 1-2% at most, and no commit done in branch since more than one year): fi (Finnish), ca (Catalan), bg (Bulgarian), el (Greek), ne (Nepali) and pl (Polish).

Also fix compile in paranoid warning=errors mode for own last commit.

2 files changed, 6 insertions, 1 deletions

diff --git a/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py b/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
index a15bea9ef0d..533dded3c57 100755
--- a/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
+++ b/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
@@ -39,6 +39,8 @@ except:
 TRUNK_PO_DIR = settings.TRUNK_PO_DIR
 BRANCHES_DIR = settings.BRANCHES_DIR
 
+IMPORT_LANGUAGES_SKIP = settings.IMPORT_LANGUAGES_SKIP
+
 RTL_PREPROCESS_FILE = settings.RTL_PREPROCESS_FILE
 
 PY3 = settings.PYTHON3_EXEC
@@ -63,7 +65,7 @@ def main():
         threshold = float(args.threshold) / 100.0
 
     for lang in os.listdir(BRANCHES_DIR):
-        if args.langs and lang not in args.langs:
+        if (args.langs and lang not in args.langs) or lang in IMPORT_LANGUAGES_SKIP:
             continue
         po = os.path.join(BRANCHES_DIR, lang, ".".join((lang, "po")))
         if os.path.exists(po):
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index 5db8f9c7c94..26a4cbaeb01 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -35,6 +35,9 @@ import os.path
 # into /trunk, as a percentage. -1 means "import everything".
 IMPORT_MIN_LEVEL = -1
 
+# Languages in /branches we do not want to import in /trunk currently...
+IMPORT_LANGUAGES_SKIP = {'bg', 'ca', 'fi', 'el', 'ko', 'ne', 'pl', 'ro'}
+
 # The comment prefix used in generated messages.txt file.
 COMMENT_PREFIX = "#~ "