From 80e83f77a7d983e48da631bf7b53dfa54cdb2b3b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 8 Jan 2020 19:05:12 +0100 Subject: [PATCH] pulled translations from transifex --- src/main/java/eu/siacs/conversations/Config.java | 1 + .../conversations/crypto/axolotl/XmppAxolotlMessage.java | 4 ++-- .../eu/siacs/conversations/http/HttpUploadConnection.java | 2 +- src/main/res/values-ar/strings.xml | 1 - src/main/res/values-de/strings.xml | 1 - src/main/res/values-el/strings.xml | 1 - src/main/res/values-es/strings.xml | 1 - src/main/res/values-eu/strings.xml | 1 - src/main/res/values-fr/strings.xml | 1 - src/main/res/values-gl/strings.xml | 1 - src/main/res/values-hu/strings.xml | 1 - src/main/res/values-it/strings.xml | 1 - src/main/res/values-nl/strings.xml | 1 - src/main/res/values-pl/strings.xml | 8 +++++++- src/main/res/values-pt-rBR/strings.xml | 1 - src/main/res/values-ro-rRO/strings.xml | 7 ++++++- src/main/res/values-uk/strings.xml | 1 - src/main/res/values-zh-rCN/strings.xml | 1 - 18 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index c106bf42b..f231cc4d5 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -100,6 +100,7 @@ public final class Config { public static final boolean REMOVE_BROKEN_DEVICES = false; public static final boolean OMEMO_PADDING = false; public static final boolean PUT_AUTH_TAG_INTO_KEY = true; + public static final boolean TWELVE_BYTE_IV = false; public static final boolean USE_BOOKMARKS2 = false; diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java index 853dc4bab..5a85e1157 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java @@ -165,8 +165,8 @@ public class XmppAxolotlMessage { } private static byte[] generateIv() { - SecureRandom random = new SecureRandom(); - byte[] iv = new byte[16]; + final SecureRandom random = new SecureRandom(); + byte[] iv = new byte[Config.TWELVE_BYTE_IV ? 12 : 16]; random.nextBytes(iv); return iv; } diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java index daa0c20c7..08fae1bc5 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java @@ -109,7 +109,7 @@ public class HttpUploadConnection implements Transferable { if (Config.ENCRYPT_ON_HTTP_UPLOADED || message.getEncryption() == Message.ENCRYPTION_AXOLOTL || message.getEncryption() == Message.ENCRYPTION_OTR) { - this.key = new byte[48]; + this.key = new byte[Config.TWELVE_BYTE_IV ? 44 : 48]; mXmppConnectionService.getRNG().nextBytes(this.key); this.file.setKeyAndIv(this.key); } diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index c09fcb195..25f653038 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -657,7 +657,6 @@ الأهمية ، الصوت ، الإهتزاز ضغط الفيديو اعرض الوسائط - اعرض المشارِكين المشارِكون جودة الفيديو متوسط (360ب) diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index a1076e8f2..9c2822015 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -751,7 +751,6 @@ Wichtigkeit, Klang, Vibrationen Video komprimieren Medien anzeigen - Teilnehmer anzeigen Teilnehmer Medienbrowser Datei wurde aufgrund von Sicherheitsverletzungen ausgelassen. diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 8395311ac..2453932b2 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -747,7 +747,6 @@ Σημασία, Ήχος, Δόνηση Συμπίεση βίντεο Εμφάνιση μέσου - Εμφάνιση συμμετεχόντων Συμμετέχοντες Περιηγητης μέσων Το αρχείο παραλείπεται λόγω παραβίασης ασφάλειας. diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 02fd7f855..9ef58cda8 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -751,7 +751,6 @@ Importancia, Sonido, Vibración Compresión de video Ver galería - Ver participantes Participantes Galería Fichero omitido por violación de seguridad diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 247d0e13a..6366f3809 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -746,7 +746,6 @@ Garrantzia, soinua, dardara Bideoen konprimatzea Ikusi multimedia - Parte-hartzaileak ikusi Parte-hartzaileak Multimedia nabigatzailea Fitxategia alde batera utzita segurtasun hauste bategatik. diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 5cbaa6e69..aeadabaf2 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -749,7 +749,6 @@ Importance, son, vibration Compression vidéo Voir les média - Voir les participants Participants Navigateur de média Fichier omis en raison d\'une violation de la sécurité. diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 53cb075e5..c26851121 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -751,7 +751,6 @@ Importancia, Son, Vibrar Compresión de vídeo Ver medios - Ver participantes Participantes Navegador de medios Ficheiro omitido debido a transgresión da seguridade. diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 44adbbc1f..7dd041b14 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -751,7 +751,6 @@ Fontosság, hang, rezgés Videó tömörítése Média megtekintése - Résztvevők megtekintése Résztvevők Médiaböngésző A fájl ki lett hagyva a biztonság megsértése miatt. diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 105179733..2f46b3017 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -751,7 +751,6 @@ Importanza, suono, vibrazione Compressione video Vedi i media - Vedi i partecipanti Partecipanti Browser multimediale File omesso per violazione di sicurezza. diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index bf7da9372..3f2dcb4db 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -748,7 +748,6 @@ Belang, geluid, trillen Videocompressie Media bekijken - Deelnemers bekijken Deelnemers Mediabrowser Bestand weggelaten wegens beveiligingsovertreding. diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 797bc1fca..cb386b427 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -769,7 +769,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż Ważność, Dźwięk, Wibracja Kompresja wideo Pokaż media - Pokaż członków Uczestnicy Przeglądarka mediów Plik pominięty w związku z naruszeniem bezpieczeństwa. @@ -898,4 +897,11 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż Metoda odkrywania kanałów Kopia zapasowa O aplikacji + + Pokaż %1$d uczestnika + Pokaż %1$d uczestników + Pokaż %1$d uczestników + Pokaż %1$d uczestników + + © autorzy OpenStreetMap diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 9e502563e..f91a0a4b2 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -751,7 +751,6 @@ Importância, som, vibração. Compressão de vídeo Ver mídia - Ver participantes Participantes Navegador de mídia Arquivo omitido devido a violação de segurança diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index 129966633..21b92b5c5 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -761,7 +761,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați Importanță, sunete, vibrații Compresie video Vizualizare fișiere media - Arată participanții Participanți Vizualizare fișiere media Fișier omis ca urmare a unei probleme de securitate. @@ -890,4 +889,10 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați Metoda de descoperire a canalelor Copie de siguranță Despre + + Arată %1$d participant + Arată %1$d participanți + Arată %1$d de participanți + + © Colaboratorii OpenStreetMap diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 8750b4860..1c8b2e762 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -761,7 +761,6 @@ Важливість, звук, вібрація Стиснення відео Перегляд медіа - Переглянути учасників Учасники Переглядач медіа Файл пропущено через порушення безпеки. diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 85a37fe86..0bb284ed2 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -740,7 +740,6 @@ 重要性，声音，振动 视频压缩 查看媒体文件 - 查看成员 成员 媒体浏览器 文件由于违反安全策略而被删除。