diff --git a/Gruntfile.js b/Gruntfile.js
index b6859f4b09..0945139f15 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,9 +1,8 @@
 module.exports = function(grunt) {
 
   var _ = grunt.util._;
-  var locales = ["bg_BG", "ca_ES", "cs_CZ", "de_DE", "es_AR", "es_CO", "es_EC",
-  "es_ES", "es_MX", "fr_FR", "hu_HU", "it_IT", "lo_LA", "lt_LT", "nl_NL",
-  "pt_BR", "ru_RU", "sl_SI", "zh_CN"];
+  var locales = ["bg", "ca", "cs", "de", "es", "es_AR", "es_CO", "es_EC",
+  "es_MX", "fr", "hu", "it", "lo", "lt", "nl", "pt_BR", "ru", "sl", "zh_CN"];
   var jsfiles = [
       'src/sao.js',
       'src/rpc.js',
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 100%
rename from locale/bg_BG.po
rename to locale/bg.po
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 99%
rename from locale/ca_ES.po
rename to locale/ca.po
index 23cc786c82..7d6b227794 100644
--- a/locale/ca_ES.po
+++ b/locale/ca.po
@@ -66,13 +66,13 @@ msgid "Reload"
 msgstr "Recarrega"
 
 msgid "Previous"
-msgstr "Registre anterior"
+msgstr "Anterior"
 
 msgid "Previous Record"
-msgstr "Registre següent"
+msgstr "Registre anterior"
 
 msgid "Next"
-msgstr "Següent"
+msgstr "Registre següent"
 
 msgid "Next Record"
 msgstr "Següent registre"
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 100%
rename from locale/cs_CZ.po
rename to locale/cs.po
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 99%
rename from locale/de_DE.po
rename to locale/de.po
index bfe961ff5b..d95c74a3a9 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -17,7 +17,7 @@ msgid "Unable to reach the server."
 msgstr "Kann nicht zum Server verbinden."
 
 msgid "Login"
-msgstr "Anmelden"
+msgstr "Anmeldename"
 
 msgid "Password"
 msgstr "Passwort"
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 100%
rename from locale/es_ES.po
rename to locale/es.po
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 100%
rename from locale/fr_FR.po
rename to locale/fr.po
diff --git a/locale/lo_LA.po b/locale/lo.po
similarity index 100%
rename from locale/lo_LA.po
rename to locale/lo.po
diff --git a/locale/lt_LT.po b/locale/lt.po
similarity index 100%
rename from locale/lt_LT.po
rename to locale/lt.po
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 100%
rename from locale/nl_NL.po
rename to locale/nl.po
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 100%
rename from locale/ru_RU.po
rename to locale/ru.po
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 100%
rename from locale/sl_SI.po
rename to locale/sl.po