From 93b463c47ecff521d90be45324e4cd7df2aefda0 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Fri, 1 May 2015 10:08:24 +0200 Subject: [PATCH] update German translation --- .../gadgetbridge/DebugActivity.java | 4 +-- .../freeyourgadget/gadgetbridge/GB.java | 2 +- .../gadgetbridge/pebble/PebbleIoThread.java | 2 +- app/src/main/res/values-de/strings.xml | 29 +++++++++++++++++++ app/src/main/res/values/strings.xml | 5 ++-- 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java index 726834028..779dbb5d5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/DebugActivity.java @@ -51,7 +51,7 @@ public class DebugActivity extends Activity { public void onClick(View v) { Intent startIntent = new Intent(DebugActivity.this, BluetoothCommunicationService.class); startIntent.setAction(BluetoothCommunicationService.ACTION_NOTIFICATION_GENERIC); - startIntent.putExtra("notification_title", R.string.gadgetbridge); + startIntent.putExtra("notification_title", R.string.app_name); startIntent.putExtra("notification_body", editContent.getText().toString()); startService(startIntent); } @@ -62,7 +62,7 @@ public class DebugActivity extends Activity { public void onClick(View v) { Intent startIntent = new Intent(DebugActivity.this, BluetoothCommunicationService.class); startIntent.setAction(BluetoothCommunicationService.ACTION_NOTIFICATION_EMAIL); - startIntent.putExtra("notification_sender", R.string.gadgetbridge); + startIntent.putExtra("notification_sender", R.string.app_name); startIntent.putExtra("notification_subject", R.string.test); startIntent.putExtra("notification_body", editContent.getText().toString()); startService(startIntent); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java index 29e2b76e4..fbe209f23 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java @@ -27,7 +27,7 @@ public class GB { notificationIntent, 0); return new NotificationCompat.Builder(context) - .setContentTitle(context.getString(R.string.gadgetbridge)) + .setContentTitle(context.getString(R.string.app_name)) .setTicker(text) .setContentText(text) .setSmallIcon(R.drawable.ic_notification) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleIoThread.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleIoThread.java index 9265d323b..fe4dc6ebb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleIoThread.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleIoThread.java @@ -87,7 +87,7 @@ public class PebbleIoThread extends GBDeviceIoThread { notificationIntent, 0); NotificationCompat.Builder nb = new NotificationCompat.Builder(context) - .setContentTitle(context.getString(R.string.gadgetbridge)) + .setContentTitle(context.getString(R.string.app_name)) .setContentText(text) .setTicker(text) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 789f18361..b276cbf61 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -34,4 +34,33 @@ Entwickleroptionen Miband MAC-Adresse + + nicht verbunden + verbinde + verbunden + unbekannter Zustand + %1$s (HW: %2$s FW: %3$s) + %1$s (FW: %2$s) + (unknown) + Test + Test Benachrichtigung + Dies ist eine Test Benachrichtigung von Gadgetbridge + Bluetooth wird nicht unterstützt. + Bluetooth ist abgeschaltet. + berühre das verbundene Gerät, um den App Mananger zu starten + berühre ein Gerät zum verbinden + Verbindung kann nicht aufgebaut werden. BT Adresse ungültig? + Gadgetbridge läuft + niedrig + mittel + voll + lädt nicht + installiere Datei %1$d/%2$d + Installation fehlgeschlagen! + Installation erfolgreich + DU VESUCHST EINE FIRMWARE ZU INSALLIEREN, FAHRE AUF DEIN EIGENES RISIKO FORT.\n\n\n Diese Firmware is für HW Revision: %s + Du bist dabei die folgende app zu installieren:\n\n\n%1$s Version %2$s von %3$s\n + N/A + initialisiert + %1$s von %2$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e211f9aaf..0e0387dcc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,8 @@ Developer Options Miband address + + not connected connecting connected @@ -41,7 +43,6 @@ %1$s (HW: %2$s FW: %3$s) %1$s (FW: %2$s) (unknown) - Gadgetbridge Test Test Notification This is a Test Notification from Gadgetbridge @@ -62,5 +63,5 @@ You are about to install the following app:\n\n\n%1$s Version %2$s by %3$s\n N/A initialized - %1$s by %1$s + %1$s by %2$s