diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
| commit | 409fdd8596f217e6f4101064342273268425edfb (patch) | |
| tree | f3a50eb54c0e88bce33e34347f6dfe325917e089 /res/values-eu/strings.xml | |
| parent | 449c2a544b48a2b9adf0df094eb1ac0d49531ebe (diff) | |
| parent | 5fe3f207d407543b13652c4a3c31bf8f9f9690a5 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values-eu/strings.xml')
| -rw-r--r-- | res/values-eu/strings.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index fd3c2b16..8b5d9254 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -103,9 +103,6 @@ <string name="pref_conference_notifications_summary">Beti jakinarazi konferentzia mezu berri bat heltzerakoan eta ez soilik nabarmentzerakoan</string> <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string> <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string> - <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string> - <string name="pref_conference_name">Konferentziaren izena</string> - <string name="pref_conference_name_summary">Erabili gelaren gaia konferentziak identifikatzeko</string> <string name="pref_advanced_options">Aukera aurreratuak</string> <string name="pref_never_send_crash">Gelditze txostenik ez bidali inoiz</string> <string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string> @@ -173,7 +170,6 @@ <string name="contact_status_offline">lineaz kanpo</string> <string name="muc_details_conference">Konferentzia</string> <string name="muc_details_other_members">Beste kideak</string> - <string name="share_with_active_conversations">Elkarrizketa aktiboak</string> <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Profileko argazkiak)</string> |