diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-15 14:26:37 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-15 14:26:37 +0200 |
| commit | 1f34fb742ceaa941f48ca858010961f834e3d1b8 (patch) | |
| tree | 76ca87a93cc0cf12e6fc201d34c7e20ad5b510ca /src/main/res/values-sv | |
| parent | 4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff) | |
| parent | 32826ec29d28668b7f345ffcd45cd876dc980153 (diff) | |
Merge branch 'development'
Diffstat (limited to 'src/main/res/values-sv')
| -rw-r--r-- | src/main/res/values-sv/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 98ab7110..6c4436a8 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -105,8 +105,6 @@ <string name="pref_vibrate_summary">Vibrera när meddelande tagits emot</string> <string name="pref_sound">Ljud</string> <string name="pref_sound_summary">Spela ljud med notifiering</string> - <string name="pref_conference_notifications">Konferensnotifieringar</string> - <string name="pref_conference_notifications_summary">Notifiera alltid när nytt konferensmeddelande tagits emot i stället för endast vid highlight</string> <string name="pref_notification_grace_period">Notifieringsfrist</string> <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string> <string name="pref_advanced_options">Avancerade inställningar</string> @@ -427,7 +425,6 @@ <string name="received_location">Mottog position</string> <string name="title_undo_swipe_out_conversation">Konversation stängd</string> <string name="title_undo_swipe_out_muc">Lämnade konferens</string> - <string name="pref_certificate_options">Certifikatalternativ</string> <string name="pref_dont_trust_system_cas_title">Lita inte på systemets CAs</string> <string name="pref_dont_trust_system_cas_summary">Alla certifikat måste manuellt godkännas</string> <string name="pref_remove_trusted_certificates_title">Ta bort certifikat</string> |