Skip to content

Commit 8e158b4

Browse files
tamslinntamslinn
authored
Merge pull request #19 from emoncms/master
Merge back language
2 parents d9ed1e3 + 488000c commit 8e158b4

File tree

9 files changed

+117
-107
lines changed

9 files changed

+117
-107
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "org.emoncms.myapps"
99
minSdkVersion 14
1010
targetSdkVersion 25
11-
versionCode 132
12-
versionName "2.0.3"
11+
versionCode 134
12+
versionName "2.0.5"
1313
}
1414
buildTypes {
1515
release {

‎app/src/main/java/org/emoncms/myapps/MenuPageAdaptor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ public MenuPageAdaptor(Context context, OnNavigationClick onNavigationClick) {
125125
index++;
126126
}
127127

128-
menuOptionList.add(new MenuOption("new", R.drawable.ic_plus_box_36dp, "Add Page"));
129-
menuOptionList.add(new MenuOption("settings", R.drawable.ic_settings_applications_white_36dp, "Settings"));
128+
menuOptionList.add(new MenuOption("new", R.drawable.ic_plus_box_36dp, context.getResources().getString(R.string.menu_add_page)));
129+
menuOptionList.add(new MenuOption("settings", R.drawable.ic_settings_applications_white_36dp, context.getResources().getString(R.string.settings)));
130130

131131
EmonApplication.get().addPageChangeListener(this);
132132

‎app/src/main/res/layout/page_settings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<TextView
77
android:layout_width="wrap_content"
88
android:layout_height="wrap_content"
9-
android:textAppearance="?android:attr/textAppearanceSmall"
10-
android:text="Page Name" />
9+
android:text="@string/settings_title_myelectric_page_name"
10+
android:textAppearance="?android:attr/textAppearanceSmall" />
1111

1212
<EditText
1313
android:layout_width="match_parent"

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<string name="barcode_header">Drücke &quot;Barcode scannen&quot; um einen Bacode einzulesen</string>
55
<string name="barcode_scan_instructions">\"Scanne den Barcode auf der My Account Seite von emoncms\"</string>
66
<string name="barcode_success">Barcode erfolgreich gescannt</string>
7-
<string name="button_1d_label">Tag</string>
7+
<string name="button_1d_label">T</string>
88
<string name="button_30d_label">M</string>
99
<string name="button_3h_label">3H</string>
1010
<string name="button_6h_label">6H</string>
@@ -84,18 +84,19 @@
8484
<string name="settings_summary_language">Sprache auswählen</string>
8585
<string name="no_camera_found">Keine Kamera gefunden.</string>
8686
<string name="account_settings">Konto-Einstellungen</string>
87-
<string name="accounts">Mein Konto</string>
87+
<string name="accounts">ACCOUNTS</string>
8888
<string name="settings_summary_emoncms_name">Kurzbeschreibung / Zusammenfassung </string>
8989
<string name="settings_title_delete_account">Account löschen</string>
9090
<string name="settings_title_delete_page">Seite löschen</string>
9191
<string name="settings_title_emoncms_name">Emoncms Server Name</string>
9292
<string name="settings_title_myelectric_page_name">Mein Strom</string>
93-
<string name="cancel">CANCEL</string>
94-
<string name="settings_confirm_delete_account">Are you sure you want to delete this account? All settings will be lost.</string>
95-
<string name="settings_confirm_delete_page">" Are you sure you want to delete this page?"</string>
96-
<string name="settings_title_accounts">ACCOUNTS</string>
97-
<string name="settings_title_add_account">Add Account</string>
98-
<string name="settings_title_page_name">Page name</string>
99-
<string name="settings_title_page_name_default">New page</string>
93+
<string name="cancel">ABBRUCH</string>
94+
<string name="settings_confirm_delete_account">Sind Sie sicher, dass Sie diesen Account löschen wollen? Alle Einstellungen gehen dann verloren.</string>
95+
<string name="settings_confirm_delete_page">" Sind Sie sicher, dass Sie diese Seite löschen wollen?"</string>
96+
<string name="settings_title_accounts">KONTEN</string>
97+
<string name="settings_title_add_account">Account hinzufügen</string>
98+
<string name="settings_title_page_name">Seitenname</string>
99+
<string name="settings_title_page_name_default">Neue Seite</string>
100+
<string name="menu_add_page">Seite Hinzufügen</string>
100101

101102
</resources>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<string name="settings_title_scanqrcode">Numériser le code QR</string>
7575
<string name="settings_summary_scanqrcode">Permet de remplir automatiquement les champs de connectivité en utilisant le code QR sur la page du compte emoncms</string>
7676
<string name="settings_title_emoncms_url">emoncms URL</string>
77-
<string name="settings_summary_emoncms_url">l\'url emoncms complet sans http:// par exemple "www.myawesomesite.com/emoncms"</string>
77+
<string name="settings_summary_emoncms_url">l\'url emoncms complet sans http:// par exemple "www.monsupersite.com/emoncms"</string>
7878
<string name="settings_title_emoncms_apikey">emoncms CLÉ API</string>
7979
<string name="settings_summary_emoncms_apikey">Lire la clé API de la page emoncms Mon compte</string>
8080
<string name="settings_title_emoncms_usessl">Utiliser SSL</string>
@@ -103,12 +103,13 @@
103103
<string name="system_default">Défaillance du Système</string>
104104
<string name="no_camera_found">Aucune caméra détectée pour la numérisation de codes à barres.</string>
105105
<string name="settings_title_emoncms_connectivity">EMONCMS connectivité</string>
106-
<string name="cancel">CANCEL</string>
107-
<string name="settings_confirm_delete_account">Are you sure you want to delete this account? All settings will be lost.</string>
108-
<string name="settings_confirm_delete_page">" Are you sure you want to delete this page?"</string>
109-
<string name="settings_title_accounts">ACCOUNTS</string>
110-
<string name="settings_title_add_account">Add Account</string>
111-
<string name="settings_title_page_name">Page name</string>
112-
<string name="settings_title_page_name_default">New page</string>
106+
<string name="cancel">ANNULER</string>
107+
<string name="settings_confirm_delete_account">Etes-vous certain de vouloir supprimer ce compte? tous les réglages seront perdu.</string>
108+
<string name="settings_confirm_delete_page">"Etes-vous certain de vouloir supprimer cette page?"</string>
109+
<string name="settings_title_accounts">COMPTES</string>
110+
<string name="settings_title_add_account">Ajouter compte</string>
111+
<string name="settings_title_page_name">Nom de la page</string>
112+
<string name="settings_title_page_name_default">Nouvelle page</string>
113+
<string name="menu_add_page">Ajouter une page</string>
113114
</resources>
114115

‎app/src/main/res/values-it/strings.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,13 @@
103103

104104
<string name="system_default">Sistema Predefinito</string>
105105
<string name="no_camera_found">Nessuna fotocamera trovata per la scansione di codici a barre.</string>
106-
<string name="cancel">CANCEL</string>
107-
<string name="settings_confirm_delete_account">Are you sure you want to delete this account? All settings will be lost.</string>
108-
<string name="settings_confirm_delete_page">" Are you sure you want to delete this page?"</string>
109-
<string name="settings_title_accounts">ACCOUNTS</string>
110-
<string name="settings_title_add_account">Add Account</string>
111-
<string name="settings_title_page_name">Page name</string>
112-
<string name="settings_title_page_name_default">New page</string>
106+
<string name="cancel">ANNULLA</string>
107+
<string name="settings_confirm_delete_account">Sei sicuro di voler cancellare questo account? Tutte le impostazioni andranno perse.</string>
108+
<string name="settings_confirm_delete_page">Sei sicuro di voler cancellare questa pagina?"</string>
109+
<string name="settings_title_accounts">CONTI</string>
110+
<string name="settings_title_add_account">Aggiungi Account</string>
111+
<string name="settings_title_page_name">Nome Pagina</string>
112+
<string name="settings_title_page_name_default">Nuova pagina</string>
113+
<string name="menu_add_page">Aggiungi pagina</string>
113114
</resources>
114115

‎app/src/main/res/values-nl/strings.xml‎

Lines changed: 76 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="barcode_failure">es wurde kein Barcode erkannt</string>
4-
<string name="barcode_header">Drücke &quot;Barcode scannen&quot; um einen Bacode einzulesen</string>
5-
<string name="barcode_scan_instructions">\"Scanne den Barcode auf der My Account Seite von emoncms\"</string>
6-
<string name="barcode_success">Barcode erfolgreich gescannt</string>
3+
<string name="barcode_failure">geen QR code herkent</string>
4+
<string name="barcode_header">Druk &quot;Lees QR code&quot; om deze te lezen</string>
5+
<string name="barcode_scan_instructions">\"Scan de QR code op Uw emoncms webpagina\"</string>
6+
<string name="barcode_success">QR code succesvol gelezen</string>
77
<string name="button_1d_label">D</string>
88
<string name="button_30d_label">M</string>
9-
<string name="button_3h_label">3H</string>
10-
<string name="button_6h_label">6H</string>
9+
<string name="button_3h_label">3U</string>
10+
<string name="button_6h_label">6U</string>
1111
<string name="button_7d_label">W</string>
12-
<string name="close">Schließen</string>
13-
<string name="connection_error">VERBINDUNGSFEHLER</string>
12+
<string name="close">Sluiten</string>
13+
<string name="connection_error">verbindings probleem</string>
1414
<string name="cost_label">kWh / Kosten</string>
1515
<string name="dollars">Dollar</string>
16-
<string name="error">Fehler</string>
16+
<string name="error">Fout</string>
1717
<string name="euros">Euro</string>
18-
<string name="feed_download_error_message">Download der Feedliste gescheitert. Bitte überprüfe die URL und die APi Einstellungen als auch die Verbindung zu emoncms.</string>
18+
<string name="feed_download_error_message">Laden van lijsten mislukt. Gelieve adres en QR code van uw server na te kijken..</string>
1919

2020
<string name="monday_initial">ma</string>
2121
<string name="tuesday_initial">di</string>
@@ -25,76 +25,78 @@
2525
<string name="saturday_initial">za</string>
2626
<string name="sunday_initial">zo</string>
2727

28-
<string name="fullscreen">Vollbild</string>
29-
<string name="me_title">Mein Strom</string>
28+
<string name="fullscreen">Schermvullend</string>
29+
<string name="me_title">Mijn elektriciteit</string>
3030
<string name="ok">OK</string>
31-
<string name="pounds">Pfund</string>
32-
<string name="permission_camera_rationale">Zugriff auf die Kamera ist erforderlich</string>
33-
<string name="power_now_label">JETZT</string>
34-
<string name="qr_code_fail">Ungültiger QR Code</string>
35-
<string name="qr_code_success">Einstellungen wurden erfolgreich vom QR Code übernommen</string>
36-
<string name="read_barcode">Barcode scannen</string>
37-
<string name="server_not_configured">Bitte konfigurere deinen emoncms-server mit den API-Schlüsseln in den Einstellungen.</string>
38-
<string name="settings">Einstellungen</string>
39-
<string name="settings_summary_emoncms_apikey">Lese API-Schlüssel von der emoncms &quot;My Account&quot;-Seite</string>
40-
<string name="settings_title_emoncms_usessl">Verwende SSL</string>
31+
<string name="pounds">Pond</string>
32+
<string name="permission_camera_rationale">Toegang tot de camera is nodig.</string>
33+
<string name="power_now_label">ACTUEEL</string>
34+
<string name="qr_code_fail">QR Code ongeldig</string>
35+
<string name="qr_code_success">Instellingen via QR code werden correct ingelezen.</string>
36+
<string name="read_barcode">QR code scannen</string>
37+
<string name="server_not_configured">Stel uw servergegevens en API sleutel in via de instellingen..</string>
38+
<string name="settings">Instellingen</string>
39+
<string name="settings_summary_emoncms_apikey">Lees de API sleutel op Uw emoncms accountpagina</string>
40+
<string name="settings_title_emoncms_usessl">Gebruik SSL</string>
4141
<string name="settings_title_emoncms_url">emoncms URL</string>
42-
<string name="settings_title_emoncms_connectivity">emoncms VERBINDUNG</string>
43-
<string name="settings_title_emoncms_apikey">emoncms API-SCHLÜSSEL</string>
44-
<string name="settings_title_app_settings">APP EINSTELLUNGEN</string>
45-
<string name="settings_title_keep_screen_on">Bildschirm aktiv lassen</string>
46-
<string name="settings_title_myelectric_cost_symbol">Konsten pro Einheit</string>
47-
<string name="settings_title_myelectric_currency">Währung</string>
48-
<string name="settings_title_myelectric_escale">Wh oder kWh Feed</string>
49-
<string name="settings_title_myelectric_feeds">Feeds</string>
50-
<string name="settings_title_myelectric_kwh_feed">Balkendiagramm feed (kWh)</string>
51-
<string name="settings_title_myelectric_power_feed">Strom feed (Watt)</string>
52-
<string name="settings_title_myelectric_unit_cost">Kosten</string>
53-
<string name="settings_title_scanqrcode">QR Code scannen</string>
54-
<string name="solar_pv_label">SOLAR PV</string>
55-
<string name="system_locale">System-standaard</string>
56-
<string name="title_activity_main">Barcode-Leser Beispiel</string>
42+
<string name="settings_title_emoncms_connectivity">emoncms VERBINDING</string>
43+
<string name="settings_title_emoncms_apikey">emoncms API-SLEUTEL</string>
44+
<string name="settings_title_app_settings">APP INSTELLINGEN</string>
45+
<string name="settings_title_keep_screen_on">Beeldscherm actief houden</string>
46+
<string name="settings_title_myelectric_cost_symbol">Konsten per Eenheid</string>
47+
<string name="settings_title_myelectric_currency">Munt</string>
48+
<string name="settings_title_myelectric_escale">Wh of kWh lijst</string>
49+
<string name="settings_title_myelectric_feeds">Lijsten</string>
50+
<string name="settings_title_myelectric_kwh_feed">Grafiek lijst (kWh)</string>
51+
<string name="settings_title_myelectric_power_feed">Stroom lijst (Watt)</string>
52+
<string name="settings_title_myelectric_unit_cost">Kost</string>
53+
<string name="settings_title_scanqrcode">QR Code lezen</string>
54+
<string name="solar_pv_label">ZON PV</string>
55+
<string name="system_locale">Systeem instelling</string>
56+
<string name="title_activity_main">Voorbeeld QR code lezer</string>
5757
<string name="txt_power_default">0W</string>
5858
<string name="use_today_default">0.0kWh</string>
59-
<string name="use_today_label">HEUTE</string>
60-
<string name="wh_elapsed">Watt Stunden verbaucht</string>
59+
<string name="use_today_label">ACTUEEL</string>
60+
<string name="wh_elapsed">Watt/uur verbruikt</string>
6161
<string name="yen">Yen</string>
62-
<string name="settings_summary_emoncms_url">\"Vollständige emoncms URL ohne http://. z.B. www.myawesomesite.com/emoncms\"</string>
63-
<string name="settings_summary_emoncms_usessl">Verbindung via https. Unterstützt von emoncms.org NICHT emonPi\"</string>
64-
<string name="settings_summary_keep_screen_on">Bildschirm eingeschaltet lassen</string>
65-
<string name="invalid_number_of_responses">Ungültige Anzahl von API-Antworten</string>
66-
<string name="ms_title">Mein Solar</string>
67-
<string name="me_settings_title">Meine Strom Feeds</string>
68-
<string name="ms_settings_title">Meine Solar Feeds</string>
69-
<string name="navigation_drawer_close">Schließe Navigation Drawer</string>
70-
<string name="navigation_drawer_open">Öffne Navigation Drawer</string>
71-
<string name="open">Öffnen</string>
72-
<string name="barcode_error">\"Fehler beim Einlesen des Barcodes: %1$s\"</string>
73-
<string name="no_camera_permission">Der Barcode Scanner benötigt Zugriff auf die Kamera, hat jedoch keine Berechtigung dazu.</string>
74-
<string name="settings_summary_scanqrcode">Erlaubt es, die Formularfelder durch den QR Code auf der emoncms-Account-Seite automatisch auszufüllen</string>
75-
<string name="kwh_elapsed">kWh verbaucht</string>
62+
<string name="settings_summary_emoncms_url">\"Volledige emoncms URL zonder http://, bv. www.miinsupersite.com/emoncms\"</string>
63+
<string name="settings_summary_emoncms_usessl">Verbinding via https. Ondersteunt voor emoncms.org, niet voor emonPi\"</string>
64+
<string name="settings_summary_keep_screen_on">Beeldscherm aktief houden</string>
65+
<string name="invalid_number_of_responses">API antwoorden ongeldig</string>
66+
<string name="ms_title">Mijn Zon</string>
67+
<string name="me_settings_title">Mijn Stroom lijsten</string>
68+
<string name="ms_settings_title">Mijn Zon lijst</string>
69+
<string name="navigation_drawer_close">Sluit navigatie lade</string>
70+
<string name="navigation_drawer_open">Open navigatie lade</string>
71+
<string name="open">Open</string>
72+
<string name="barcode_error">\"Fout inlezen QR code: %1$s\"</string>
73+
<string name="no_camera_permission">De QR code lezer heeft toegang tot de camera nodig, deze werd geweigerd.</string>
74+
<string name="settings_summary_scanqrcode">Automatisch verbinding instellen via de QR code op Uw Emoncms account</string>
75+
<string name="kwh_elapsed">kWh verbruikt</string>
7676

77-
<string name="chart_no_data_available">Keine Daten für Charts verfügbar</string>
78-
<string name="system_default">Systemstandard</string>
79-
<string name="me_not_configured_text">Wählen Sie die Feeds aus die angezeigt werden sollen. Konfigurationsmenü --&gt; Zahnrad-Symbol in der Symbolleiste.</string>
80-
<string name="invalid_kwh_feedid">Ungültige Verwendung kwh feed ID, wählen Sie bitte eine kwh-Feed aus dem Konfigurationsmenü.</string>
81-
<string name="invalid_watt_feedid">Ungültige Verwendung der feed ID, bitte wählen Sie einen Watt-Feed aus dem Konfigurationsmenü.</string>
82-
<string name="low_storage_error">Abhängigkeiten können nicht heruntergeladen werden. Interner Speicher zu gering!</string>
83-
<string name="settings_title_language">Sprache</string>
84-
<string name="settings_summary_language">Sprache auswählen</string>
85-
<string name="no_camera_found">Keine Kamera gefunden.</string>
86-
<string name="account_settings">Konto-Einstellungen</string>
87-
<string name="accounts">Mein Konto</string>
88-
<string name="settings_summary_emoncms_name">Kurzbeschreibung / Zusammenfassung </string>
89-
<string name="settings_title_delete_account">Account löschen</string>
90-
<string name="settings_title_delete_page">Seite löschen</string>
91-
<string name="settings_title_emoncms_name">Emoncms Server Name</string>
92-
<string name="settings_title_myelectric_page_name">Mein Strom</string>
93-
<string name="cancel">CANCEL</string>
94-
<string name="settings_confirm_delete_account">Are you sure you want to delete this account? All settings will be lost.</string>
95-
<string name="settings_confirm_delete_page">" Are you sure you want to delete this page?"</string>
77+
<string name="chart_no_data_available">Geen data beschikbaar voor grafiek</string>
78+
<string name="system_default">Systeem standaard</string>
79+
<string name="me_not_configured_text">Gelieve de lijsten in te stellen via het \'tandwiel menu\'.</string>
80+
<string name="invalid_kwh_feedid">Ongeldig kwh_verbruik ID, gelieve deze in te stellen.</string>
81+
<string name="invalid_watt_feedid">Ongeldig watt_verbuik ID, gelieve deze in te stellen.</string>
82+
<string name="low_storage_error">Laden mislukt wegens intern geheugengebrek !</string>
83+
<string name="settings_title_language">Taal</string>
84+
<string name="settings_summary_language">Taal kiezen</string>
85+
<string name="no_camera_found">Geen camera gevonden.</string>
86+
<string name="account_settings">Account instellingen</string>
87+
<string name="accounts">Mijn account</string>
88+
<string name="settings_summary_emoncms_name">kort account naam om deze makkelijk te herkennen </string>
89+
<string name="settings_title_delete_account">Account wissen</string>
90+
<string name="settings_title_delete_page">Pagina wissen</string>
91+
<string name="settings_title_emoncms_name">Emoncms Server Naam</string>
92+
<string name="settings_title_myelectric_page_name">Mijn stroom</string>
93+
<string name="cancel">ANNULEER</string>
94+
<string name="settings_confirm_delete_account">Bent U zeker om dit account te wissen ? U verliest alle gegevens.</string>
95+
<string name="settings_confirm_delete_page">" Bent U zeker om deze pagina te wissen?"</string>
9696
<string name="settings_title_accounts">ACCOUNTS</string>
97-
<string name="settings_title_add_account">Add Account</string>
98-
<string name="settings_title_page_name">Page name</string>
97+
<string name="settings_title_add_account">Account toevoegen</string>
98+
<string name="settings_title_page_name">Pagina naam</string>
99+
<string name="menu_add_page">Pagina toevoegen</string>
100+
<string name="settings_title_page_name_default">Pagina toevoegen</string>
99101

100102
</resources>

0 commit comments

Comments
 (0)