aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-01-22 21:39:53 +0100
committerChristian S <christian@pix-art.de>2016-01-22 21:39:53 +0100
commit7dd587554f81a35a42a2fdc4cdd74785b28114bc (patch)
treeaaac5726223d62d20d698f53e2968c80eaa6fe9d /src/main/res
parentdc99d0ac3144bed0dd04b8aff5cb4c82e080f523 (diff)
show warning on back pressed during update check
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values-de/strings.xml4
-rw-r--r--src/main/res/values/strings.xml5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 6570f32cf..8c01fb16f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -570,4 +570,8 @@
<string name="battery_optimizations_enabled_explained">Dein Telefon wendet Batterioptimierungen bei Conversations an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können.\nEs ist empfehlenswert diese zu deaktivieren.</string>
<string name="battery_optimizations_enabled_dialog">Dein Telefon wendet Batterioptimierungen bei Conversations an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können. Es ist empfehlenswert dies zu deaktivieren.</string>
<string name="disable">Deaktivieren</string>
+ <string name="cancel_update">Update abbrechen?</string>
+ <string name="no">Nein</string>
+ <string name="selection_too_large">Das ausgewählte Bild ist zu groß</string>
+ <string name="yes">Ja</string>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ab01aedb0..3156c585f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -583,7 +583,7 @@
<string name="certificate_issuer">Issuer</string>
<string name="certificate_cn">Common Name</string>
<string name="certificate_o">Organization</string>
- <string name="certificate_sha1" translatable="false">SHA1</string>
+ <string name="certificate_sha1">SHA1</string>
<string name="certicate_info_not_available">(Not available)</string>
<string name="certificate_not_found">No certificate found</string>
<string name="notify_on_all_messages">Notify on all messages</string>
@@ -599,4 +599,7 @@
<string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
<string name="disable">Disable</string>
<string name="selection_too_large">The selected area is too large</string>
+ <string name="cancel_update">Cancel update check?</string>
+ <string name="yes">Yes</string>
+ <string name="no">No</string>
</resources>