5 files changed, 183 insertions, 170 deletions
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 408e6925e..a499bd143 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -43,9 +43,9 @@ source=(brand.dtd
         languages.${CARCH}
         sha512sums.${CARCH})
 
-_languages_x86_64_shasum="8c60f7ce41e9c3db79716746932c506cdda6fff5cba6f47885222bd89a97c04dabb9c2134e68703967432e8cda2ec726838568d0f173df258ecf36ec0c431e48"
-_languages_i686_shasum="8c60f7ce41e9c3db79716746932c506cdda6fff5cba6f47885222bd89a97c04dabb9c2134e68703967432e8cda2ec726838568d0f173df258ecf36ec0c431e48"
-_languages_armv7h_shasum="8c60f7ce41e9c3db79716746932c506cdda6fff5cba6f47885222bd89a97c04dabb9c2134e68703967432e8cda2ec726838568d0f173df258ecf36ec0c431e48"
+_languages_x86_64_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
+_languages_i686_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
+_languages_armv7h_shasum="048575a6fe88ee3de5ddd5c2419893d5c4cdc1f1a7b5f015647ddc59a5c385b7ab13c80bbdc65213b921d4224573c8159445dc06f37ab6612ec012927fe6e6c1"
 _languages_list_shasum="_languages_${CARCH}_shasum"
 
 _sha512sums_x86_64_shasum="0cde0eabb54642aa00dae4362bca31d9686103049b74c2859c1f7deb105c886d7134f62b8de9f11272567618bc3049c32e162b8b3eeec0037fc370ad60678e74"
diff --git a/libre/icedove-l10n/languages.armv7h b/libre/icedove-l10n/languages.armv7h
index fc8e50c8e..82ce50c7d 100644
--- a/libre/icedove-l10n/languages.armv7h
+++ b/libre/icedove-l10n/languages.armv7h
@@ -1,63 +1,63 @@
 _languages=(
-  'ar     "العربية Language Pack"'
-  'ast    "Asturianu Language Pack"'
-  'be     "Беларуская Language Pack"'
-  'bg     "Български Language Pack"'
+  'ar     "Arabic Language Pack"'
+  'ast    "Asturian Language Pack"'
+  'be     "Belarusian Language Pack"'
+  'bg     "Bulgarian Language Pack"'
   'br     "Breton Language Pack"'
-  'ca     "Català Language Pack"'
-  'cak    "Kaqchikel (Guatemala) Language Pack"'
-  'cs     "Czech (CZ) Language Pack"'
-  'cy     "Cymraeg Language Pack"'
-  'da     "Dansk (da) Language Pack"'
-  'de     "Deutsch (DE) Language Pack"'
-  'dsb    "Dolnoserbšćina Language Pack"'
-  'el     "Ελληνικά Language Pack"'
-  'en-GB  "English (GB) Language Pack"'
-  'en-US  "English (US) Language Pack"'
-  'es-AR  "Español (AR) Language Pack"'
-  'es-ES  "Español (España) Language Pack"'
+  'ca     "Catalan Language Pack"'
+  'cak    "Kaqchikel Language Pack"'
+  'cs     "Czech Language Pack"'
+  'cy     "Welsh Language Pack"'
+  'da     "Danish Language Pack"'
+  'de     "German Language Pack"'
+  'dsb    "Lower Sorbian Language Pack"'
+  'el     "Greek Language Pack"'
+  'en-GB  "English (United Kingdom) Language Pack"'
+  'en-US  "English (United States) Language Pack"'
+  'es-AR  "Spanish (Argentina) Language Pack"'
+  'es-ES  "Spanish (Spain) Language Pack"'
   'et     "Estonian Language Pack"'
   'eu     "Basque Language Pack"'
   'fi     "Finnish Language Pack"'
-  'fr     "Français Language Pack"'
-  'fy-NL  "Frysk (fy) Language Pack"'
-  'ga-IE  "Béarla (SAM) Language Pack"'
-  'gd     "Gàidhlig Language Pack"'
-  'gl     "Galego (España) Language Pack"'
-  'he     "Hebrew (IL) Language Pack"'
-  'hr     "Hrvatski (HR) Language Pack"'
-  'hsb    "Hornjoserbšćina Language Pack"'
-  'hu     "Magyar (HU) Language Pack"'
-  'hy-AM  "Armenian (AM) Language Pack"'
-  'id     "Bahasa Indonesia (ID) Language Pack"'
-  'is     "Icelandic (IS) Language Pack"'
-  'it     "Italiano (IT) Language Pack"'
+  'fr     "French Language Pack"'
+  'fy-NL  "Frisian (Netherlands) Language Pack"'
+  'ga-IE  "Irish (Ireland) Language Pack"'
+  'gd     "Scottish Gaelic Language Pack"'
+  'gl     "Galician Language Pack"'
+  'he     "Hebrew Language Pack"'
+  'hr     "Croatian Language Pack"'
+  'hsb    "Upper Sorbian Language Pack"'
+  'hu     "Hungarian Language Pack"'
+  'hy-AM  "Armenian (Armenia) Language Pack"'
+  'id     "Indonesian Language Pack"'
+  'is     "Icelandic Language Pack"'
+  'it     "Italian Language Pack"'
   'ja     "Japanese Language Pack"'
-  'ka     "Georgian (ქართული) Language Pack"'
-  'kab    "Taqbaylit Language Pack"'
-  'kk     "Kazakh (KZ) Language Pack"'
-  'ko     "Korean (KR) Language Pack"'
-  'lt     "Lietuvių Language Pack"'
-  'ms     "Bahasa Melayu (ms) Language Pack"'
-  'nb-NO  "Norsk bokmål (NO) Language Pack"'
-  'nl     "Nederlands (NL) Language Pack"'
-  'nn-NO  "Norsk nynorsk (NO) Language Pack"'
-  'pl     "Polski Language Pack"'
-  'pt-BR  "Português (pt-BR) Language Pack"'
-  'pt-PT  "Português (Europeu) Language Pack"'
-  'rm     "Rumantsch Language Pack"'
-  'ro     "Română (România) Language Pack"'
-  'ru     "Russian (RU) Language Pack"'
-  'si     "Sinhala (si-LK) Language Pack"'
-  'sk     "Slovak (SK) Language Pack"'
-  'sl     "Slovenski jezik Language Pack"'
-  'sq     "Shqip Language Pack"'
-  'sr     "српски (sr) Language Pack"'
-  'sv-SE  "Svenska (SE) Language Pack"'
-  'tr     "Türkçe (TR) Language Pack"'
-  'uk     "Ukrainian (UA) Language Pack"'
+  'ka     "Georgian Language Pack"'
+  'kab    "Kabyle Language Pack"'
+  'kk     "Kazakh Language Pack"'
+  'ko     "Korean Language Pack"'
+  'lt     "Lithuanian Language Pack"'
+  'ms     "Malay Language Pack"'
+  'nb-NO  "Norwegian Bokmål (Norway) Language Pack"'
+  'nl     "Dutch Language Pack"'
+  'nn-NO  "Norwegian Nynorsk (Norway) Language Pack"'
+  'pl     "Polish Language Pack"'
+  'pt-BR  "Portuguese (Brazil) Language Pack"'
+  'pt-PT  "Portuguese (Portugal) Language Pack"'
+  'rm     "Rhaeto-Romanic Language Pack"'
+  'ro     "Romanian Language Pack"'
+  'ru     "Russian Language Pack"'
+  'si     "Singhalese Language Pack"'
+  'sk     "Slovak Language Pack"'
+  'sl     "Slovenian Language Pack"'
+  'sq     "Albanian Language Pack"'
+  'sr     "Serbian Language Pack"'
+  'sv-SE  "Swedish (Sweden) Language Pack"'
+  'tr     "Turkish Language Pack"'
+  'uk     "Ukrainian Language Pack"'
   'uz     "Uzbek Language Pack"'
-  'vi     "Tiếng Việt Language Pack"'
-  'zh-CN  "Chinese Simplified (zh-CN) Language Pack"'
-  'zh-TW  "Traditional Chinese (zh-TW) Language Pack"'
+  'vi     "Vietnamese Language Pack"'
+  'zh-CN  "Chinese (China) Language Pack"'
+  'zh-TW  "Chinese (Taiwan) Language Pack"'
 )
diff --git a/libre/icedove-l10n/languages.i686 b/libre/icedove-l10n/languages.i686
index fc8e50c8e..82ce50c7d 100644
--- a/libre/icedove-l10n/languages.i686
+++ b/libre/icedove-l10n/languages.i686
@@ -1,63 +1,63 @@
 _languages=(
-  'ar     "العربية Language Pack"'
-  'ast    "Asturianu Language Pack"'
-  'be     "Беларуская Language Pack"'
-  'bg     "Български Language Pack"'
+  'ar     "Arabic Language Pack"'
+  'ast    "Asturian Language Pack"'
+  'be     "Belarusian Language Pack"'
+  'bg     "Bulgarian Language Pack"'
   'br     "Breton Language Pack"'
-  'ca     "Català Language Pack"'
-  'cak    "Kaqchikel (Guatemala) Language Pack"'
-  'cs     "Czech (CZ) Language Pack"'
-  'cy     "Cymraeg Language Pack"'
-  'da     "Dansk (da) Language Pack"'
-  'de     "Deutsch (DE) Language Pack"'
-  'dsb    "Dolnoserbšćina Language Pack"'
-  'el     "Ελληνικά Language Pack"'
-  'en-GB  "English (GB) Language Pack"'
-  'en-US  "English (US) Language Pack"'
-  'es-AR  "Español (AR) Language Pack"'
-  'es-ES  "Español (España) Language Pack"'
+  'ca     "Catalan Language Pack"'
+  'cak    "Kaqchikel Language Pack"'
+  'cs     "Czech Language Pack"'
+  'cy     "Welsh Language Pack"'
+  'da     "Danish Language Pack"'
+  'de     "German Language Pack"'
+  'dsb    "Lower Sorbian Language Pack"'
+  'el     "Greek Language Pack"'
+  'en-GB  "English (United Kingdom) Language Pack"'
+  'en-US  "English (United States) Language Pack"'
+  'es-AR  "Spanish (Argentina) Language Pack"'
+  'es-ES  "Spanish (Spain) Language Pack"'
   'et     "Estonian Language Pack"'
   'eu     "Basque Language Pack"'
   'fi     "Finnish Language Pack"'
-  'fr     "Français Language Pack"'
-  'fy-NL  "Frysk (fy) Language Pack"'
-  'ga-IE  "Béarla (SAM) Language Pack"'
-  'gd     "Gàidhlig Language Pack"'
-  'gl     "Galego (España) Language Pack"'
-  'he     "Hebrew (IL) Language Pack"'
-  'hr     "Hrvatski (HR) Language Pack"'
-  'hsb    "Hornjoserbšćina Language Pack"'
-  'hu     "Magyar (HU) Language Pack"'
-  'hy-AM  "Armenian (AM) Language Pack"'
-  'id     "Bahasa Indonesia (ID) Language Pack"'
-  'is     "Icelandic (IS) Language Pack"'
-  'it     "Italiano (IT) Language Pack"'
+  'fr     "French Language Pack"'
+  'fy-NL  "Frisian (Netherlands) Language Pack"'
+  'ga-IE  "Irish (Ireland) Language Pack"'
+  'gd     "Scottish Gaelic Language Pack"'
+  'gl     "Galician Language Pack"'
+  'he     "Hebrew Language Pack"'
+  'hr     "Croatian Language Pack"'
+  'hsb    "Upper Sorbian Language Pack"'
+  'hu     "Hungarian Language Pack"'
+  'hy-AM  "Armenian (Armenia) Language Pack"'
+  'id     "Indonesian Language Pack"'
+  'is     "Icelandic Language Pack"'
+  'it     "Italian Language Pack"'
   'ja     "Japanese Language Pack"'
-  'ka     "Georgian (ქართული) Language Pack"'
-  'kab    "Taqbaylit Language Pack"'
-  'kk     "Kazakh (KZ) Language Pack"'
-  'ko     "Korean (KR) Language Pack"'
-  'lt     "Lietuvių Language Pack"'
-  'ms     "Bahasa Melayu (ms) Language Pack"'
-  'nb-NO  "Norsk bokmål (NO) Language Pack"'
-  'nl     "Nederlands (NL) Language Pack"'
-  'nn-NO  "Norsk nynorsk (NO) Language Pack"'
-  'pl     "Polski Language Pack"'
-  'pt-BR  "Português (pt-BR) Language Pack"'
-  'pt-PT  "Português (Europeu) Language Pack"'
-  'rm     "Rumantsch Language Pack"'
-  'ro     "Română (România) Language Pack"'
-  'ru     "Russian (RU) Language Pack"'
-  'si     "Sinhala (si-LK) Language Pack"'
-  'sk     "Slovak (SK) Language Pack"'
-  'sl     "Slovenski jezik Language Pack"'
-  'sq     "Shqip Language Pack"'
-  'sr     "српски (sr) Language Pack"'
-  'sv-SE  "Svenska (SE) Language Pack"'
-  'tr     "Türkçe (TR) Language Pack"'
-  'uk     "Ukrainian (UA) Language Pack"'
+  'ka     "Georgian Language Pack"'
+  'kab    "Kabyle Language Pack"'
+  'kk     "Kazakh Language Pack"'
+  'ko     "Korean Language Pack"'
+  'lt     "Lithuanian Language Pack"'
+  'ms     "Malay Language Pack"'
+  'nb-NO  "Norwegian Bokmål (Norway) Language Pack"'
+  'nl     "Dutch Language Pack"'
+  'nn-NO  "Norwegian Nynorsk (Norway) Language Pack"'
+  'pl     "Polish Language Pack"'
+  'pt-BR  "Portuguese (Brazil) Language Pack"'
+  'pt-PT  "Portuguese (Portugal) Language Pack"'
+  'rm     "Rhaeto-Romanic Language Pack"'
+  'ro     "Romanian Language Pack"'
+  'ru     "Russian Language Pack"'
+  'si     "Singhalese Language Pack"'
+  'sk     "Slovak Language Pack"'
+  'sl     "Slovenian Language Pack"'
+  'sq     "Albanian Language Pack"'
+  'sr     "Serbian Language Pack"'
+  'sv-SE  "Swedish (Sweden) Language Pack"'
+  'tr     "Turkish Language Pack"'
+  'uk     "Ukrainian Language Pack"'
   'uz     "Uzbek Language Pack"'
-  'vi     "Tiếng Việt Language Pack"'
-  'zh-CN  "Chinese Simplified (zh-CN) Language Pack"'
-  'zh-TW  "Traditional Chinese (zh-TW) Language Pack"'
+  'vi     "Vietnamese Language Pack"'
+  'zh-CN  "Chinese (China) Language Pack"'
+  'zh-TW  "Chinese (Taiwan) Language Pack"'
 )
diff --git a/libre/icedove-l10n/languages.x86_64 b/libre/icedove-l10n/languages.x86_64
index fc8e50c8e..82ce50c7d 100644
--- a/libre/icedove-l10n/languages.x86_64
+++ b/libre/icedove-l10n/languages.x86_64
@@ -1,63 +1,63 @@
 _languages=(
-  'ar     "العربية Language Pack"'
-  'ast    "Asturianu Language Pack"'
-  'be     "Беларуская Language Pack"'
-  'bg     "Български Language Pack"'
+  'ar     "Arabic Language Pack"'
+  'ast    "Asturian Language Pack"'
+  'be     "Belarusian Language Pack"'
+  'bg     "Bulgarian Language Pack"'
   'br     "Breton Language Pack"'
-  'ca     "Català Language Pack"'
-  'cak    "Kaqchikel (Guatemala) Language Pack"'
-  'cs     "Czech (CZ) Language Pack"'
-  'cy     "Cymraeg Language Pack"'
-  'da     "Dansk (da) Language Pack"'
-  'de     "Deutsch (DE) Language Pack"'
-  'dsb    "Dolnoserbšćina Language Pack"'
-  'el     "Ελληνικά Language Pack"'
-  'en-GB  "English (GB) Language Pack"'
-  'en-US  "English (US) Language Pack"'
-  'es-AR  "Español (AR) Language Pack"'
-  'es-ES  "Español (España) Language Pack"'
+  'ca     "Catalan Language Pack"'
+  'cak    "Kaqchikel Language Pack"'
+  'cs     "Czech Language Pack"'
+  'cy     "Welsh Language Pack"'
+  'da     "Danish Language Pack"'
+  'de     "German Language Pack"'
+  'dsb    "Lower Sorbian Language Pack"'
+  'el     "Greek Language Pack"'
+  'en-GB  "English (United Kingdom) Language Pack"'
+  'en-US  "English (United States) Language Pack"'
+  'es-AR  "Spanish (Argentina) Language Pack"'
+  'es-ES  "Spanish (Spain) Language Pack"'
   'et     "Estonian Language Pack"'
   'eu     "Basque Language Pack"'
   'fi     "Finnish Language Pack"'
-  'fr     "Français Language Pack"'
-  'fy-NL  "Frysk (fy) Language Pack"'
-  'ga-IE  "Béarla (SAM) Language Pack"'
-  'gd     "Gàidhlig Language Pack"'
-  'gl     "Galego (España) Language Pack"'
-  'he     "Hebrew (IL) Language Pack"'
-  'hr     "Hrvatski (HR) Language Pack"'
-  'hsb    "Hornjoserbšćina Language Pack"'
-  'hu     "Magyar (HU) Language Pack"'
-  'hy-AM  "Armenian (AM) Language Pack"'
-  'id     "Bahasa Indonesia (ID) Language Pack"'
-  'is     "Icelandic (IS) Language Pack"'
-  'it     "Italiano (IT) Language Pack"'
+  'fr     "French Language Pack"'
+  'fy-NL  "Frisian (Netherlands) Language Pack"'
+  'ga-IE  "Irish (Ireland) Language Pack"'
+  'gd     "Scottish Gaelic Language Pack"'
+  'gl     "Galician Language Pack"'
+  'he     "Hebrew Language Pack"'
+  'hr     "Croatian Language Pack"'
+  'hsb    "Upper Sorbian Language Pack"'
+  'hu     "Hungarian Language Pack"'
+  'hy-AM  "Armenian (Armenia) Language Pack"'
+  'id     "Indonesian Language Pack"'
+  'is     "Icelandic Language Pack"'
+  'it     "Italian Language Pack"'
   'ja     "Japanese Language Pack"'
-  'ka     "Georgian (ქართული) Language Pack"'
-  'kab    "Taqbaylit Language Pack"'
-  'kk     "Kazakh (KZ) Language Pack"'
-  'ko     "Korean (KR) Language Pack"'
-  'lt     "Lietuvių Language Pack"'
-  'ms     "Bahasa Melayu (ms) Language Pack"'
-  'nb-NO  "Norsk bokmål (NO) Language Pack"'
-  'nl     "Nederlands (NL) Language Pack"'
-  'nn-NO  "Norsk nynorsk (NO) Language Pack"'
-  'pl     "Polski Language Pack"'
-  'pt-BR  "Português (pt-BR) Language Pack"'
-  'pt-PT  "Português (Europeu) Language Pack"'
-  'rm     "Rumantsch Language Pack"'
-  'ro     "Română (România) Language Pack"'
-  'ru     "Russian (RU) Language Pack"'
-  'si     "Sinhala (si-LK) Language Pack"'
-  'sk     "Slovak (SK) Language Pack"'
-  'sl     "Slovenski jezik Language Pack"'
-  'sq     "Shqip Language Pack"'
-  'sr     "српски (sr) Language Pack"'
-  'sv-SE  "Svenska (SE) Language Pack"'
-  'tr     "Türkçe (TR) Language Pack"'
-  'uk     "Ukrainian (UA) Language Pack"'
+  'ka     "Georgian Language Pack"'
+  'kab    "Kabyle Language Pack"'
+  'kk     "Kazakh Language Pack"'
+  'ko     "Korean Language Pack"'
+  'lt     "Lithuanian Language Pack"'
+  'ms     "Malay Language Pack"'
+  'nb-NO  "Norwegian Bokmål (Norway) Language Pack"'
+  'nl     "Dutch Language Pack"'
+  'nn-NO  "Norwegian Nynorsk (Norway) Language Pack"'
+  'pl     "Polish Language Pack"'
+  'pt-BR  "Portuguese (Brazil) Language Pack"'
+  'pt-PT  "Portuguese (Portugal) Language Pack"'
+  'rm     "Rhaeto-Romanic Language Pack"'
+  'ro     "Romanian Language Pack"'
+  'ru     "Russian Language Pack"'
+  'si     "Singhalese Language Pack"'
+  'sk     "Slovak Language Pack"'
+  'sl     "Slovenian Language Pack"'
+  'sq     "Albanian Language Pack"'
+  'sr     "Serbian Language Pack"'
+  'sv-SE  "Swedish (Sweden) Language Pack"'
+  'tr     "Turkish Language Pack"'
+  'uk     "Ukrainian Language Pack"'
   'uz     "Uzbek Language Pack"'
-  'vi     "Tiếng Việt Language Pack"'
-  'zh-CN  "Chinese Simplified (zh-CN) Language Pack"'
-  'zh-TW  "Traditional Chinese (zh-TW) Language Pack"'
+  'vi     "Vietnamese Language Pack"'
+  'zh-CN  "Chinese (China) Language Pack"'
+  'zh-TW  "Chinese (Taiwan) Language Pack"'
 )
diff --git a/libre/icedove-l10n/updatelanglist.sh b/libre/icedove-l10n/updatelanglist.sh
index 1d9ad9583..840cac697 100644
--- a/libre/icedove-l10n/updatelanglist.sh
+++ b/libre/icedove-l10n/updatelanglist.sh
@@ -17,13 +17,26 @@ echo "_sha512sums=(" > "sha512sums.$CARCH.pkgnew"
 
 mkdir -p src
 
+# prepare list of translated language names from en-US locale
+curl -s -o src/en-US.xpi "${url%/}/en-US.xpi"
+unzip -p src/en-US.xpi localization/en-US/toolkit/intl/{languageNames,regionNames}.ftl > src/langnames
+
+# prepare list of translations
 for lang in $(curl -sL "$url" | grep '\.xpi' | cut -d'"' -f2 | rev | cut -d'/' -f1 | cut -d'.' -f2 | rev | sort); do
   printf "\r  %-3s..." "${lang%%-*}"
   curl -s -o src/"$lang.xpi" "${url%/}/$lang.xpi"
   sha512sum="$(sha512sum "src/$lang.xpi" | cut -d' ' -f1)"
-  name="$(unzip -p "src/$lang.xpi" manifest.json | grep "  \"name" | cut -d':' -f2- | cut -d'"' -f2)"
 
-  printf "  '%-5s  \"%s\"'\n" "$lang" "$name" \
+  native_name="$(unzip -p "src/$lang.xpi" manifest.json | grep "  \"name" | cut -d':' -f2- | cut -d'"' -f2)"
+  english_name="$(grep "^language-name-${lang%-*} =" src/langnames | cut -d' ' -f3-)"
+  if [ "$lang" != "${lang#*-}" ]; then
+    english_name+=" ($(grep -i "^region-name-${lang#*-} =" src/langnames | cut -d' ' -f3-))"
+  fi
+  english_name+=" Language Pack"
+
+  #printf "  '%-5s  \"%s\"'\n" "$lang" "$native_name" \
+  #    >> "languages.$CARCH.pkgnew"
+  printf "  '%-5s  \"%s\"'\n" "$lang" "$english_name" \
       >> "languages.$CARCH.pkgnew"
   printf "  '%s'\n" "$sha512sum" \
       >> "sha512sums.$CARCH.pkgnew"