From 1b3406cdbb6c620cca975b0bc32b43b60fa246cb Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 7 Feb 2019 21:11:50 +0100 Subject: provide the same fab submenu for both tabs. rename tab to bookmark --- src/main/res/drawable-hdpi/ic_add_white_24dp.png | Bin 0 -> 120 bytes .../res/drawable-hdpi/ic_public_white_24dp.png | Bin 0 -> 774 bytes src/main/res/drawable-mdpi/ic_add_white_24dp.png | Bin 0 -> 141 bytes .../res/drawable-mdpi/ic_public_white_24dp.png | Bin 0 -> 607 bytes src/main/res/drawable-xhdpi/ic_add_white_24dp.png | Bin 0 -> 180 bytes .../res/drawable-xhdpi/ic_public_white_24dp.png | Bin 0 -> 1231 bytes src/main/res/drawable-xxhdpi/ic_add_white_24dp.png | Bin 0 -> 191 bytes .../res/drawable-xxhdpi/ic_public_white_24dp.png | Bin 0 -> 1608 bytes .../res/drawable-xxxhdpi/ic_add_white_24dp.png | Bin 0 -> 309 bytes .../res/drawable-xxxhdpi/ic_public_white_24dp.png | Bin 0 -> 3975 bytes .../res/layout/activity_start_conversation.xml | 6 +-- src/main/res/layout/create_conference_dialog.xml | 2 +- .../res/layout/create_public_channel_dialog.xml | 56 +++++++++++++++++++++ src/main/res/layout/dialog_join_conference.xml | 4 +- src/main/res/layout/enter_jid_dialog.xml | 2 +- src/main/res/menu/conference_context.xml | 3 -- .../res/menu/start_conversation_fab_submenu.xml | 19 +++++++ src/main/res/menu/start_conversation_group_fab.xml | 11 ---- src/main/res/values-ar/strings.xml | 8 +-- src/main/res/values-bg/strings.xml | 2 +- src/main/res/values-ca/strings.xml | 6 +-- src/main/res/values-ceb/strings.xml | 8 +-- src/main/res/values-cs/strings.xml | 2 +- src/main/res/values-de/strings.xml | 8 +-- src/main/res/values-es/strings.xml | 8 +-- src/main/res/values-eu/strings.xml | 6 +-- src/main/res/values-fil/strings.xml | 8 +-- src/main/res/values-fr/strings.xml | 8 +-- src/main/res/values-gl/strings.xml | 6 +-- src/main/res/values-id/strings.xml | 8 +-- src/main/res/values-it/strings.xml | 8 +-- src/main/res/values-nl/strings.xml | 6 +-- src/main/res/values-pl/strings.xml | 8 +-- src/main/res/values-ro/strings.xml | 8 +-- src/main/res/values-ru/strings.xml | 6 +-- src/main/res/values-sv/strings.xml | 2 +- src/main/res/values-tl/strings.xml | 2 +- src/main/res/values-tr/strings.xml | 8 +-- src/main/res/values/strings.xml | 36 ++++++++----- 39 files changed, 169 insertions(+), 96 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_add_white_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_public_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_add_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_public_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_add_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_public_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_add_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_public_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_public_white_24dp.png create mode 100644 src/main/res/layout/create_public_channel_dialog.xml create mode 100644 src/main/res/menu/start_conversation_fab_submenu.xml delete mode 100644 src/main/res/menu/start_conversation_group_fab.xml (limited to 'src/main/res') diff --git a/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_add_white_24dp.png new file mode 100644 index 000000000..bcd24f2d9 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_public_white_24dp.png b/src/main/res/drawable-hdpi/ic_public_white_24dp.png new file mode 100644 index 000000000..242c0de59 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_public_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/src/main/res/drawable-mdpi/ic_add_white_24dp.png new file mode 100644 index 000000000..c5d5ae2fe Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_public_white_24dp.png b/src/main/res/drawable-mdpi/ic_public_white_24dp.png new file mode 100644 index 000000000..5b99884ad Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_public_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xhdpi/ic_add_white_24dp.png new file mode 100644 index 000000000..d7540be50 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_public_white_24dp.png b/src/main/res/drawable-xhdpi/ic_public_white_24dp.png new file mode 100644 index 000000000..800b7dbf9 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_public_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png new file mode 100644 index 000000000..d1c0a1d79 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_public_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_public_white_24dp.png new file mode 100644 index 000000000..b8c8448a2 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_public_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png new file mode 100644 index 000000000..54a96a38a Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_public_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_public_white_24dp.png new file mode 100644 index 000000000..7fb0b9929 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_public_white_24dp.png differ diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml index f5ca18b5a..2a77e6654 100644 --- a/src/main/res/layout/activity_start_conversation.xml +++ b/src/main/res/layout/activity_start_conversation.xml @@ -47,9 +47,9 @@ android:layout_alignParentBottom="true" app:backgroundTint="?attr/colorAccent" app:sdMainFabClosedBackgroundColor="?attr/colorAccent" - app:sdMainFabClosedSrc="@drawable/ic_person_add_white_24dp" + app:sdMainFabClosedSrc="@drawable/ic_add_white_24dp" app:sdMainFabOpenedBackgroundColor="?attr/colorAccent" - app:sdMainFabOpenedSrc="@drawable/ic_close_white_24dp" - app:sdOverlayLayout="@id/overlay" /> + app:sdOverlayLayout="@id/overlay" + app:sdUseReverseAnimationOnClose="true" /> \ No newline at end of file diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml index 85a4cbf89..fc4aefaf5 100644 --- a/src/main/res/layout/create_conference_dialog.xml +++ b/src/main/res/layout/create_conference_dialog.xml @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/create_dialog_group_chat_name" - android:imeOptions="actionNext" /> + android:imeOptions="actionNext|flagNoExtractUi" /> \ No newline at end of file diff --git a/src/main/res/layout/create_public_channel_dialog.xml b/src/main/res/layout/create_public_channel_dialog.xml new file mode 100644 index 000000000..a409cde37 --- /dev/null +++ b/src/main/res/layout/create_public_channel_dialog.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/dialog_join_conference.xml b/src/main/res/layout/dialog_join_conference.xml index 27acefc4a..3d8478a34 100644 --- a/src/main/res/layout/dialog_join_conference.xml +++ b/src/main/res/layout/dialog_join_conference.xml @@ -31,7 +31,7 @@ android:id="@+id/account_jid_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/conference_address" + android:hint="@string/xmpp_address" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> @@ -40,7 +40,7 @@ style="@style/Widget.Conversations.EditText" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:imeOptions="actionDone" + android:imeOptions="actionDone|flagNoExtractUi" android:inputType="textEmailAddress" /> diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml index 11f673916..932868771 100644 --- a/src/main/res/layout/enter_jid_dialog.xml +++ b/src/main/res/layout/enter_jid_dialog.xml @@ -40,7 +40,7 @@ style="@style/Widget.Conversations.EditText" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:imeOptions="actionDone" + android:imeOptions="actionDone|flagNoExtractUi" android:inputType="textEmailAddress" android:textColor="?attr/text_Color_Main" /> diff --git a/src/main/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml index 051a468d4..dbc6ebfa6 100644 --- a/src/main/res/menu/conference_context.xml +++ b/src/main/res/menu/conference_context.xml @@ -1,9 +1,6 @@ - diff --git a/src/main/res/menu/start_conversation_fab_submenu.xml b/src/main/res/menu/start_conversation_fab_submenu.xml new file mode 100644 index 000000000..212a94a7e --- /dev/null +++ b/src/main/res/menu/start_conversation_fab_submenu.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/res/menu/start_conversation_group_fab.xml b/src/main/res/menu/start_conversation_group_fab.xml deleted file mode 100644 index 9eb95bc03..000000000 --- a/src/main/res/menu/start_conversation_group_fab.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index f7a5e4e40..a8243c3c0 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -17,7 +17,7 @@ إلغاء حجب اسم النطاق إدارة الحسابات الإعدادات - تفاصيل فريق المحادثة + تفاصيل فريق المحادثة تفاصيل المُراسِل شارك بواسطة بيكسل آرت ماسنجر الشروع في محادثة @@ -166,7 +166,7 @@ بحث انشاء مُراسِل أدخل مراسلا - الالتحاق بفريق المحادثة + الالتحاق بفريق المحادثة حذف المراسِل عرض تفاصيل المُراسِل حجب مُراسِل @@ -175,7 +175,7 @@ اختيار الانضمام عنوان فريق المحادثة - groupchat@room.pix-art.de + groupchat@room.pix-art.de أضفه كفاصلة مرجعية حذف الفاصلة المرجعية تعديل موضوع فريق المحادثة @@ -356,7 +356,7 @@ مغادرة المحادثة الجماعية إظهار الكلمة السرية فشلت عملية إنشاء الحساب: إنّ الكلمة السرية ضعيفة - انشاء محادثة جماعية + انشاء محادثة جماعية الموضوع اختر المشاركين عملية انشاء فريق المحادثة جارية… diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 448844ac8..69213d000 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -13,7 +13,7 @@ Разблокираи доминио Управление на профили Настройки - Детаили на чат групата + Детаили на чат групата Детайли на контакта Сподели със конверсация Започнете Разговор diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 244eb7196..af9910453 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -195,7 +195,7 @@ Cercar Crea un contacte Introduïu un contacte - Uniu-vos al xat en grup + Uniu-vos al xat en grup Suprimeix el contacte Veure els detalls dels contactes Bloqueja contacte @@ -205,7 +205,7 @@ El contacte ja existeix Unir-se Direcció del xat de grup - room@conference.example.com/nick + room@conference.example.com/nick Guardar com a favorits Eliminar de favorits Aquesta llista de favorits ja existeix @@ -500,7 +500,7 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa. Ensenya la contrasenya Error de registre: torna-ho a provar més tard Ha fallat la inscripció: la contrasenya és massa feble - Crea un xat en grup + Crea un xat en grup Subjecte Tria els participants S\'està creant el xat en grup... diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml index eef95dc51..f227b1995 100644 --- a/src/main/res/values-ceb/strings.xml +++ b/src/main/res/values-ceb/strings.xml @@ -17,7 +17,7 @@ Ayaw i-block ang domain Pagdumala sa mga account Mga pagtakda - Mga detalyi sa Group chat + Mga detalyi sa Group chat Mga detalyi sa kontak Ipakigbahin ang gepanag-estoryahan Pagsugod sa Panag-estorya @@ -208,7 +208,7 @@ Pangita Buhat ug kontak Isulod ang kontak - Apil sa group chat + Apil sa group chat Tangtanga ang kontak Tan-awa ang mga detayi sa kontak I-block ang kontak @@ -218,7 +218,7 @@ Ang kontak kay naa na daan Apil Address sa group chat - groupchat@room.pix-art.de + groupchat@room.pix-art.de Sagupa ingun sa bookmark Tangtanga ang bookmark Ang kini nga bookmark kay naa na daan @@ -492,7 +492,7 @@ Ipakita ang password Napakyas ang pagrehistro: Sulayi pag-usab taud-taud Ang pag-rehistro napakyas: Ang password sobra ra ka-huyang - Buhat ug grupo sa chat + Buhat ug grupo sa chat Subject Pili ug mga partisipante Nagbuhat ug grupo sa chat… diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index fd2478b24..913ed3e7f 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -192,7 +192,7 @@ Vybrat Kontakt již existuje Vstoupit - room@conference.example.com/nick + room@conference.example.com/nick Uložit jako záložku Smazat záložku Tato záložka již existuje diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index b1a09c773..32770eb13 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -17,7 +17,7 @@ Domain entsperren Profile verwalten Einstellungen - Gruppenchat-Details + Gruppenchat-Details Kontakt-Details Mit Unterhaltung teilen Unterhaltung beginnen @@ -214,7 +214,7 @@ Suchen Kontakt hinzufügen Kontakt eingeben - Gruppenchat beitreten + Gruppenchat beitreten Kontakt löschen Kontakt-Details anzeigen Kontakt sperren @@ -224,7 +224,7 @@ Der Kontakt existiert bereits Beitreten Gruppenchat-Adresse - gruppenchat@room.pix-art.de + gruppenchat@room.pix-art.de Zur Kontaktliste hinzufügen Von Kontaktliste entfernen Die Konferenz befindet sich bereits auf deiner Kontaktliste @@ -557,7 +557,7 @@ Passwort anzeigen Registrierung fehlgeschlagen: Bitte später versuchen Registrierung fehlgeschlagen: Passwort zu schwach - Gruppenchat erstellen + Gruppenchat erstellen Titel Mitglieder auswählen Gruppenchat wird erstellt… diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 14b42b602..f503e8444 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -17,7 +17,7 @@ Desbloquear dominio Gestionar Cuentas Ajustes - Detalles del chat de grupo + Detalles del chat de grupo Detalles del contacto Compartir con Conversación Comenzar conversación @@ -214,7 +214,7 @@ Buscar Crear Contacto Introducir contacto - Únete al grupo + Únete al grupo Eliminar Contacto Ver detalles del contacto Bloquear contacto @@ -224,7 +224,7 @@ El contacto ya existe Unirse Dirección del chat de grupo - grupo@room.pix-art.de + grupo@room.pix-art.de Guardar en marcadores Eliminar marcador Este marcador ya existe @@ -557,7 +557,7 @@ Mostrar contraseña El registro falló. Prueba de nuevo más tarde Error en el registro: La contraseña es demasiado débil - Crear grupo + Crear grupo Asunto Elige a los participantes Crear chat de grupo… diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 38ffee53c..7b37e7031 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -195,7 +195,7 @@ Bilatu Kontaktua sortu Kontaktua sartu - Taldera batu + Taldera batu Kontaktua ezabatu Kontaktuaren xehetasunak ikusi Kontaktua blokeatu @@ -205,7 +205,7 @@ Kontaktua existitzen da dagoeneko Batu Taldearen helbidea - gela@konferentzia.adibidea.eus/ezizena + gela@konferentzia.adibidea.eus/ezizena Gorde laster-marka bezala Laster-marka ezabatu Laster-marka hau existitzen da dagoeneko @@ -487,7 +487,7 @@ Pasahitza erakutsi Erregistroak huts egin du: saiatu berriz beranduago Erregistroa huts egin du: pasahitza ahulegia da - Taldea sortu + Taldea sortu Gaia Parte hartzaileak hautatu Taldea sortzen… diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml index 34c2295d2..cbd906792 100644 --- a/src/main/res/values-fil/strings.xml +++ b/src/main/res/values-fil/strings.xml @@ -17,7 +17,7 @@ Wag harangan ang domain Mamahala ng mga account Mga setting - Grupo ng detalye sa chat + Grupo ng detalye sa chat Mga detalyi sa kontak Ibahagi ang pag-uusap Simulan ang pag-uusap @@ -208,7 +208,7 @@ Magsaliksik Gumawa ng kontak Ipasok na kontak - Sumali sa pang-grupong chat + Sumali sa pang-grupong chat Burahin ang kontak Tingnan ang mga detalye sa kontak Harangan ang kontak @@ -218,7 +218,7 @@ Mayroon ng kontak na umiiral Sumali Address ng grupong chat - groupchat@room.pix-art.de + groupchat@room.pix-art.de I-save bilang bookmark Burahin na bookmark Umiiral na ang bookmark @@ -531,7 +531,7 @@ Ipakita ang password Nabigo ang pagpaparehistro: Subukang muli sa ibang pagkakataon Nabigo ang pagpaparehistro: Mahina ang password - Lumikha ng grupo ng chat + Lumikha ng grupo ng chat Paksa Pumili ng mga kalahok Paglikha ng grupo ng chat… diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 6aeae1d1c..ad68f63e7 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -17,7 +17,7 @@ Débloquer le domaine Gestion des comptes Paramètres - Détails de la conférence + Détails de la conférence Détails du contact Partager avec Conversation Démarrer une conversation @@ -213,7 +213,7 @@ Rechercher Ajouter un contact Ajouter contact - Rejoindre une conférence + Rejoindre une conférence Supprimer le contact Afficher les détails du contact Bloquer le contact @@ -223,7 +223,7 @@ Le contact existe déjà. Rejoindre Adresse de la conférence - groupchat@room.pix-art.de + groupchat@room.pix-art.de Enregistrer comme favori Supprimer le favori Le favori existe déjà @@ -553,7 +553,7 @@ Afficher le mot de passe L’enregistrement a échoué : Réessayer plus tard Échec de l’enregistrement : le mot de passe n’est pas assez fort - Créer une conférence + Créer une conférence Objet Choisir les participants Création de la conférence … diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index e618a5a5e..a8f118de2 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -195,7 +195,7 @@ Buscar Crear unha conta Introducir contacto - Entrar nunha conversa en grupo + Entrar nunha conversa en grupo Eliminar contacto Ver os detalles do contacto Bloquear contacto @@ -205,7 +205,7 @@ Xa existe o contacto Unirse Enderezo da conversa en grupo - sala@xuntanza.exemplo.com/nick + sala@xuntanza.exemplo.com/nick Gardar como marcador Eliminar marcador Este marcador xa existe @@ -487,7 +487,7 @@ Mostar contrasinal Fallo no rexistro: inténteo de novo Fallo no rexistro: contrasinal moi feble - Crear conversa en grupo + Crear conversa en grupo Asunto Escoller participantes Creando unha conversa en grupo... diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index 5294d46ca..5871a3d75 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -17,7 +17,7 @@ Buka blokir halaman Kelola akun Pengaturan - Rincian chat kelompok + Rincian chat kelompok Rincian kontak Berbagi dengan percakapan Mulai percakapan @@ -208,7 +208,7 @@ Pencarian Buat kontak Masukkan kontak - Gabung kelompok obrolan + Gabung kelompok obrolan Menghapus kontak Lihat rincian kontak Blokir kontak @@ -218,7 +218,7 @@ Kontak sudah uda Gabung Alamat obrolan kelompok - obrolankelompok@room.pix-art.de + obrolankelompok@room.pix-art.de Simpan sebagai penanda Hapus penanda Penanda ini sudah ada @@ -528,7 +528,7 @@ Tampilkan kata sandi Pendaftaran gagal: Coba lagi nanti Pendaftaran gagal: Kata sandi terlalu lemah - Buat obrolan kelompok + Buat obrolan kelompok Perihal Pilih peserta Membuat obrolan kelompok… diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 85886cec0..679e832ae 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -17,7 +17,7 @@ Sblocca dominio Gestisci account Impostazioni - Dettagli della conversazione di gruppo + Dettagli della conversazione di gruppo Dettagli del Contatto Condividi con Conversation Inizia una conversazione @@ -214,7 +214,7 @@ Cerca Crea contatto Inserisci contatto - Unisciti alla conversazione di gruppo + Unisciti alla conversazione di gruppo Elimina contatto Mostra dettagli contatto Blocca contatto @@ -224,7 +224,7 @@ Il contatto esiste già Entra Indirizzo della conversazione di gruppo - stanza@conferenza.esempio.com/nick + stanza@conferenza.esempio.com/nick Salva come segnalibro Elimina segnalibro Questo segnalibro esiste già @@ -557,7 +557,7 @@ Mostra la password Registrazione fallita: riprova più tardi Registrazione fallita: password troppo debole - Crea conversazione di gruppo + Crea conversazione di gruppo Soggetto Scegli i partecipanti Creazione conversazione di gruppo… diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index e20d09aca..deb72a3b4 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -195,7 +195,7 @@ Zoeken Contact aanmaken Contact invoeren - Deelnemen aan groepsgesprek + Deelnemen aan groepsgesprek Contact verwijderen Contactgegevens bekijken Contact blokkeren @@ -205,7 +205,7 @@ Het contact bestaat al Deelnemen Gespreksadres - ruimte@groepsgesprek.voorbeeld.be/naam + ruimte@groepsgesprek.voorbeeld.be/naam Opslaan als bladwijzer Bladwijzer verwijderen Deze bladwijzer bestaat al @@ -484,7 +484,7 @@ Wachtwoord weergeven Registratie mislukt: probeer later opnieuw Registratie mislukt: wachtwoord te zwak - Groepsgesprek aanmaken + Groepsgesprek aanmaken Onderwerp Kies deelnemers Groepsgesprek aanmaken… diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 947f3b5df..e4db7e860 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -17,7 +17,7 @@ Odblokuj domenę Zarządzaj kontami Ustawienia - Szczegóły czatu grupowego + Szczegóły czatu grupowego Szczegóły kontaktu Udostępnij w konwersacji Rozpocznij konwersację @@ -215,7 +215,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze Szukaj Utwórz kontakt Wpisz kontakt - Dołącz do czatu grupowego + Dołącz do czatu grupowego Usuń kontakt Szczegóły kontaktu Zablokuj kontakt @@ -225,7 +225,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze Kontakt już istnieje Dołącz Adres czatu grupowego - konferencja@konferencje.example.com/nick + konferencja@konferencje.example.com/nick Dodaj jako zakładkę Usuń zakładkę Zakładka już istnieje @@ -538,7 +538,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze Pokaż hasło Rejestracja nie powiodła się. Spróbuj później Rejestracja nie powiodła się: hasło zbyt słabe - Utwórz czat grupowy + Utwórz czat grupowy Temat Wybierz uczestnika Importować backup diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml index 0159d2862..7f0cbd8ae 100644 --- a/src/main/res/values-ro/strings.xml +++ b/src/main/res/values-ro/strings.xml @@ -17,7 +17,7 @@ Deblochează domeniu Configurează conturile Setări - Detalii discuție de grup + Detalii discuție de grup Detalii contact Partajează într-o conversație Pornește o conversație @@ -198,7 +198,7 @@ Caută Creează contact Introdu contact - Alătură-te unei discuții de grup + Alătură-te unei discuții de grup Șterge contact Arată detalii contact Blochează contact @@ -208,7 +208,7 @@ Contactul exista deja Alatura-te Adresă discuție de grup - grupchat@room.pix-art.de + grupchat@room.pix-art.de Salvează semn de carte Șterge semn de carte Acest semn de carte exista @@ -505,7 +505,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați Arată parola Înregistrare eșuată: Încercați din nou mai târziu Înregistrare eșuată: Parolă nesigură - Creează discuție de grup + Creează discuție de grup Subiect Alege participanți Se creează discuția de grup... diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 5de6f6fc8..ef42a141e 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -17,7 +17,7 @@ Разблокировать домен Управление аккаунтами Настройки - Информация о конференции + Информация о конференции Сведения о контакте Поделиться с разговором Начать Разговор @@ -211,7 +211,7 @@ Поиск Создать Контакт Введите Контакт - Присоединиться к групповому чату + Присоединиться к групповому чату Удалить Контакт Просмотреть детали контакта Заблокировать контакт @@ -221,7 +221,7 @@ Контакт уже существует Присоединиться Адрес группового чата - groupchat@room.pix-art.de + groupchat@room.pix-art.de Сохранить как закладку Удалить закладку Эта закладка уже создана diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 152373b69..040b5ea2b 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -196,7 +196,7 @@ Välj Kontakten finns redan Gå med - room@conference.example.com/nick + room@conference.example.com/nick Spara som bokmärke Ta bort bokmärke Detta bokmärke finns redan diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml index 3bbb58321..c70f6416e 100644 --- a/src/main/res/values-tl/strings.xml +++ b/src/main/res/values-tl/strings.xml @@ -17,7 +17,7 @@ Walang harang na domain Ang mga account ay pamahalaan Settings - Mga detalye ng kagrupo sa chat + Mga detalye ng kagrupo sa chat Mga detalye ng pagkontak Pag-uusap ay binahagi Simula na pag-uusap diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 5d26cb337..1bfe1f37a 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -17,7 +17,7 @@ Domainin engelini kaldır Hesapları Yönet Ayarlar - Grup sohbeti Detayları + Grup sohbeti Detayları Kişi Detayları Sohbetle Paylaş Konuşmayı Başlat @@ -208,7 +208,7 @@ Ara Kişi oluştur İletişim Kur - Grup sohbetine katıl + Grup sohbetine katıl Kişiyi sil Kişi ayrıntılarını görün Kişiyi engelleyin @@ -218,7 +218,7 @@ Kişi zaten mevcut Katıl Grup sohbeti adresi - groupchat@room.pix-art.de + groupchat@room.pix-art.de Yer imi olarak kaydet Yer imini sil Bu yer işareti zaten var @@ -531,7 +531,7 @@ Parolayı göster Kayıt başarısız: Daha sonra tekrar deneyin Kayıt başarısız oldu: Şifre çok zayıf - Grup sohbeti oluştur + Grup sohbeti oluştur Konu Katılımcıları seç Grup sohbeti oluşturuluyor… diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7e6fad360..886f9a7ba 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -14,19 +14,19 @@ Unblock contact Block domain Unblock domain - Manage Accounts + Manage accounts Settings - Group chat Details - Contact Details - Share with Conversation - Start Conversation + Group chat details + Contact details + Share with conversation + Start conversation Choose contact - Choose Contacts + Choose contacts Block list just now 1 min ago %d mins ago - unread Conversations + unread conversations sending… Decrypting message. Please wait… OpenPGP encrypted message @@ -209,11 +209,10 @@ Done Verify Decrypt - Group chats + Bookmarks Search Create Contact Enter Contact - Join group chat Delete Contact View contact details Block contact @@ -222,8 +221,8 @@ Select The contact already exists Join - Group chat address - groupchat@room.pix-art.de + channel@conference.example.com/nick + channel@conference.example.com Save as bookmark Delete bookmark This bookmark already exists @@ -557,7 +556,6 @@ Show password Registration failed: Try again later Registration failed: Password too weak - Create group chat Subject Choose participants Creating group chat… @@ -875,4 +873,18 @@ Join group chat Create group chat Message was deleted + Channel details + Join public channel + Create private group chat + Create public channel + Channel name + XMPP address + Please provide a name for the channel + Please provide an XMPP address + This is an XMPP address. Please provide a name. + Creating public channel… + This channel already exits + You\'ve joined an existing channel + Unable to set channel configuration + Back -- cgit v1.2.3