diff --git a/.gitignore b/.gitignore
index 2b519756..812522df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,8 +47,8 @@ cov-int
 cov-int.zip
 depcomp
 embedded.loc
-res/localization/.vs
-res/localization/bin
-res/localization/obj
+res/loc/pollock/.vs
+res/loc/pollock/bin
+res/loc/pollock/obj
 rufus_files
 stamp-h1
diff --git a/configure b/configure
index 284af7b2..ff2b26b6 100755
--- a/configure
+++ b/configure
@@ -583,7 +583,7 @@ PACKAGE_TARNAME='rufus'
 PACKAGE_VERSION='3.2'
 PACKAGE_STRING='rufus 3.2'
 PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
-PACKAGE_URL='https://rufus.akeo.ie'
+PACKAGE_URL='https://rufus.ie'
 
 ac_unique_file="src/rufus.c"
 ac_subst_vars='am__EXEEXT_FALSE
@@ -1322,7 +1322,7 @@ Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <https://github.com/pbatard/rufus/issues>.
-rufus home page: <https://rufus.akeo.ie>.
+rufus home page: <https://rufus.ie>.
 _ACEOF
 ac_status=$?
 fi
@@ -3913,7 +3913,7 @@ ac_config_files="$ac_config_files src/libcdio/udf/Makefile"
 
 ac_config_files="$ac_config_files src/libcdio/driver/Makefile"
 
-ac_config_files="$ac_config_files res/localization/Makefile"
+ac_config_files="$ac_config_files res/loc/Makefile"
 
 ac_config_files="$ac_config_files src/ms-sys/Makefile"
 
@@ -4529,7 +4529,7 @@ Configuration files:
 $config_files
 
 Report bugs to <https://github.com/pbatard/rufus/issues>.
-rufus home page: <https://rufus.akeo.ie>."
+rufus home page: <https://rufus.ie>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -4654,7 +4654,7 @@ do
     "src/libcdio/iso9660/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcdio/iso9660/Makefile" ;;
     "src/libcdio/udf/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcdio/udf/Makefile" ;;
     "src/libcdio/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcdio/driver/Makefile" ;;
-    "res/localization/Makefile") CONFIG_FILES="$CONFIG_FILES res/localization/Makefile" ;;
+    "res/loc/Makefile") CONFIG_FILES="$CONFIG_FILES res/loc/Makefile" ;;
     "src/ms-sys/Makefile") CONFIG_FILES="$CONFIG_FILES src/ms-sys/Makefile" ;;
     "src/syslinux/libfat/Makefile") CONFIG_FILES="$CONFIG_FILES src/syslinux/libfat/Makefile" ;;
     "src/syslinux/libinstaller/Makefile") CONFIG_FILES="$CONFIG_FILES src/syslinux/libinstaller/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 5cca5391..5333552f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([rufus], [3.2], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.akeo.ie])
+AC_INIT([rufus], [3.2], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie])
 AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
 AC_CONFIG_SRCDIR([src/rufus.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -75,7 +75,7 @@ AC_CONFIG_FILES([src/bled/Makefile])
 AC_CONFIG_FILES([src/libcdio/iso9660/Makefile])
 AC_CONFIG_FILES([src/libcdio/udf/Makefile])
 AC_CONFIG_FILES([src/libcdio/driver/Makefile])
-AC_CONFIG_FILES([res/localization/Makefile])
+AC_CONFIG_FILES([res/loc/Makefile])
 AC_CONFIG_FILES([src/ms-sys/Makefile])
 AC_CONFIG_FILES([src/syslinux/libfat/Makefile])
 AC_CONFIG_FILES([src/syslinux/libinstaller/Makefile])
diff --git a/res/localization/ChangeLog.txt b/res/loc/ChangeLog.txt
similarity index 100%
rename from res/localization/ChangeLog.txt
rename to res/loc/ChangeLog.txt
diff --git a/res/localization/Makefile.am b/res/loc/Makefile.am
similarity index 100%
rename from res/localization/Makefile.am
rename to res/loc/Makefile.am
diff --git a/res/localization/Makefile.in b/res/loc/Makefile.in
similarity index 98%
rename from res/localization/Makefile.in
rename to res/loc/Makefile.in
index a9bcaa74..677b56c5 100644
--- a/res/localization/Makefile.in
+++ b/res/loc/Makefile.in
@@ -77,7 +77,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 noinst_PROGRAMS =
-subdir = res/localization
+subdir = res/loc
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -216,9 +216,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps res/localization/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps res/loc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign --ignore-deps res/localization/Makefile
+	  $(AUTOMAKE) --foreign --ignore-deps res/loc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/res/localization/embedded.sed b/res/loc/embedded.sed
similarity index 100%
rename from res/localization/embedded.sed
rename to res/loc/embedded.sed
diff --git a/res/localization/Pollock.cs b/res/loc/pollock/Pollock.cs
similarity index 97%
rename from res/localization/Pollock.cs
rename to res/loc/pollock/Pollock.cs
index b9d6f441..55953e4b 100644
--- a/res/localization/Pollock.cs
+++ b/res/loc/pollock/Pollock.cs
@@ -261,7 +261,6 @@ namespace pollock
                         }
                         lang.sections[section_name].Add(new Message(parts[1], parts[2]));
                         // We also maintain global list of Id -> str for convenience
-                        // TODO: This lookup BREAKS on multiline!!
                         lang.id_to_str.Add(new Id(section_name, (parts[1])), parts[2]);
                         last_key = parts[1];
                         if (comment != null)
@@ -655,7 +654,23 @@ namespace pollock
                 bool skip = false;
                 foreach (var line in lines)
                 {
-                    if (line.StartsWith($"l \"{lang.id}\""))
+                    if (line.StartsWith($"# • v"))
+                    {
+                        var parts = line.Split('"');
+                        if (parts.Count() < 2)
+                        {
+                            writer.WriteLine(line);
+                            continue;
+                        }
+                        if (parts[1] != lang.id)
+                        {
+                            writer.WriteLine(line);
+                            continue;
+                        }
+                        writer.WriteLine($"# • v{lang.version,-4} \"{lang.id}\" \"{lang.name}\"");
+                        continue;
+                    }
+                    else if (line.StartsWith($"l \"{lang.id}\""))
                     {
                         skip = true;
                         WriteLoc(writer, lang);
@@ -702,7 +717,7 @@ namespace pollock
                 writer.WriteLine("# List of all languages included in this file (with version)");
                 foreach (var lang in list)
                 {
-                    writer.WriteLine($"# • v{lang.version} \"{lang.id}\" \"{lang.name}\"");
+                    writer.WriteLine($"# • v{lang.version, -4} \"{lang.id}\" \"{lang.name}\"");
                 }
                 foreach (var lang in list)
                 {
@@ -955,7 +970,7 @@ namespace pollock
             if (AppDomain.CurrentDomain.FriendlyName.Contains('m'))
                 goto Maintainer_Mode;
 
-            string loc_url = "https://github.com/pbatard/rufus/raw/master/res/localization/rufus.loc";
+            string loc_url = "https://github.com/pbatard/rufus/raw/master/res/loc/rufus.loc";
             string ver_url = "https://rufus.ie/Loc.ver";
             string rufus_url = null;
             string rufus_file = null;
@@ -1123,7 +1138,9 @@ Retry:
                         goto Exit;
                     }
                     var sha = str.Substring(str.IndexOf("/pbatard/rufus/commit/") + 22, 40);
-                    url = "https://github.com/pbatard/rufus/raw/" + sha + "/res/localization/rufus.loc";
+                    // TODO: Remove this once everyone has upgraded past 3.2
+                    string loc_dir = ((list[index][2][0] == '2') || ((list[index][2][0] == '3') && (list[index][2][2] == '0'))) ? "localization" : "loc";
+                    url = "https://github.com/pbatard/rufus/raw/" + sha + "/res/" + loc_dir + "/rufus.loc";
                     if (!DownloadFile(url, old_loc_file))
                     {
                         index = -1;
@@ -1219,7 +1236,7 @@ Maintainer_Mode:
             file_dialog.ShowDialog();
             file_name = file_dialog.FileName;
             Console.WriteLine(file_name);
-            // TODO: fetch the .loc one directory up if we reorganize our loc dir to have loc\po
+            // TODO: Fetch the .loc one directory up if we reorganize our loc dir to have loc\po
             UpdateLocFile(ParsePoFile(file_name));
             WaitForKey("Press any key to exit...");
         }
diff --git a/res/localization/Pollock.csproj b/res/loc/pollock/Pollock.csproj
similarity index 100%
rename from res/localization/Pollock.csproj
rename to res/loc/pollock/Pollock.csproj
diff --git a/res/localization/Pollock.sln b/res/loc/pollock/Pollock.sln
similarity index 100%
rename from res/localization/Pollock.sln
rename to res/loc/pollock/Pollock.sln
diff --git a/res/localization/rufus.loc b/res/loc/rufus.loc
similarity index 99%
rename from res/localization/rufus.loc
rename to res/loc/rufus.loc
index e5b774e3..e7e481bc 100644
--- a/res/localization/rufus.loc
+++ b/res/loc/rufus.loc
@@ -1,95 +1,49 @@
-# This file should be saved as UTF-8, no-BOM, in DOS mode (i.e. CR/LF as line terminators)
+#########################################################################
+### Autogenerated by pollock v1.0 for use with Rufus - DO NOT EDIT!!! ###
+#########################################################################
 
-######################## HOW TO ADD A NEW TRANSLATION ###########################
-# For a more comprehensive set of instructions, please see the *FULL* Localization guide at:
-# https://github.com/pbatard/rufus/wiki/Localization
-#
-# 0. Download the latest Rufus executable, start it and check the log for a line starting with 'LCID'
-#    (eg. LCID 0x1809).
-# 1. Save this file in the same directory where you have the Rufus executable.
-# 2. Copy the lines between ### TRANSLATOR START COPY ### and ### TRANSLATOR END COPY ### and paste them at
-#    the end of the file.
-# 3. Edit the 'l' line in the section you copied and:
-#    - replace the "en-US" IETF language tag for your language, eg: "fr-FR", "zh-CN".
-#      See http://en.wikipedia.org/wiki/IETF_language_tag as well as the table on page 9 of
-#      http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf
-#    - set the name of your language first in English and then, in parenthesis, in your own language.
-#      eg: "Chinese Simplified (简体中文)"
-#    - remove the end of the line starting with 0x0409 and replaced it with the LCID code you got in step 0.
-#      You also may want to look at the table on page 9 of the PDF above to add all the LCID codes your
-#      translation should cover. Make sure you separate these codes with a comma.
-# 4. Translate the messages that appear below into your language. The 'g' lines indicate the group a translated
-#    element belongs to. You shouldn't have to modify them.
-# 5. (Re)launch Rufus. If a 'rufus.loc' file is found in the current directory, it will be used over the one
-#    embedded in the application. Since there is only one translation in this file, it will be used by default
-# 6. Repeat steps 4 & 5 until you're happy with that translated elements. Note that you MUST restart Rufus every
-#    time you change your .loc file as there is no reload option.
-# 7. Once you are satisfied with your translation, you should pick up the official rufus.loc from:
-#    https://github.com/pbatard/rufus/raw/master/res/localization/rufus.loc
-#    You should then add your translation at the end of it, and confirm that it is still picked as the default
-#    for your system  You can also force the use of a translation by passing the option -l when starting Rufus.
-#    For instance, to have the "zh_CN" translation below apply, you could use either one of:
-#      rufus.exe -l zh-CN
-#      rufus.exe -l 0x0404
-#      rufus.exe -l 0x0804
-#
-# Tips:
-# - Please make sure that you edit the language include *your* name and e-mail in MSG_176. It will be displayed
-#   in the About dialog and I want to give you credit for your work!
-# - I strongly recommend installing and using DbgView to check for translation errors, as you will get more
-#   information about how Rufus initallly parses the translation file plus reports of any issue found (with
-#   the line number). Download DbgView from: http://technet.microsoft.com/en-us/sysinternals/bb896647.aspx
-# - As shown below, you can break a long message over multiple lines, as long as these fragments begin and end
-#   with a double quote ("). Also be careful to keep the special symbols such as %d, %s, \\b, \",  \n.
-# - Don't forget to check the translation guide from https://github.com/pbatard/rufus/wiki/Localization
+# List of all languages included in this file (with version)
+# • v3.2  "en-US" "English (English)"
+# • v3.0  "ar-SA" "Arabic (العربية)"
+# • v3.0  "az-AZ" "Azerbaijani (Azərbaycanca)"
+# • v2.16 "bg-BG" "Bulgarian (Български)"
+# • v3.0  "zh-CN" "Chinese Simplified (简体中文)"
+# • v3.0  "zh-TW" "Chinese Traditional (正體中文)"
+# • v3.0  "hr-HR" "Croatian (Hrvatski)"
+# • v3.0  "cs-CZ" "Czech (Čeština)"
+# • v3.0  "da-DK" "Danish (Dansk)"
+# • v3.0  "nl-NL" "Dutch (Nederlands)"
+# • v3.0  "fi-FI" "Finnish (Suomi)"
+# • v3.0  "fr-FR" "French (Français)"
+# • v3.0  "de-DE" "German (Deutsch)"
+# • v3.0  "el-GR" "Greek (Ελληνικά)"
+# • v3.0  "he-IL" "Hebrew (עברית)"
+# • v3.0  "hu-HU" "Hungarian (Magyar)"
+# • v3.0  "id-ID" "Indonesian (Bahasa Indonesia)"
+# • v3.0  "it-IT" "Italian (Italiano)"
+# • v3.0  "ja-JP" "Japanese (日本語)"
+# • v3.0  "ko-KR" "Korean (한국어)"
+# • v3.0  "lv-LV" "Latvian (Latviešu)"
+# • v3.0  "lt-LT" "Lithuanian (Lietuvių)"
+# • v2.5  "ms-MY" "Malay (Bahasa Malaysia)"
+# • v3.0  "nb-NO" "Norwegian (Norsk)"
+# • v3.0  "fa-IR" "Persian (فارسی)"
+# • v3.0  "pl-PL" "Polish (Polski)"
+# • v3.0  "pt-BR" "Portuguese Brazilian (Português do Brasil)"
+# • v3.0  "pt-PT" "Portuguese Standard (Português)"
+# • v3.0  "ro-RO" "Romanian (Română)"
+# • v3.0  "ru-RU" "Russian (Русский)"
+# • v2.16 "sr-SP" "Serbian (Latin)"
+# • v3.0  "sk-SK" "Slovak (Slovensky)"
+# • v3.0  "sl-SI" "Slovenian (Slovenščina)"
+# • v3.0  "es-ES" "Spanish (Español)"
+# • v3.0  "sv-SE" "Swedish (Svenska)"
+# • v3.0  "th-TH" "Thai (ไทย)" 
+# • v3.0  "tr-TR" "Turkish (Türkçe)"
+# • v3.0  "uk-UA" "Ukrainian (Українська)"
+# • v2.16 "vi-VN" "Vietnamese (Tiếng Việt)"
 
-# List of all languages included in this file (with base LCID)
-# l "en-US" "English (English)" 0x0409
-# l "ar-SA" "Arabic (العربية)" 0x0401
-# l "az-AZ" "Azerbaijani (Azərbaycanca)" 0x042c
-# l "bg-BG" "Bulgarian (Български)" 0x0402
-# l "zh-CN" "Chinese Simplified (简体中文)" 0x0804
-# l "zh-TW" "Chinese Traditional (正體中文)" 0x0404
-# l "hr-HR" "Croatian (Hrvatski)" 0x041a
-# l "cs-CZ" "Czech (Čeština)" 0x0405
-# l "da-DK" "Danish (Dansk)" 0x0406
-# l "nl-NL" "Dutch (Nederlands)" 0x0413
-# l "fi-FI" "Finnish (Suomi)" 0x040B
-# l "fr-FR" "French (Français)" 0x040c
-# l "de-DE" "German (Deutsch)" 0x0407
-# l "el-GR" "Greek (Ελληνικά)" 0x0408
-# l "he-IL" "Hebrew (עברית)" 0x040d
-# l "hu-HU" "Hungarian (Magyar)" 0x040e
-# l "id-ID" "Indonesian (Bahasa Indonesia)" 0x0421
-# l "it-IT" "Italian (Italiano)" 0x0410
-# l "ja-JP" "Japanese (日本語)" 0x0411
-# l "ko-KR" "Korean (한국어)" 0x0412
-# l "lv-LV" "Latvian (Latviešu)" 0x0426
-# l "lt-LT" "Lithuanian (Lietuvių)" 0x0427
-# l "ms-MY" "Malay (Bahasa Malaysia)" 0x043e
-# l "nb-NO" "Norwegian (Norsk)" 0x0414
-# l "fa-IR" "Persian (فارسی)" 0x0429
-# l "pl-PL" "Polish (Polski)" 0x0415
-# l "pt-BR" "Portuguese Brazilian (Português do Brasil)" 0x0416
-# l "pt-PT" "Portuguese Standard (Português)" 0x0816
-# l "ro-RO" "Romanian (Română)" 0x0418
-# l "ru-RU" "Russian (Русский)" 0x0419
-# l "sr-SP" "Serbian (Latin)" 0x241a
-# l "sk-SK" "Slovak (Slovensky)" 0x041B
-# l "sl-SI" "Slovenian (Slovenščina)" 0x0424
-# l "es-ES" "Spanish (Español)" 0x040a
-# l "sv-SE" "Swedish (Svenska)" 0x041d
-# l "th-TH" "Thai (ไทย)" 0x041e
-# l "tr-TR" "Turkish (Türkçe)" 0x041F
-# l "uk-UA" "Ukrainian (Українська)" 0x0422
-# l "vi-VN" "Vietnamese (Tiếng Việt)" 0x042a
-
-################################################################################
-############################ TRANSLATOR START COPY #############################
-################################################################################
-# See http://msdn.microsoft.com/en-us/goglobal/bb964664.aspx or
-# http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf
-# for the LCID (0x####) codes you should use
+#########################################################################
 l "en-US" "English (English)" 0x0409, 0x0809, 0x0c09, 0x1009, 0x1409, 0x1809, 0x1c09, 0x2009, 0x2409, 0x2809, 0x2c09, 0x3009, 0x3409, 0x3809, 0x3c09, 0x4009, 0x4409, 0x4809
 v 3.2
 
@@ -565,10 +519,7 @@ t MSG_305 "Use this option to indicate whether you want to use this device to in
 	"or if you want to run Windows directly from this drive (Windows To Go)."
 t MSG_306 "Fast-zeroing drive: %0.1f%% completed"
 
-################################################################################
-############################# TRANSLATOR END COPY ##############################
-################################################################################
-
+#########################################################################
 l "ar-SA" "Arabic (العربية)" 0x0401, 0x0801, 0x0c01, 0x1001, 0x1401, 0x1801, 0x1c01, 0x2001, 0x2401, 0x2801, 0x2c01, 0x3001, 0x3401, 0x3801, 0x3c01, 0x4001
 a "r"
 v 3.0
@@ -980,7 +931,7 @@ t MSG_304 "قم بإنشاء صورة قرص للجهاز المحدد"
 t MSG_305 "إستخدام هذا الخيار لبيان م إذا كنت تريد إستخدام هذا الجهاز لتنصيب Windows على قرص آخر, "
 	"أو اذا كنت تريد إقلاع Windows بشكل مباشر من هذا الجهاز (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "az-AZ" "Azerbaijani (Azərbaycanca)" 0x042c, 0x782c
 v 3.0
 b "en-US"
@@ -1782,7 +1733,7 @@ t MSG_298 "ISO файлът който сте избрали не  съвпад
 t MSG_117 "Стандартна Windows инсталация"
 t MSG_118 "Windows To Go (Windows за USB Flash устройство)"
 
-################################################################################
+#########################################################################
 l "zh-CN" "Chinese Simplified (简体中文)" 0x0804, 0x1004
 v 3.0
 b "en-US"
@@ -2177,7 +2128,7 @@ t MSG_303 "日志"
 t MSG_304 "创建所选设备的镜像"
 t MSG_305 "请选择您希望将 Windows 安装至其他驱动器，还是直接从此驱动器运行(即 Windows To Go)。"
 
-################################################################################
+#########################################################################
 l "zh-TW" "Chinese Traditional (正體中文)" 0x0404, 0x0c04, 0x1404, 0x7c04
 v 3.0
 b "en-US"
@@ -2555,7 +2506,7 @@ t MSG_304 "建立選擇的裝置的磁碟映像"
 t MSG_305 "是否要使用此裝置來安裝 Windows 在另一個磁碟上，"
 	"或是要直接在此磁碟上執行 Windows (Windows To Go)。"
 
-################################################################################
+#########################################################################
 l "hr-HR" "Croatian (Hrvatski)" 0x041a, 0x081a, 0x101a
 v 3.0
 b "en-US"
@@ -2963,7 +2914,7 @@ t MSG_304 "Stvori sliku diska iz odabranog uređaja"
 t MSG_305 "Ovom opcijom naznačite ako želite koristiti ovaj uređaj kako bi instalirali Windows na drugi disk, "
 	"ili ako želite podići Windows direktno s ovog uređaja (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "cs-CZ" "Czech (Čeština)" 0x0405
 v 3.0
 b "en-US"
@@ -3373,7 +3324,7 @@ t MSG_304 "Vytvořit obraz disku vybraného zařízení"
 t MSG_305 "Touto volbou označte, zda chcete toto zařízení používat k instalaci Windows na jiný disk, "
 	"nebo pokud chcete spustit systém Windows přímo z této jednotky (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "da-DK" "Danish (Dansk)" 0x0406
 v 3.0
 b "en-US"
@@ -3785,7 +3736,7 @@ t MSG_304 "Opret et diskbillede af den valgte enhed"
 t MSG_305 "Brug dette alternativ for at angive om du vil bruge denne enhed til at installere Windows på en anden disk, "
 	"eller hvis du vil køre Windows direkte fra dette drev (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "nl-NL" "Dutch (Nederlands)" 0x0413, 0x0813
 v 3.0
 b "en-US"
@@ -4188,7 +4139,7 @@ t MSG_304 "Maak een schijfkopie van het geselecteerde apparaat"
 t MSG_305 "Gebruik deze optie om aan te geven of u dit apparaat wilt gebruiken om Windows op een andere schijf te installeren, "
 	"of als u Windows rechtstreeks vanaf deze schijf wilt opstarten (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "fi-FI" "Finnish (Suomi)" 0x040B
 v 3.0
 b "en-US"
@@ -4597,7 +4548,7 @@ t MSG_304 "Luo levykuva valitusta laitteesta"
 t MSG_305 "Käytä tätä vaihtoehtoa valitaksesi haluatko käyttää valittua laitetta Windowsin asentamiseen toiselle levylle, "
 	"vai haluatko käyttää Windowsia suoraan tältä asemalta (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "fr-FR" "French (Français)" 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c
 v 3.0
 b "en-US"
@@ -5010,7 +4961,7 @@ t MSG_304 "Crée une image disque à partir du périphérique sélectionné"
 t MSG_305 "Utilisez cette option pour indiquer si vous voulez utiliser ce périphérique pour installer Windows sur un autre disque, "
 	"ou bien exécuter Windows directement depuis votre périphérique (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407
 v 3.0
 b "en-US"
@@ -5405,7 +5356,7 @@ t MSG_303 "Log anzeigen"
 t MSG_304 "Erstelle ein Abbild des gewählten Laufwerks"
 t MSG_305 "Wollen Sie Windows auf einem anderen Laufwerk installieren oder Windows direkt nutzen (Windows To Go)"
 
-################################################################################
+#########################################################################
 l "el-GR" "Greek (Ελληνικά)" 0x0408
 v 3.0
 b "en-US"
@@ -5820,7 +5771,7 @@ t MSG_304 "Δημιουργία ειδώλου δίσκου από την επι
 t MSG_305 "Επιλέξτε αυτό αν θέλετε να χρησιμοποιήσετε αυτή τη συσκευή για να εγκαταστήσετε τα Windows σε κάποιο δίσκο, "
 	"ή θέλετε να τα τρέχετε κατευθείαν από την συσκευή (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "he-IL" "Hebrew (עברית)" 0x040d
 a "r"
 v 3.0
@@ -6236,7 +6187,7 @@ t MSG_304 "יצירת קובץ תמונת דיסק של ההתקן הנבחר"
 t MSG_305 "ניתן להשתמש באפשרות זו כדי לציין האם ברצונך להשתמש בהתקן זה כדי להתקין את Windows על דיסק אחר, "
 	"או כדי להריץ את Windows ישירות מכונן זה (Windows To Go)."
 
-################################################################################
+#########################################################################v
 l "hu-HU" "Hungarian (Magyar)" 0x040e
 v 3.0
 b "en-US"
@@ -6647,7 +6598,7 @@ t MSG_304 "Lemezkép készítése a kiválasztott eszközről"
 t MSG_305 "Ezt a lehetőséget arra használd, hogy jelezd, ezt az eszközt szeretnéd-e használni Windows telepítésre, "
 	"vagy közvetlenül erről szeretnéd-e futtatni a Windowst."
 
-################################################################################
+#########################################################################
 l "id-ID" "Indonesian (Bahasa Indonesia)" 0x0421
 v 3.0
 b "en-US"
@@ -7060,7 +7011,7 @@ t MSG_304 "Buat disk image dari perangkat yang dipilih"
 t MSG_305 "Gunakan opsi ini jika Anda ingin menggunakan perangkat ini untuk menginstal Windows pada disk lain, "
 	"atau jika Anda ingin menjalankan Windows secara langsung dari drive ini (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "it-IT" "Italian (Italiano)" 0x0410, 0x0810
 v 3.0
 b "en-US"
@@ -7900,7 +7851,7 @@ t MSG_304 "選択したデバイスのディスク イメージを作成しま
 t MSG_305 "このデバイスを使用して別のディスクにWindowsをインストールしたい場合、"
 	"またはこのドライブからWindowsを直接実行 (Windows To Go) したい場合にこのオプションを使用します。"
 
-################################################################################
+#########################################################################
 l "ko-KR" "Korean (한국어)" 0x0412
 v 3.0
 b "en-US"
@@ -8311,7 +8262,7 @@ t MSG_304 "선택한 장치의 디스크 이미지 만들기 "
 t MSG_305 "이 장치를 사용하여 다른 디스크에 Windows를 설치하거나, 이 드라이브(Windows To Go)에서 "
 	"Windows를 직접 실행하려면 이 옵션을 사용하십시오."
 
-################################################################################
+#########################################################################
 l "lv-LV" "Latvian (Latviešu)" 0x0426
 v 3.0
 b "en-US"
@@ -8719,7 +8670,7 @@ t MSG_304 "Veidot virtuālo attēlu no izvēlētās iekārtas"
 t MSG_305 "Izmantojiet šo opciju, lai norādīt vai vēlaties izmantot ierīci Windows instalēšanai uz cita diska, "
 	"vai vēlaties startēt Windows no šīs ierīces (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "lt-LT" "Lithuanian (Lietuvių)" 0x0427
 v 3.0
 b "en-US"
@@ -9135,7 +9086,7 @@ t MSG_304 "Kurti pasirinkto įrenginio disko atvaizdą"
 t MSG_305 "Šią parinktį naudokite norėdami nurodyti ar naudosite šį įrenginį įdiegti Windows į kitą diską, "
 	"ar norėsite vykdyti Windows tiesiogiai iš šio disko (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "ms-MY" "Malay (Bahasa Malaysia)" 0x043e, 0x083e
 v 2.5
 b "en-US"
@@ -9513,7 +9464,7 @@ t MSG_285 "'Executable' yang dimuat turun ditandatangani oleh '%s'.\nIni bukanny
 	"menunjukkan beberapa bentuk aktiviti berniat jahat...\nAdakah anda pasti anda mahu menjalankan fail ini?"
 t MSG_286 "Mensifarkan pemacu: %0.1f%% selesai"
 
-################################################################################
+#########################################################################
 l "nb-NO" "Norwegian (Norsk)" 0x0414
 v 3.0
 b "en-US"
@@ -9926,7 +9877,7 @@ t MSG_304 "Opprett et diskbilde av den valgte enheten"
 t MSG_305 "Bruk dette alternativet for å angi om du vil bruke denne enheten til å installere Windows på en annen disk, "
 	"eller hvis du vil kjøre Windows direkte fra denne stasjonen (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "fa-IR" "Persian (فارسی)" 0x0429
 a "r"
 v 3.0
@@ -10356,7 +10307,7 @@ t MSG_304 "ساخت ایمیج از دستگاه انتخاب‌شده"
 t MSG_305 "با استفاده از این گزینه مشخص کنید که آیا می‌خواهید از این درایو برای نصب ویندوز استفاده کنید یا اینکه "
 	"می‌خواهید مستقیما ویندوز را از روی آن اجرا کنید (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "pl-PL" "Polish (Polski)" 0x0415
 v 3.0
 b "en-US"
@@ -10770,7 +10721,7 @@ t MSG_304 "Utórz obraz dysku wybranego urządzenia"
 t MSG_305 "Użyj tej opcji aby wskazać, czy chcesz użyć tego dysku do instalacji Windowsa na innym dysku, "
 	"czy chcesz uruchomić Windowsa bezpośrednio z tego dysku (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "pt-BR" "Portuguese Brazilian (Português do Brasil)" 0x0416
 v 3.0
 b "en-US"
@@ -11192,7 +11143,7 @@ t MSG_304 "Criar uma imagem do dispositivo selecionado"
 t MSG_305 "Use esta opção caso queira instalar o Windows neste dispositivo ou em outro, "
 	"ou se deseja rodar o Windows direto deste dispositivo (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "pt-PT" "Portuguese Standard (Português)" 0x0816
 v 3.0
 b "en-US"
@@ -11609,7 +11560,7 @@ t MSG_304 "Criar imagem do disco do dispositivo selecionado"
 t MSG_305 "Usar esta opção se pretende utilizar este dispositivo para instalar o Windows noutro disco, "
 	"ou se pretende executar o Windows diretamente desta unidade (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "ro-RO" "Romanian (Română)" 0x0418, 0x0818
 v 3.0
 b "en-US"
@@ -12019,7 +11970,7 @@ t MSG_304 "Creare imagine disc a dispozitivului selectat"
 t MSG_305 "Utilizaţi această opţiune dacă doriţi să utilizaţi acest dispozitiv pentru a instala Windows pe un alt disc, "
 	"sau dacă doriţi să executaţi Windows direct de pe această unitate (Windows to Go). "
 
-################################################################################
+#########################################################################
 l "ru-RU" "Russian (Русский)" 0x0419, 0x0819
 v 3.0
 b "en-US"
@@ -12424,7 +12375,7 @@ t MSG_304 "Создание образа диска выбранного уст
 t MSG_305 "Используйте этот параметр, чтобы указать, хотите ли вы использовать это устройство для установки Windows "
 	"на другой диск, или если вы хотите запускать Windows непосредственно с этого диска (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "sr-SP" "Serbian (Srpski)" 0x241a, 0x081a, 0x181a, 0x2c1a, 0x701a, 0x7c1a
 v 2.16
 b "en-US"
@@ -12814,7 +12765,7 @@ t MSG_298 "ISO datoteka koju ste odabrali ne podudara se sa njenom zvaničnom ve
 	"MD5 ili SHA kontrolne sume.\n\nNapomena, možete izračunati kontrolnu sumu pomoću Rufus-a klikom na (✓) dugme."
 t MSG_117 "Standardna instalacija Windows-a"
 
-################################################################################
+#########################################################################
 l "sk-SK" "Slovak (Slovensky)" 0x041B
 v 3.0
 b "en-US"
@@ -13227,7 +13178,7 @@ t MSG_304 "Vytvoriť obraz disku na vybrané zariadenie"
 t MSG_305 "Použite túto možnosť, ak chcete použiť toto zariadenie na inštaláciu systému Windows na iný disk, "
 	"alebo ak chcete spustiť systém Windows priamo z tohto zariadenia (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "sl-SI" "Slovenian (Slovenščina)" 0x0424
 v 3.0
 b "en-US"
@@ -13638,7 +13589,7 @@ t MSG_304 "Ustvari sliko izbrane naprave."
 t MSG_305 "Tu izberete, ali želite uporabiti to napravo, da bi namestili operacijski sistem Windows na drug disk, "
 	"ali da bi ga neposredno izvajali s tega pogona (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "es-ES" "Spanish (Español)" 0x040a, 0x080a, 0x0c0a, 0x100a, 0x140a, 0x180a, 0x1c0a, 0x200a, 0x240a, 0x280a, 0x2c0a, 0x300a, 0x340a, 0x380a, 0x3c0a, 0x400a, 0x440a, 0x480a, 0x4c0a, 0x500a, 0x540a, 0x580a
 v 3.0
 b "en-US"
@@ -14054,7 +14005,7 @@ t MSG_304 "Crear una imagen de disco del dispositivo seleccionado"
 t MSG_305 "Use esta opción para indicar si desea usar este dispositivo para instalar Windows en otro disco, "
 	"o si quiere ejecutar Windows directamente desde esta unidad (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "sv-SE" "Swedish (Svenska)" 0x041d, 0x081d
 v 3.0
 b "en-US"
@@ -14463,7 +14414,7 @@ t MSG_304 "Skapa en skivavbildning av den valda enheten"
 t MSG_305 "Använd det här alternativet om du vill använda den här enheten för att installera Windows på en annan disk, "
 	"eller om du vill köra Windows direkt från den här enheten (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "th-TH" "Thai (ไทย)" 0x041e
 v 3.0
 b "en-US"
@@ -14874,7 +14825,7 @@ t MSG_304 "สร้างดิสก์อิมเมจของอุปก
 t MSG_305 "เลือกตัวเลือกนี้หากต้องการเลือกว่าท่านจะใช้อุปกรณ์นี้ในการลง Windows บนเครื่องอื่น"
 	"หรือต้องการจะเรียกใช้ Windows จากอุปกรณ์นี้โดยตรง (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "tr-TR" "Turkish (Türkçe)" 0x041F
 v 3.0
 b "en-US"
@@ -15290,7 +15241,7 @@ t MSG_304 "Seçilen cihazın disk yansımasını oluşturur"
 t MSG_305 "Windows'u başka bir diske yüklemek için bu cihazı kullanmak isteyip istemediğinizi belirtmek için, "
 	"ya da Windows'u doğrudan bu sürücüden çalıştırmak istiyorsanız (Windows To Go) bu seçeneği kullanın."
 
-################################################################################
+#########################################################################
 l "uk-UA" "Ukrainian (Українська)" 0x0422
 v 3.0
 b "en-US"
@@ -15700,7 +15651,7 @@ t MSG_304 "Створити образ диска для вибраного пр
 t MSG_305 "Використовуйте цей параметр, щоб вказати, чи хочете ви використовувати цей пристрій для встановлення Windows на інший диск, "
 	"чи хочете запускати Windows напряму з пристрою (Windows To Go)."
 
-################################################################################
+#########################################################################
 l "vi-VN" "Vietnamese (Tiếng Việt)" 0x042A
 v 2.16
 b "en-US"
diff --git a/res/localization/arch_trunc.iso b/res/loc/test/arch_trunc.iso
similarity index 100%
rename from res/localization/arch_trunc.iso
rename to res/loc/test/arch_trunc.iso
diff --git a/res/localization/casper_test.iso b/res/loc/test/casper_test.iso
similarity index 100%
rename from res/localization/casper_test.iso
rename to res/loc/test/casper_test.iso
diff --git a/res/localization/menu_c32_test.iso b/res/loc/test/menu_c32_test.iso
similarity index 100%
rename from res/localization/menu_c32_test.iso
rename to res/loc/test/menu_c32_test.iso
diff --git a/res/localization/Windows To Go.iso b/res/loc/test/windows_to_go.iso
similarity index 100%
rename from res/localization/Windows To Go.iso
rename to res/loc/test/windows_to_go.iso
diff --git a/res/localization/translation_check.py b/res/loc/translation_check.py
similarity index 100%
rename from res/localization/translation_check.py
rename to res/loc/translation_check.py
diff --git a/res/localization/include.7z b/res/localization/include.7z
deleted file mode 100644
index d6d68591..00000000
Binary files a/res/localization/include.7z and /dev/null differ
diff --git a/src/Makefile.am b/src/Makefile.am
index dc259ab6..030743a5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = bled ms-sys syslinux/libfat syslinux/libinstaller syslinux/win libcdio/iso9660 libcdio/udf libcdio/driver ../res/localization
+SUBDIRS = bled ms-sys syslinux/libfat syslinux/libinstaller syslinux/win libcdio/iso9660 libcdio/udf libcdio/driver ../res/loc
 
 noinst_PROGRAMS = rufus
 
@@ -7,7 +7,7 @@ AM_V_WINDRES_1 = $(WINDRES)
 AM_V_WINDRES_  = $(AM_V_WINDRES_$(AM_DEFAULT_VERBOSITY))
 AM_V_WINDRES   = $(AM_V_WINDRES_$(V))
 
-%_rc.o: %.rc ../res/localization/embedded.loc
+%_rc.o: %.rc ../res/loc/embedded.loc
 	$(AM_V_WINDRES) $(AM_RCFLAGS) -i $< -o $@
 
 rufus_SOURCES = badblocks.c checksum.c dev.c dos.c dos_locale.c drive.c format.c icon.c iso.c localization.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index e5feeb0e..0174fec6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -266,7 +266,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = bled ms-sys syslinux/libfat syslinux/libinstaller syslinux/win libcdio/iso9660 libcdio/udf libcdio/driver ../res/localization
+SUBDIRS = bled ms-sys syslinux/libfat syslinux/libinstaller syslinux/win libcdio/iso9660 libcdio/udf libcdio/driver ../res/loc
 AM_V_WINDRES_0 = @echo "  RC     $@";$(WINDRES)
 AM_V_WINDRES_1 = $(WINDRES)
 AM_V_WINDRES_ = $(AM_V_WINDRES_$(AM_DEFAULT_VERBOSITY))
@@ -682,7 +682,7 @@ uninstall-am:
 	uninstall-am
 
 
-%_rc.o: %.rc ../res/localization/embedded.loc
+%_rc.o: %.rc ../res/loc/embedded.loc
 	$(AM_V_WINDRES) $(AM_RCFLAGS) -i $< -o $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/src/parser.c b/src/parser.c
index fba0b682..cb2d5657 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -341,7 +341,7 @@ BOOL get_supported_locales(const char* filename)
 					last_lcmd->ctrl_id |= LOC_NEEDS_UPDATE;
 					luprintf("the version of this translation is older than the base one and may result in some messages not being properly translated.\n"
 						"If you are the translator, please update your translation with the changes that intervened between v%d.%d and v%d.%d.\n"
-						"See https://github.com/pbatard/rufus/blob/master/res/localization/ChangeLog.txt",
+						"See https://github.com/pbatard/rufus/blob/master/res/loc/ChangeLog.txt",
 						lcmd->unum[0], lcmd->unum[1], loc_base_major, loc_base_minor);
 				}
 				version_line_nr = loc_line_nr;
diff --git a/src/rufus.rc b/src/rufus.rc
index c3d91dc5..c5055cf9 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.2.1340"
+CAPTION "Rufus 3.2.1341"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -263,9 +263,9 @@ END
 BEGIN
     "\r\n"
     "#ifdef RUFUS_LOC\r\n"
-    "IDR_LC_RUFUS_LOC        RCDATA                  ""../res/localization/rufus.loc""\r\n"
+    "IDR_LC_RUFUS_LOC        RCDATA                  ""../res/loc/rufus.loc""\r\n"
     "#else\r\n"
-    "IDR_LC_RUFUS_LOC        RCDATA                  ""../res/localization/embedded.loc""\r\n"
+    "IDR_LC_RUFUS_LOC        RCDATA                  ""../res/loc/embedded.loc""\r\n"
     "#endif\r\n"
     "IDR_SL_LDLINUX_V4_BSS   RCDATA                  ""../res/syslinux/ldlinux_v4.bss""\r\n"
     "IDR_SL_LDLINUX_V4_SYS   RCDATA                  ""../res/syslinux/ldlinux_v4.sys""\r\n"
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,1340,0
- PRODUCTVERSION 3,2,1340,0
+ FILEVERSION 3,2,1341,0
+ PRODUCTVERSION 3,2,1341,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.2.1340"
+            VALUE "FileVersion", "3.2.1341"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.2.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.2.1340"
+            VALUE "ProductVersion", "3.2.1341"
         END
     END
     BLOCK "VarFileInfo"
@@ -448,9 +448,9 @@ IDI_ICON                ICON                    "../res/rufus.ico"
 //
 
 #ifdef RUFUS_LOC
-IDR_LC_RUFUS_LOC        RCDATA                  "../res/localization/rufus.loc"
+IDR_LC_RUFUS_LOC        RCDATA                  "../res/loc/rufus.loc"
 #else
-IDR_LC_RUFUS_LOC        RCDATA                  "../res/localization/embedded.loc"
+IDR_LC_RUFUS_LOC        RCDATA                  "../res/loc/embedded.loc"
 #endif
 IDR_SL_LDLINUX_V4_BSS   RCDATA                  "../res/syslinux/ldlinux_v4.bss"
 IDR_SL_LDLINUX_V4_SYS   RCDATA                  "../res/syslinux/ldlinux_v4.sys"