diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
similarity index 100%
rename from app/src/main/res/values-de/strings.xml
rename to app/src/main/res/values-de-rDE/strings.xml
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 00000000..70489fbc
--- /dev/null
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
similarity index 100%
rename from app/src/main/res/values-fr/strings.xml
rename to app/src/main/res/values-fr-rFR/strings.xml
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
similarity index 98%
rename from app/src/main/res/values-nl/strings.xml
rename to app/src/main/res/values-nl-rNL/strings.xml
index 10af584e..42639a4c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
     <string name="app_name">Aegis</string>
     <string name="app_name_dev">AegisDev</string>
@@ -6,14 +8,14 @@
     <string name="action_delete">Verwijderen</string>
     <string name="action_default_icon">Standaard pictogram herstellen</string>
     <string name="discard">Ongedaan maken</string>
-    <string name="save">Opslaan</string>
+    <string name="save">Opslaan</string>v
     <string name="issuer">Uitgever</string>
 
     <string name="settings">Voorkeuren</string>
     <string name="pref_appearance_group_title">Uiterlijk</string>
     <string name="pref_security_group_title">Beveiliging</string>
     <string name="pref_tools_group_title">Hulpmiddelen</string>
-    <string name="pref_select_theme_title">Thema</string>    
+    <string name="pref_select_theme_title">Thema</string>
     <string name="pref_view_mode_title">Weergavemodus</string>
     <string name="pref_account_name_title">Toon de accountnaam</string>
     <string name="pref_account_name_summary">Schakel in om de accountnaam naast de uitgever te tonen</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
similarity index 100%
rename from app/src/main/res/values-ru/strings.xml
rename to app/src/main/res/values-ru-rRU/strings.xml
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh/strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fb6d3ee..0db45440 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <resources>
-    <string name="app_name">Aegis</string>
-    <string name="app_name_full">Aegis Authenticator</string>
-    <string name="app_name_dev">AegisDev</string>
-    <string name="org_name_full">Beem Development</string>
+    <string name="app_name" translatable="false">Aegis</string>
+    <string name="app_name_full" translatable="false">Aegis Authenticator</string>
+    <string name="app_name_dev" translatable="false">AegisDev</string>
+    <string name="org_name_full" translatable="false">Beem Development</string>
     <string name="action_settings">Settings</string>
     <string name="action_about">About</string>
     <string name="action_import">Import</string>
@@ -181,13 +181,13 @@
     <string name="version">Version</string>
     <string name="changelog">Changelog</string>
     <string name="whats_new">What\'s new</string>
-    <string name="github">GitHub</string>
+    <string name="github" translatable="false">GitHub</string>
     <string name="github_description">Source code, issues and information</string>
     <string name="licenses">Licenses</string>
     <string name="licenses_description">Licenses of the libraries Aegis uses</string>
-    <string name="author_alex">Alexander Bakker</string>
+    <string name="author_alex" translatable="false">Alexander Bakker</string>
     <string name="country_netherlands">Netherlands</string>
-    <string name="author_michael">Michael Schättgen</string>
+    <string name="author_michael" translatable="false">Michael Schättgen</string>
     <string name="email_us">Write an email</string>
     <string name="visit_website">Visit our website</string>
     <string name="about_support">Support</string>