fix NL translations 2.0.5

emoncms · Apr 12, 2017 · b864ea8 · b864ea8
1 parent 42a373f
commit b864ea8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.emoncms.myapps"
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 133
-        versionName "2.0.4"
+        versionCode 134
+        versionName "2.0.5"
     }
     buildTypes {
         release {

diff --git a/app/src/main/res/layout/page_settings.xml b/app/src/main/res/layout/page_settings.xml
@@ -6,8 +6,8 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="Page Name" />
+        android:text="@string/settings_title_myelectric_page_name"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <EditText
         android:layout_width="match_parent"

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -84,7 +84,7 @@
     <string name="settings_summary_language">Sprache auswählen</string>
     <string name="no_camera_found">Keine Kamera gefunden.</string>
     <string name="account_settings">Konto-Einstellungen</string>
-    <string name="accounts">Mein Konto</string>
+    <string name="accounts">ACCOUNTS</string>
     <string name="settings_summary_emoncms_name">Kurzbeschreibung / Zusammenfassung </string>
     <string name="settings_title_delete_account">Account löschen</string>
     <string name="settings_title_delete_page">Seite löschen</string>
@@ -93,7 +93,7 @@
     <string name="cancel">ABBRUCH</string>
     <string name="settings_confirm_delete_account">Sind Sie sicher, dass Sie diesen Account löschen wollen? Alle Einstellungen gehen dann verloren.</string>
     <string name="settings_confirm_delete_page">" Sind Sie sicher, dass Sie diese Seite löschen wollen?"</string>
-    <string name="settings_title_accounts">ACCOUNTS</string>
+    <string name="settings_title_accounts">KONTEN</string>
     <string name="settings_title_add_account">Account hinzufügen</string>
     <string name="settings_title_page_name">Seitenname</string>
     <string name="settings_title_page_name_default">Neue Seite</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -106,7 +106,7 @@
     <string name="cancel">ANNULLA</string>
     <string name="settings_confirm_delete_account">Sei sicuro di voler cancellare questo account? Tutte le impostazioni andranno perse.</string>
     <string name="settings_confirm_delete_page">Sei sicuro di voler cancellare questa pagina?"</string>
-    <string name="settings_title_accounts">ACCOUNT</string>
+    <string name="settings_title_accounts">CONTI</string>
     <string name="settings_title_add_account">Aggiungi Account</string>
     <string name="settings_title_page_name">Nome Pagina</string>
     <string name="settings_title_page_name_default">Nuova pagina</string>

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -75,7 +75,7 @@
     <string name="kwh_elapsed">kWh verbruikt</string>
 
     <string name="chart_no_data_available">Geen data beschikbaar voor grafiek</string>
-    <string name="system_default">Systeem fout</string>
+    <string name="system_default">Systeem standaard</string>
     <string name="me_not_configured_text">Gelieve de lijsten in te stellen via het \'tandwiel menu\'.</string>
     <string name="invalid_kwh_feedid">Ongeldig kwh_verbruik ID, gelieve deze in te stellen.</string>
     <string name="invalid_watt_feedid">Ongeldig watt_verbuik ID, gelieve deze in te stellen.</string>

diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
@@ -41,6 +41,9 @@
         <item>@string/french</item>
         <item>@string/german</item>
         <item>@string/italian</item>
+        <item>@string/dutch</item>
+
+
     </string-array>
 
     <string-array name="language_values" translatable="false">
@@ -49,5 +52,6 @@
         <item>fr</item>
         <item>de</item>
         <item>it</item>
+        <item>nl</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -22,6 +22,7 @@
     <string name="french" translatable="false">Français</string>
     <string name="german" translatable="false">Deutsch</string>
     <string name="italian" translatable="false">Italiano</string>
+    <string name="dutch" translatable="false">Nederlands</string>
 
     //
     //  TRANSLATABLE
@@ -133,7 +134,7 @@
     <string name="settings_title_myelectric_unit_cost">Cost</string>
     <string name="settings_title_myelectric_cost_symbol">Cost Unit</string>
     <string name="settings_title_delete_page">Delete Page</string>
-    <string name="settings_confirm_delete_page"> Are you sure you want to delete this page?</string>
+    <string name="settings_confirm_delete_page">Connect using https, supported by emoncms.org NOT emonPi\"</string>
 
 
     <string name="system_default">System Default</string>