diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:06 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-04-14 15:17:06 +0200 |
| commit | defb127d6e3a1d29f60553a8e9b3f992f2127b70 (patch) | |
| tree | b220ef33d771667032a1cc2c62b0587a09a27ff9 /src/main/res/values-de | |
| parent | 261b505f066b90ef346c529afea50f8285ddfd7d (diff) | |
| parent | 878066ca99c1170479fb217d68ecdb9cf5498975 (diff) | |
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
Conflicts:
src/main/res/values-de/strings.xml
src/main/res/values/strings.xml
Diffstat (limited to 'src/main/res/values-de')
| -rw-r--r-- | src/main/res/values-de/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 3f6f471b..addc55de 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -429,6 +429,8 @@ <string name="received_location">Standort empfangen</string> <string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string> <string name="title_undo_swipe_out_muc">Konferenz verlassen</string> + <string name="pref_dont_trust_system_cas_title">Misstraue Zertifizierungsstellen</string> + <string name="pref_dont_trust_system_cas_summary">Alle Zertifikate müssen manuell bestätigt werden</string> <plurals name="select_contact"> <item quantity="one">%d Kontakt ausgewählt</item> <item quantity="other">%d Kontakte ausgewählt</item> |