diff --git a/localization/rssguard-cs.ts b/localization/rssguard-cs.ts
index 861b569fb..145a64d39 100644
--- a/localization/rssguard-cs.ts
+++ b/localization/rssguard-cs.ts
@@ -3041,7 +3041,7 @@ You must install it manually.</source>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>cs_CZ</translation>
+        <translation>cs</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-da.ts b/localization/rssguard-da.ts
index cafc343a7..af7bbfabb 100644
--- a/localization/rssguard-da.ts
+++ b/localization/rssguard-da.ts
@@ -3022,7 +3022,7 @@ You must install it manually.</source>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>da_DK</translation>
+        <translation>da</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-de.ts b/localization/rssguard-de.ts
index 323e97ed2..1f4fb073b 100644
--- a/localization/rssguard-de.ts
+++ b/localization/rssguard-de.ts
@@ -3039,7 +3039,7 @@ You must install it manually.</source>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>de_DE</translation>
+        <translation>de</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-en.ts b/localization/rssguard-en.ts
index ea5e5e02e..a356f1352 100644
--- a/localization/rssguard-en.ts
+++ b/localization/rssguard-en.ts
@@ -3044,7 +3044,7 @@ You must install it manually.</translation>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>en_US</translation>
+        <translation>en</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-fr.ts b/localization/rssguard-fr.ts
index 9bbed3a61..a6abd5f48 100644
--- a/localization/rssguard-fr.ts
+++ b/localization/rssguard-fr.ts
@@ -3035,7 +3035,7 @@ You must install it manually.</source>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>fr_FR</translation>
+        <translation>fr</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-he.ts b/localization/rssguard-he.ts
index ca628aa3c..fd71d1f6d 100644
--- a/localization/rssguard-he.ts
+++ b/localization/rssguard-he.ts
@@ -3020,7 +3020,7 @@ You must install it manually.</source>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>he_IL</translation>
+        <translation>he</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-id.ts b/localization/rssguard-id.ts
index 0b11664d8..7bfacdf8a 100644
--- a/localization/rssguard-id.ts
+++ b/localization/rssguard-id.ts
@@ -3044,7 +3044,7 @@ Anda harus instal secara manual.</translation>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>id_ID</translation>
+        <translation>id</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-it.ts b/localization/rssguard-it.ts
index c8a3693b7..6a07ea1d1 100644
--- a/localization/rssguard-it.ts
+++ b/localization/rssguard-it.ts
@@ -3024,7 +3024,7 @@ You must install it manually.</source>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>it_IT</translation>
+        <translation>it</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
@@ -3038,7 +3038,7 @@ You must install it manually.</source>
     </message>
     <message>
         <source>LANG_EMAIL</source>
-        <translation>rotter.martinos@gmail.com</translation>
+        <translation></translation>
     </message>
     <message>
         <source>LANG_NAME</source>
diff --git a/localization/rssguard-ja.ts b/localization/rssguard-ja.ts
index 27a8b84d2..40aae8627 100644
--- a/localization/rssguard-ja.ts
+++ b/localization/rssguard-ja.ts
@@ -3022,7 +3022,7 @@ You must install it manually.</source>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>ja_JP</translation>
+        <translation>ja</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
@@ -3032,11 +3032,11 @@ You must install it manually.</source>
     <message>
         <source>LANG_AUTHOR</source>
         <extracomment>Name of translator - optional.</extracomment>
-        <translation>Martin Rotter</translation>
+        <translation></translation>
     </message>
     <message>
         <source>LANG_EMAIL</source>
-        <translation>rotter.martinos@gmail.com</translation>
+        <translation></translation>
     </message>
     <message>
         <source>LANG_NAME</source>
diff --git a/localization/rssguard-lt.ts b/localization/rssguard-lt.ts
index c9768d51b..573dcac5a 100644
--- a/localization/rssguard-lt.ts
+++ b/localization/rssguard-lt.ts
@@ -3036,7 +3036,7 @@ Jūs privalote jį įdiegti rankiniu būdu.</translation>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>lt_LT</translation>
+        <translation>lt</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-nl.ts b/localization/rssguard-nl.ts
index 873884dbe..19d39c4fd 100644
--- a/localization/rssguard-nl.ts
+++ b/localization/rssguard-nl.ts
@@ -3043,7 +3043,7 @@ You must install it manually.</source>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>nl_NL</translation>
+        <translation>nl</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-pt.ts b/localization/rssguard-pt.ts
index f7109acc7..518e0d16c 100644
--- a/localization/rssguard-pt.ts
+++ b/localization/rssguard-pt.ts
@@ -3045,7 +3045,7 @@ Você precisa instalá-lo manualmente.</translation>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>pt_BR</translation>
+        <translation>pt</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/localization/rssguard-sv.ts b/localization/rssguard-sv.ts
index c69331f2b..c9d4d4b4c 100644
--- a/localization/rssguard-sv.ts
+++ b/localization/rssguard-sv.ts
@@ -3045,7 +3045,7 @@ Du måste installera det manuellt.</translation>
     <message>
         <source>LANG_ABBREV</source>
         <extracomment>Abbreviation of language, e.g. en. Use ISO 639-1 code here combined with ISO 3166-1 (alpha-2) code. Examples: &quot;cs_CZ&quot;, &quot;en_GB&quot;, &quot;en_US&quot;.</extracomment>
-        <translation>sv_SE</translation>
+        <translation>sv</translation>
     </message>
     <message>
         <source>LANG_VERSION</source>
diff --git a/resources/graphics/misc/flags/cs_CZ.png b/resources/graphics/misc/flags/cs.png
similarity index 100%
rename from resources/graphics/misc/flags/cs_CZ.png
rename to resources/graphics/misc/flags/cs.png
diff --git a/resources/graphics/misc/flags/da_DK.png b/resources/graphics/misc/flags/da.png
similarity index 100%
rename from resources/graphics/misc/flags/da_DK.png
rename to resources/graphics/misc/flags/da.png
diff --git a/resources/graphics/misc/flags/de_DE.png b/resources/graphics/misc/flags/de.png
similarity index 100%
rename from resources/graphics/misc/flags/de_DE.png
rename to resources/graphics/misc/flags/de.png
diff --git a/resources/graphics/misc/flags/en_US.png b/resources/graphics/misc/flags/en.png
similarity index 100%
rename from resources/graphics/misc/flags/en_US.png
rename to resources/graphics/misc/flags/en.png
diff --git a/resources/graphics/misc/flags/fr_FR.png b/resources/graphics/misc/flags/fr.png
similarity index 100%
rename from resources/graphics/misc/flags/fr_FR.png
rename to resources/graphics/misc/flags/fr.png
diff --git a/resources/graphics/misc/flags/he_IL.png b/resources/graphics/misc/flags/he.png
similarity index 100%
rename from resources/graphics/misc/flags/he_IL.png
rename to resources/graphics/misc/flags/he.png
diff --git a/resources/graphics/misc/flags/id_ID.png b/resources/graphics/misc/flags/id.png
similarity index 100%
rename from resources/graphics/misc/flags/id_ID.png
rename to resources/graphics/misc/flags/id.png
diff --git a/resources/graphics/misc/flags/it_IT.png b/resources/graphics/misc/flags/it.png
similarity index 100%
rename from resources/graphics/misc/flags/it_IT.png
rename to resources/graphics/misc/flags/it.png
diff --git a/resources/graphics/misc/flags/ja_JP.png b/resources/graphics/misc/flags/ja.png
similarity index 100%
rename from resources/graphics/misc/flags/ja_JP.png
rename to resources/graphics/misc/flags/ja.png
diff --git a/resources/graphics/misc/flags/lt_LT.png b/resources/graphics/misc/flags/lt.png
similarity index 100%
rename from resources/graphics/misc/flags/lt_LT.png
rename to resources/graphics/misc/flags/lt.png
diff --git a/resources/graphics/misc/flags/nl_NL.png b/resources/graphics/misc/flags/nl.png
similarity index 100%
rename from resources/graphics/misc/flags/nl_NL.png
rename to resources/graphics/misc/flags/nl.png
diff --git a/resources/graphics/misc/flags/pt_BR.png b/resources/graphics/misc/flags/pt.png
similarity index 100%
rename from resources/graphics/misc/flags/pt_BR.png
rename to resources/graphics/misc/flags/pt.png
diff --git a/resources/graphics/misc/flags/sv_SE.png b/resources/graphics/misc/flags/sv.png
similarity index 100%
rename from resources/graphics/misc/flags/sv_SE.png
rename to resources/graphics/misc/flags/sv.png