diff --git a/Rakefile b/Rakefile
index c1c149c..cd925a2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,7 @@ require "pathname"
 BUILD_DIR = Pathname("build")
 LOCALE_DIR = Pathname("trans")
 TRANS_DIR = Pathname("translate")
-PSEUDO_LANG = "ach"
+PSEUDO_LANG = "ach-UG"
 
 CROWDIN_SNIPPET = <<EOS
 
diff --git a/crowdin.yml b/crowdin.yml
index ce4ddc5..4d93e2f 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -27,7 +27,7 @@ files: [
   # Where translations will be placed
   # e.g. "/resources/%two_letters_code%/%original_file_name%"
   #
-  "translation" : "/trans/%two_letters_code%/%original_path%/%original_file_name%",
+  "translation" : "/trans/%locale%/%original_path%/%original_file_name%",
 
   #
   # Files or directories for ignore
diff --git a/data/languages.yaml b/data/languages.yaml
index e4eab9f..ee447c3 100644
--- a/data/languages.yaml
+++ b/data/languages.yaml
@@ -1,34 +1,35 @@
 ---
-af: Afrikaans
-ar: العربية
-ca: Català
-cs: Česky
-da: Dansk
-de: Deutsch
-el: Ελληνικά
-en: English
-eo: Esperanto
-es: Español
-fa: فارسی
-fi: Suomi
-fr: Français
-gl: Galego
-he: עברית
-hu: Magyar
-it: Italiano
-ja: 日本語
-ko: 한국어
-nl: Nederlands
-'no': Norsk (bokmål)
-pl: Polski
-pt: Português
-ro: Română
-ru: Русский
-sat: ᱥᱟᱱᱛᱟᱲᱤ
-si: සිංහල
-sr: Српски
-sv: Svenska
-tr: Türkçe
-uk: Українська
-vi: Việtnam
-zh: 中文
+af-ZA: Afrikaans
+ar-SA: العربية
+ca-ES: Català
+cs-CZ: Česky
+da-DK: Dansk
+de-DE: Deutsch
+el-GR: Ελληνικά
+en-US: English
+eo-UY: Esperanto
+es-ES: Español
+fa-IR: فارسی
+fi-FI: Suomi
+fr-FR: Français
+gl-ES: Galego
+he-IL: עברית
+hu-HU: Magyar
+it-IT: Italiano
+ja-JP: 日本語
+ko-KR: 한국어
+nl-NL: Nederlands
+no-NO: Norsk (bokmål)
+pl-PL: Polski
+pt-PT: Português
+ro-RO: Română
+ru-RU: Русский
+sat-IN: ᱥᱟᱱᱛᱟᱲᱤ
+si-LK: සිංහල
+sr-SP: Српски
+sv-SE: Svenska
+tr-TR: Türkçe
+uk-UA: Українська
+vi-VN: Việtnam
+zh-CN: 简体中文
+zh-TW: 繁體中文