From 60027410459fb9acd9ade7b0c376103cf26f86ab Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Wed, 20 Jun 2018 20:52:02 +1200 Subject: [PATCH 1/3] Fix confusing setting label Remove "in web client" from "audible notifications" setting label, since Riot is also a desktop application. --- src/components/views/settings/Notifications.js | 2 +- src/i18n/strings/be.json | 1 - src/i18n/strings/bg.json | 1 - src/i18n/strings/ca.json | 1 - src/i18n/strings/cs.json | 1 - src/i18n/strings/da.json | 1 - src/i18n/strings/de_DE.json | 1 - src/i18n/strings/el.json | 1 - src/i18n/strings/en_EN.json | 2 +- src/i18n/strings/en_US.json | 1 - src/i18n/strings/eo.json | 1 - src/i18n/strings/es.json | 1 - src/i18n/strings/eu.json | 1 - src/i18n/strings/fa.json | 1 - src/i18n/strings/fi.json | 1 - src/i18n/strings/fr.json | 1 - src/i18n/strings/gl.json | 1 - src/i18n/strings/he.json | 1 - src/i18n/strings/hu.json | 1 - src/i18n/strings/id.json | 1 - src/i18n/strings/is.json | 1 - src/i18n/strings/it.json | 1 - src/i18n/strings/ja.json | 1 - src/i18n/strings/ko.json | 1 - src/i18n/strings/lt.json | 1 - src/i18n/strings/lv.json | 1 - src/i18n/strings/ml.json | 1 - src/i18n/strings/nb_NO.json | 1 - src/i18n/strings/nl.json | 1 - src/i18n/strings/pl.json | 1 - src/i18n/strings/pt.json | 1 - src/i18n/strings/pt_BR.json | 1 - src/i18n/strings/ru.json | 1 - src/i18n/strings/sk.json | 1 - src/i18n/strings/sq.json | 1 - src/i18n/strings/sr.json | 1 - src/i18n/strings/sv.json | 1 - src/i18n/strings/ta.json | 1 - src/i18n/strings/te.json | 1 - src/i18n/strings/th.json | 1 - src/i18n/strings/tr.json | 1 - src/i18n/strings/uk.json | 1 - src/i18n/strings/zh_Hans.json | 1 - src/i18n/strings/zh_Hant.json | 1 - 44 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js index 39774778e18..b50f99eb131 100644 --- a/src/components/views/settings/Notifications.js +++ b/src/components/views/settings/Notifications.js @@ -882,7 +882,7 @@ module.exports = React.createClass({
diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json index 31360c87f47..310c3f17625 100644 --- a/src/i18n/strings/be.json +++ b/src/i18n/strings/be.json @@ -1,6 +1,5 @@ { "Couldn't find a matching Matrix room": "Не атрымалася знайсці адпаведны пакой Matrix", - "Enable audible notifications in web client": "Ўключыць гукавыя апавяшчэнні ў вэб-кліенце", "All messages (noisy)": "Усе паведамленні (гучна)", "Reject": "Адхіліць", "Failed to forget room %(errCode)s": "Не атрымалася забыць пакой %(errCode)s", diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json index 0b1305f3e8f..505d6050a81 100644 --- a/src/i18n/strings/bg.json +++ b/src/i18n/strings/bg.json @@ -1123,7 +1123,6 @@ "What's New": "Какво ново", "Set Password": "Задаване на парола", "An error occurred whilst saving your email notification preferences.": "Възникна грешка при запазване на настройките за имейл известяване.", - "Enable audible notifications in web client": "Включване на звукови известия в уеб клиент", "Off": "Изключено", "Riot does not know how to join a room on this network": "Riot не знае как да се присъедини към стая от тази мрежа", "Mentions only": "Само при споменаване", diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json index bd8452f0ba7..f3487c61010 100644 --- a/src/i18n/strings/ca.json +++ b/src/i18n/strings/ca.json @@ -1002,7 +1002,6 @@ "Low Priority": "Baixa prioritat", "Unable to fetch notification target list": "No s'ha pogut obtenir la llista d'objectius de les notificacions", "Set Password": "Establiu una contrasenya", - "Enable audible notifications in web client": "Habilita les notificacions d'àudio al client web", "Off": "Apagat", "Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa", "Mentions only": "Només mencions", diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json index e3ce9dcf085..a56d5bb6e3e 100644 --- a/src/i18n/strings/cs.json +++ b/src/i18n/strings/cs.json @@ -1060,7 +1060,6 @@ "Riot does not know how to join a room on this network": "Riot neví, jak vstoupit do místosti na této síti", "Set Password": "Nastavit heslo", "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových upozornění nastala chyba.", - "Enable audible notifications in web client": "Povolit zvuková upozornění ve webové aplikaci", "Off": "Vypnout", "#example": "#příklad", "Mentions only": "Pouze zmínky", diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 18c30f29bce..0301b112459 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -369,7 +369,6 @@ "Low Priority": "Lav prioritet", "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste", "Set Password": "Indstil Password", - "Enable audible notifications in web client": "Aktivér hørbare underretninger i webklienten", "Resend": "Send igen", "Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk", "Mentions only": "Kun nævninger", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index ba31308e3a8..3fe4f581595 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1124,7 +1124,6 @@ "Low Priority": "Niedrige Priorität", "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden", "Set Password": "Passwort einrichten", - "Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren", "Off": "Aus", "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll", "Mentions only": "Nur, wenn du erwähnt wirst", diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json index b3fecf86a20..bd59001dcc6 100644 --- a/src/i18n/strings/el.json +++ b/src/i18n/strings/el.json @@ -744,7 +744,6 @@ "Low Priority": "Χαμηλή προτεραιότητα", "What's New": "Τι νέο υπάρχει", "Set Password": "Ορισμός κωδικού πρόσβασης", - "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων", "Off": "Ανενεργό", "#example": "#παράδειγμα", "Mentions only": "Μόνο αναφορές", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 41f67ad9d92..a7615748598 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -293,7 +293,7 @@ "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply", "Enable desktop notifications": "Enable desktop notifications", "Show message in desktop notification": "Show message in desktop notification", - "Enable audible notifications in web client": "Enable audible notifications in web client", + "Enable audible notifications": "Enable audible notifications", "Off": "Off", "On": "On", "Noisy": "Noisy", diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json index dcd7366a557..bde5ddfa301 100644 --- a/src/i18n/strings/en_US.json +++ b/src/i18n/strings/en_US.json @@ -814,7 +814,6 @@ "Low Priority": "Low Priority", "Unable to fetch notification target list": "Unable to fetch notification target list", "Set Password": "Set Password", - "Enable audible notifications in web client": "Enable audible notifications in web client", "Off": "Off", "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network", "Mentions only": "Mentions only", diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json index 5982871d8f4..75ea39a6bed 100644 --- a/src/i18n/strings/eo.json +++ b/src/i18n/strings/eo.json @@ -1075,7 +1075,6 @@ "Low Priority": "Malalta prioritato", "Unable to fetch notification target list": "Malsukcesis akiri la liston de celoj por sciigoj", "Set Password": "Agordi pasvorton", - "Enable audible notifications in web client": "Ŝalti aŭdeblajn sciigojn en la retkliento", "Off": "For", "Riot does not know how to join a room on this network": "Riot ne scias aliĝi al ĉambroj en tiu ĉi reto", "Mentions only": "Nur mencioj", diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index e0e3c91bcdb..b1e3242f63e 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -715,7 +715,6 @@ "Low Priority": "Baja Prioridad", "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red", "Set Password": "Establecer contraseña", - "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web", "Off": "Apagado", "#example": "#ejemplo", "Mentions only": "Sólo menciones", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index f5367ba4f3d..c0772d96677 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1125,7 +1125,6 @@ "Low Priority": "Lehentasun baxua", "Unable to fetch notification target list": "Ezin izan da jakinarazpen helburuen zerrenda eskuratu", "Set Password": "Ezarri pasahitza", - "Enable audible notifications in web client": "Gaitu jakinarazpen entzungarriak web bezeroan", "Off": "Ez", "Riot does not know how to join a room on this network": "Riotek ez daki nola elkartu gela batetara sare honetan", "Mentions only": "Aipamenak besterik ez", diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json index 2b18ba76934..50a97b88e3c 100644 --- a/src/i18n/strings/fa.json +++ b/src/i18n/strings/fa.json @@ -123,7 +123,6 @@ "Unable to fetch notification target list": "ناتوانی در تطبیق لیست آگاه‌سازی‌های هدف", "Set Password": "پسوردتان را انتخاب کنید", "An error occurred whilst saving your email notification preferences.": "خطایی در حین ذخیره‌ی ترجیجات شما درباره‌ی رایانامه رخ داد.", - "Enable audible notifications in web client": "آگاه‌سازی صدادار را در کارگزار وب فعال کن", "Off": "خاموش", "Riot does not know how to join a room on this network": "رایوت از چگونگی ورود به یک گپ در این شبکه اطلاعی ندارد", "Mentions only": "فقط نام‌بردن‌ها", diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index ebcee3b6c6a..e19513ef295 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -1048,7 +1048,6 @@ "Unable to fetch notification target list": "Ilmoituskohdelistan haku epäonnistui", "Set Password": "Aseta salasana", "An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.", - "Enable audible notifications in web client": "Ota käyttöön äänelliset ilmoitukset", "remove %(name)s from the directory.": "poista %(name)s hakemistosta.", "Off": "Pois päältä", "Riot does not know how to join a room on this network": "Riot ei tiedä miten liittya huoneeseen tässä verkossa", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index c54975b54d4..9235e97caa4 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1119,7 +1119,6 @@ "Low Priority": "Priorité basse", "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications", "Set Password": "Définir un mot de passe", - "Enable audible notifications in web client": "Activer les notifications sonores pour le client web", "Off": "Désactivé", "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau", "Mentions only": "Seulement les mentions", diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json index aaf84f717d1..9168adddee0 100644 --- a/src/i18n/strings/gl.json +++ b/src/i18n/strings/gl.json @@ -1125,7 +1125,6 @@ "Low Priority": "Baixa prioridade", "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións", "Set Password": "Establecer contrasinal", - "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web", "Off": "Off", "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede", "Mentions only": "Só mencións", diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json index 7d96dfa089b..94413ae5465 100644 --- a/src/i18n/strings/he.json +++ b/src/i18n/strings/he.json @@ -220,7 +220,6 @@ "Low Priority": "עדיפות נמוכה", "Unable to fetch notification target list": "לא ניתן לאחזר רשימת יעדי התראה", "Set Password": "הגדר סיסמא", - "Enable audible notifications in web client": "אפשר התראות קוליות בדפדפן", "Off": "סגור", "Riot does not know how to join a room on this network": "Riot אינו יודע כיצד להצטרף לחדר ברשת זו", "Mentions only": "מאזכר בלבד", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 64d97ece1fb..a1764005fe5 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1124,7 +1124,6 @@ "Low Priority": "Alacsony prioritás", "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját", "Set Password": "Jelszó beállítása", - "Enable audible notifications in web client": "Hangértesítések engedélyezése a webkliensben", "Off": "Ki", "Riot does not know how to join a room on this network": "A Riot nem tud csatlakozni szobához ezen a hálózaton", "Mentions only": "Csak ha megemlítenek", diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json index 86605c1d414..fe64bacedae 100644 --- a/src/i18n/strings/id.json +++ b/src/i18n/strings/id.json @@ -322,7 +322,6 @@ "Low Priority": "Prioritas Rendah", "Unable to fetch notification target list": "Tidak dapat mengambil daftar notifikasi target", "Set Password": "Ubah Password", - "Enable audible notifications in web client": "Aktifkan notifikasi suara di klien web", "Off": "Mati", "Riot does not know how to join a room on this network": "Riot tidak tau bagaimana gabung ruang di jaringan ini", "Mentions only": "Hanya jika disinggung", diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index 6770a0ea25e..fd26442a876 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -133,7 +133,6 @@ "Advanced notification settings": "Ítarlegar stillingar á tilkynningum", "Enable desktop notifications": "Virkja tilkynningar á skjáborði", "Show message in desktop notification": "Birta tilkynningu í innbyggðu kerfistilkynningakerfi", - "Enable audible notifications in web client": "Virkja hljóðtilkynningar í vefviðmóti", "Off": "Slökkt", "On": "Kveikt", "Noisy": "Hávært", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 4728ee9106c..e8694b1e947 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1120,7 +1120,6 @@ "Low Priority": "Priorità bassa", "What's New": "Novità", "Set Password": "Imposta Password", - "Enable audible notifications in web client": "Abilita notifiche audio nel client web", "Off": "Spento", "#example": "#esempio", "Mentions only": "Solo le citazioni", diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json index 741de4b5519..6752dd0c5dc 100644 --- a/src/i18n/strings/ja.json +++ b/src/i18n/strings/ja.json @@ -222,7 +222,6 @@ "Error encountered (%(errorDetail)s).": "エラーが発生しました (%(errorDetail)s)。", "Event Type": "イベントの形式", "What's New": "新着", - "Enable audible notifications in web client": "ウェブクライアントで音による通知を有効化", "remove %(name)s from the directory.": "ディレクトリから %(name)s を消去する。", "Riot does not know how to join a room on this network": "Riotはこのネットワークで部屋に参加する方法を知りません", "You can now return to your account after signing out, and sign in on other devices.": "サインアウト後にあなたの\nアカウントに戻る、また、他の端末でサインインすることができます。", diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index f0b6e81ba82..8f36647f1f1 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -752,7 +752,6 @@ "Low Priority": "낮은 우선순위", "Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요", "Set Password": "비밀번호 설정", - "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기", "Off": "끄기", "#example": "#예", "Mentions only": "답만 하기", diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index e1525f7af1d..6d1ca05cf15 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -110,7 +110,6 @@ "Monday": "Pirmadienis", "All messages (noisy)": "Visos žinutės (triukšmingas)", "Enable them now": "Įgalinti juos dabar", - "Enable audible notifications in web client": "Įgalinti garsinius pranešimus internetinėje aplinkoje", "Messages containing my user name": "Žinutės, kuriose paminėtas mano naudotojo vardas", "Toolbox": "Įrankinė", "Collecting logs": "Renkami žurnalai", diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json index 91a7de76240..3485047ee65 100644 --- a/src/i18n/strings/lv.json +++ b/src/i18n/strings/lv.json @@ -1113,7 +1113,6 @@ "Low Priority": "Zemas prioritātes", "Unable to fetch notification target list": "Neizdevās iegūt paziņojumu mērķu sarakstu", "Set Password": "Iestatīt paroli", - "Enable audible notifications in web client": "Iespējot skaņus paziņojumus web klientā", "Off": "izslēgts", "Riot does not know how to join a room on this network": "Riot nezin kā pievienoties šajā tīklā esošajai istabai", "Mentions only": "Vienīgi atsauces", diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json index a4bf0b421ac..0d0230317f0 100644 --- a/src/i18n/strings/ml.json +++ b/src/i18n/strings/ml.json @@ -136,7 +136,6 @@ "Low Priority": "താഴ്ന്ന പരിഗണന", "Unable to fetch notification target list": "നോട്ടിഫിക്കേഷന്‍ ടാര്‍ഗെറ്റ് ലിസ്റ്റ് നേടാനായില്ല", "Set Password": "രഹസ്യവാക്ക് സജ്ജീകരിക്കുക", - "Enable audible notifications in web client": "വെബ് പതിപ്പിലെ അറിയിപ്പുകള്‍ കേള്‍ക്കാവുന്നതാക്കുക", "remove %(name)s from the directory.": "%(name)s ഡയറക്റ്ററിയില്‍ നിന്ന് നീക്കം ചെയ്യുക.", "Off": "ഓഫ്", "Riot does not know how to join a room on this network": "ഈ നെറ്റ്‍വര്‍ക്കിലെ ഒരു റൂമില്‍ എങ്ങനെ അംഗമാകാമെന്ന് റയട്ടിന് അറിയില്ല", diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json index 9a2b859854a..1286f1bfc16 100644 --- a/src/i18n/strings/nb_NO.json +++ b/src/i18n/strings/nb_NO.json @@ -97,7 +97,6 @@ "Low Priority": "Lav Prioritet", "Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket", "An error occurred whilst saving your email notification preferences.": "En feil oppsto i forbindelse med lagring av epost varsel innstillinger.", - "Enable audible notifications in web client": "Aktiver lyd-varsel i webklient", "remove %(name)s from the directory.": "fjern %(name)s fra katalogen.", "Off": "Av", "#example": "#eksempel", diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index d85982a3fc1..7de99a9b918 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -1118,7 +1118,6 @@ "Low Priority": "Lage prioriteit", "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatiedoelen op te halen", "Set Password": "Wachtwoord instellen", - "Enable audible notifications in web client": "Geluidsmeldingen in de webclient aanzetten", "Off": "Uit", "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een ruimte op dit netwerk", "Mentions only": "Alleen vermeldingen", diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json index d0b71cdb8d1..5878b5580ba 100644 --- a/src/i18n/strings/pl.json +++ b/src/i18n/strings/pl.json @@ -899,7 +899,6 @@ "Low Priority": "Niski priorytet", "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień", "Set Password": "Ustaw hasło", - "Enable audible notifications in web client": "Włącz dźwiękowe powiadomienia w kliencie internetowym", "Off": "Wyłącz", "Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci", "Mentions only": "Tylko, gdy wymienieni", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index d19eae40d43..54b3ef82908 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -824,7 +824,6 @@ "Low Priority": "Baixa prioridade", "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação", "Set Password": "Definir palavra-passe", - "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web", "Off": "Desativado", "Riot does not know how to join a room on this network": "O Riot não sabe como entrar numa sala nesta rede", "Mentions only": "Apenas menções", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index b786dc71829..496f31939c4 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -1099,7 +1099,6 @@ "Low Priority": "Baixa prioridade", "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação", "Set Password": "Definir senha", - "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web", "Off": "Desativado", "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede", "Mentions only": "Apenas menções", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index 2ef28d03c61..21d35c1c286 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1123,7 +1123,6 @@ "Low Priority": "Низкий приоритет", "Unable to fetch notification target list": "Не удалось получить список устройств для уведомлений", "Set Password": "Задать пароль", - "Enable audible notifications in web client": "Включить звуковые уведомления в веб-клиенте", "Off": "Выключить", "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети", "Mentions only": "Только при упоминаниях", diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json index 5036699932a..b168ca1a3c0 100644 --- a/src/i18n/strings/sk.json +++ b/src/i18n/strings/sk.json @@ -1124,7 +1124,6 @@ "What's New": "Čo Je Nové", "Set Password": "Nastaviť Heslo", "An error occurred whilst saving your email notification preferences.": "Počas ukladania vašich nastavení oznamovania emailom sa vyskytla chyba.", - "Enable audible notifications in web client": "Povoliť zvukové oznámenia vo webovom klientovi", "Off": "Zakázané", "Riot does not know how to join a room on this network": "Riot nedokáže vstúpiť do miestnosti na tejto sieti", "Mentions only": "Len zmienky", diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json index 66f6f032b7d..3e0f10a20b5 100644 --- a/src/i18n/strings/sq.json +++ b/src/i18n/strings/sq.json @@ -268,7 +268,6 @@ "What's New": "Ç’ka të Re", "Set Password": "Caktoni Fjalëkalim", "An error occurred whilst saving your email notification preferences.": "Ndodhi një gabim teksa ruheshin parapëlqimet tuaja për njoftime me email.", - "Enable audible notifications in web client": "Aktivizoni njoftime audio te klienti web", "Register": "Regjistrohuni", "Off": "Off", "Edit": "Përpunoni", diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json index b8689454d43..862f79c7b4f 100644 --- a/src/i18n/strings/sr.json +++ b/src/i18n/strings/sr.json @@ -1099,7 +1099,6 @@ "What's New": "Шта је ново", "Set Password": "Постави лозинку", "An error occurred whilst saving your email notification preferences.": "Догодила се грешка при чувању ваших поставки мејл обавештења.", - "Enable audible notifications in web client": "Омогући звучна обавештења у веб клијенту", "Resend": "Поново пошаљи", "Riot does not know how to join a room on this network": "Riot не зна како да приступи соби на овој мрежи", "Mentions only": "Само спомињања", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 1ad48b27a38..7f7a94d8319 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -545,7 +545,6 @@ "Low Priority": "Låg prioritet", "Unable to fetch notification target list": "Det gick inte att hämta aviseringsmållistan", "Set Password": "Välj lösenord", - "Enable audible notifications in web client": "Sätt på högljudda aviseringar i webbklienten", "Off": "Av", "Riot does not know how to join a room on this network": "Riot kan inte gå med i ett rum på det här nätverket", "Mentions only": "Endast omnämnande", diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json index b8fe318b462..0e4cc50efb9 100644 --- a/src/i18n/strings/ta.json +++ b/src/i18n/strings/ta.json @@ -24,7 +24,6 @@ "Directory": "அடைவு", "Dismiss": "நீக்கு", "Download this file": "இந்த கோப்பைத் தரவிறக்கு", - "Enable audible notifications in web client": "இணைய வாங்கியில் ஒலி அறிவிப்புகளை ஏதுவாக்கு", "Enable desktop notifications": "திரை அறிவிப்புகளை ஏதுவாக்கு", "Enable email notifications": "மின்னஞ்சல் அறிவிப்புகளை ஏதுவாக்கு", "Enable notifications for this account": "இந்த கணக்கிற்கான அறிவிப்புகளை ஏதுவாக்கு", diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json index b6102a5eb5b..f183063fdb3 100644 --- a/src/i18n/strings/te.json +++ b/src/i18n/strings/te.json @@ -262,7 +262,6 @@ "Low Priority": "తక్కువ ప్రాధాన్యత", "Set Password": "రహస్యపదాన్నీ అమర్చండి", "An error occurred whilst saving your email notification preferences.": "మీ ఇమెయిల్ ప్రకటన ప్రాధాన్యాలు బద్రపరిచేతప్పుడు ఎదో తప్పు జరిగింది.", - "Enable audible notifications in web client": "వెబ్ బంట్రౌతు వినిపించే నోటిఫికేషన్లను ప్రారంభించండి", "Off": "ఆపు", "Mentions only": "మాత్రమే ప్రస్తావిస్తుంది", "Failed to remove tag %(tagName)s from room": "గది నుండి బొందు %(tagName)s తొలగించడంలో విఫలమైంది", diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json index 606c60e95ae..afbf3d8b031 100644 --- a/src/i18n/strings/th.json +++ b/src/i18n/strings/th.json @@ -542,7 +542,6 @@ "Low Priority": "ความสำคัญต่ำ", "Riot does not know how to join a room on this network": "Riot ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้", "Set Password": "ตั้งรหัสผ่าน", - "Enable audible notifications in web client": "เปิดใช้งานเสียงแจ้งเตือนบนเว็บไคลเอนต์", "Off": "ปิด", "#example": "#example", "Mentions only": "เมื่อถูกกล่าวถึงเท่านั้น", diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json index 1a8035a1db7..41e7e870ad2 100644 --- a/src/i18n/strings/tr.json +++ b/src/i18n/strings/tr.json @@ -739,7 +739,6 @@ "Low Priority": "Düşük Öncelikli", "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi", "An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.", - "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir", "Off": "Kapalı", "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor", "Mentions only": "Sadece Mention'lar", diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json index b07a5dadab6..fd7fdc9fbc9 100644 --- a/src/i18n/strings/uk.json +++ b/src/i18n/strings/uk.json @@ -231,7 +231,6 @@ "Low Priority": "Неважливі", "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення", "Set Password": "Задати пароль", - "Enable audible notifications in web client": "Увімкнути звукові сповіщення у мережевому застосунку", "Off": "Вимкнено", "Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі", "Mentions only": "Тільки згадки", diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json index 0fbd0a4ef3e..5bdcc86c1d9 100644 --- a/src/i18n/strings/zh_Hans.json +++ b/src/i18n/strings/zh_Hans.json @@ -1097,7 +1097,6 @@ "Low Priority": "低优先级", "Unable to fetch notification target list": "无法获取通知目标列表", "Set Password": "设置密码", - "Enable audible notifications in web client": "在网页客户端启用音频通知", "Off": "关闭", "Riot does not know how to join a room on this network": "Riot 不知道如何在此网络中加入聊天室", "Mentions only": "只限提及", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index ff7650b36f0..a6a03933b33 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1124,7 +1124,6 @@ "Low Priority": "低優先度", "Riot does not know how to join a room on this network": "Riot 不知道如何在此網路中加入聊天室", "Set Password": "設定密碼", - "Enable audible notifications in web client": "在網頁客戶端啟用音訊通知", "Off": "關閉", "#example": "#範例", "Mentions only": "僅提及", From e87080d7436e7c93bbabf032f773673c392d3648 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sun, 12 Aug 2018 14:22:19 +1200 Subject: [PATCH 2/3] Clarify setting label Add "in web/desktop client" to clarify that this does not affect Riot mobile. --- src/components/views/settings/Notifications.js | 2 +- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js index b50f99eb131..d06619a364f 100644 --- a/src/components/views/settings/Notifications.js +++ b/src/components/views/settings/Notifications.js @@ -882,7 +882,7 @@ module.exports = React.createClass({
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index a7615748598..ea49354b039 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -293,7 +293,7 @@ "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply", "Enable desktop notifications": "Enable desktop notifications", "Show message in desktop notification": "Show message in desktop notification", - "Enable audible notifications": "Enable audible notifications", + "Enable audible notifications in web/desktop client": "Enable audible notifications in web/desktop client", "Off": "Off", "On": "On", "Noisy": "Noisy", From e271beb73bc43d73f99dddc59c2823489cd1a314 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sat, 23 Mar 2019 17:10:41 +1300 Subject: [PATCH 3/3] Undo incorrect merge conflict resolutions --- src/i18n/strings/es.json | 6 +++--- src/i18n/strings/lt.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json index 5e98a403be3..fc4fb6cd855 100644 --- a/src/i18n/strings/es.json +++ b/src/i18n/strings/es.json @@ -710,13 +710,13 @@ "Yesterday": "Ayer", "Error encountered (%(errorDetail)s).": "Error encontrado (%(errorDetail)s).", "Login": "Iniciar sesión", - "Low Priority": "Prioridad Baja", + "Low Priority": "Baja Prioridad", "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red", "Set Password": "Establecer contraseña", "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web", - "Off": "Apagado", + "Off": "Desactivado", "#example": "#ejemplo", - "Mentions only": "Solo menciones", + "Mentions only": "Sólo menciones", "Failed to remove tag %(tagName)s from room": "Error al eliminar la etiqueta %(tagName)s de la sala", "Wednesday": "Miércoles", "You can now return to your account after signing out, and sign in on other devices.": "Ahora puedes regresar a tu cuenta después de cerrar tu sesión, e iniciar sesión en otros dispositivos.", diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json index 9dad366d3e9..776445e40da 100644 --- a/src/i18n/strings/lt.json +++ b/src/i18n/strings/lt.json @@ -109,7 +109,7 @@ "Failed to set Direct Message status of room": "Nepavyko nustatyti tiesioginio pranešimo kambario būklės", "Monday": "Pirmadienis", "All messages (noisy)": "Visos žinutės (triukšmingas)", - "Enable them now": "Įgalinti juos dabar", + "Enable them now": "Įjungti juos dabar", "Enable audible notifications in web client": "Įgalinti garsinius pranešimus internetinėje aplinkoje", "Messages containing my user name": "Žinutės, kuriose paminėtas mano naudotojo vardas", "Toolbox": "Įrankinė",