aboutsummaryrefslogtreecommitdiffstats
path: root/res/values-sv
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-07 23:08:57 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-07 23:08:57 +0200
commit409fdd8596f217e6f4101064342273268425edfb (patch)
treef3a50eb54c0e88bce33e34347f6dfe325917e089 /res/values-sv
parent449c2a544b48a2b9adf0df094eb1ac0d49531ebe (diff)
parent5fe3f207d407543b13652c4a3c31bf8f9f9690a5 (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values-sv')
-rw-r--r--res/values-sv/strings.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 24ca5c51..abd99dbc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -102,9 +102,6 @@
<string name="pref_conference_notifications_summary">Notifiera alltid när nytt konferensmeddelande tagits emot istället för endast vid highlight</string>
<string name="pref_notification_grace_period">Notifieringsfrist</string>
<string name="pref_notification_grace_period_summary">Deaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
- <string name="pref_ui_options">UI inställningar</string>
- <string name="pref_conference_name">Konferensnamn</string>
- <string name="pref_conference_name_summary">Använd konferensens ämne för att identifera konferensen</string>
<string name="pref_advanced_options">Avancerade inställningar</string>
<string name="pref_never_send_crash">Skicka aldrig krasch-rapporter</string>
<string name="pref_never_send_crash_summary">Genom att skicka in stack traces hjälper du utvecklarna av Conversations</string>
@@ -170,7 +167,6 @@
<string name="contact_status_offline">offline</string>
<string name="muc_details_conference">Konferens</string>
<string name="muc_details_other_members">Andra medlemmar</string>
- <string name="share_with_active_conversations">Aktiva konversationer</string>
<string name="server_info_carbon_messages">Carbon Messages</string>
<string name="server_info_stream_management">Stream Management</string>
<string name="missing_public_keys">Annonsering om publik nyckel saknas</string>