diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml index 4412e36f47829079fd8f7e9868346074fef59b1a..e88c81340b6fa858d02281879a9ab1e43ef26d06 100644 --- a/app/src/debug/res/values/strings.xml +++ b/app/src/debug/res/values/strings.xml @@ -19,6 +19,4 @@ <resources> <string name="app_name">QuasselTest</string> - - <string name="package_name" translatable="false">com.iskrembilen.quasseldroid.debug</string> </resources> diff --git a/app/src/debug/res/values/strings_constants.xml b/app/src/debug/res/values/strings_constants.xml new file mode 100644 index 0000000000000000000000000000000000000000..a53dfac109846e3efc1d6858eb577b8dc3cf8d99 --- /dev/null +++ b/app/src/debug/res/values/strings_constants.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="package_name" translatable="false">com.iskrembilen.quasseldroid.debug</string> +</resources> diff --git a/app/src/main/res/layout/fragment_info_channel.xml b/app/src/main/res/layout/fragment_info_channel.xml index 1e0a4ad5c79ad3e00f8c914b33f5293da0d5be1b..cf5888ba8f01aaf4b37008cabe9c5a5168eb6116 100644 --- a/app/src/main/res/layout/fragment_info_channel.xml +++ b/app/src/main/res/layout/fragment_info_channel.xml @@ -66,16 +66,16 @@ style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_edit_topic_long" android:text="@string/label_edit_topic" - tools:drawableTop="@drawable/ic_pencil" - tools:drawableTint="?colorTextSecondary" /> + tools:drawableTint="?colorTextSecondary" + tools:drawableTop="@drawable/ic_pencil" /> <androidx.appcompat.widget.AppCompatButton android:id="@+id/action_who" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_who_long" android:text="@string/label_who" - tools:drawableTop="@drawable/ic_info" - tools:drawableTint="?colorTextSecondary" /> + tools:drawableTint="?colorTextSecondary" + tools:drawableTop="@drawable/ic_info" /> <androidx.appcompat.widget.AppCompatButton android:id="@+id/action_join" @@ -92,8 +92,8 @@ style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_part_long" android:text="@string/label_part" - tools:drawableTop="@drawable/ic_account_minus" - tools:drawableTint="?colorTextSecondary" /> + tools:drawableTint="?colorTextSecondary" + tools:drawableTop="@drawable/ic_account_minus" /> <androidx.appcompat.widget.AppCompatButton android:id="@+id/action_shortcut" diff --git a/app/src/main/res/layout/fragment_info_user.xml b/app/src/main/res/layout/fragment_info_user.xml index 8f78aa6fa7f1f8c96efebdf5538ca95e9a634847..18b446d118356f594f02d1bf863db8d411bcafb8 100644 --- a/app/src/main/res/layout/fragment_info_user.xml +++ b/app/src/main/res/layout/fragment_info_user.xml @@ -107,8 +107,8 @@ style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_query_long" android:text="@string/label_query" - tools:drawableTop="@drawable/ic_message_bulleted" - tools:drawableTint="?colorTextSecondary" /> + tools:drawableTint="?colorTextSecondary" + tools:drawableTop="@drawable/ic_message_bulleted" /> <androidx.appcompat.widget.AppCompatButton android:id="@+id/action_ignore" @@ -116,8 +116,8 @@ android:contentDescription="@string/label_ignore_long" android:text="@string/label_ignore" android:visibility="gone" - tools:drawableTop="@drawable/ic_eye_off" tools:drawableTint="?colorTextSecondary" + tools:drawableTop="@drawable/ic_eye_off" tools:visibility="visible" /> <androidx.appcompat.widget.AppCompatButton @@ -125,16 +125,16 @@ style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_whois_long" android:text="@string/label_whois" - tools:drawableTop="@drawable/ic_info" - tools:drawableTint="?colorTextSecondary" /> + tools:drawableTint="?colorTextSecondary" + tools:drawableTop="@drawable/ic_info" /> <androidx.appcompat.widget.AppCompatButton android:id="@+id/action_mention" style="@style/Widget.Info.ActionButton" android:contentDescription="@string/label_mention_long" android:text="@string/label_mention" - tools:drawableTop="@drawable/ic_share_alternative" - tools:drawableTint="?colorTextSecondary" /> + tools:drawableTint="?colorTextSecondary" + tools:drawableTop="@drawable/ic_share_alternative" /> <androidx.appcompat.widget.AppCompatButton android:id="@+id/action_shortcut" diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7639a145a5c53a74c7c858c84a7b8bd5a9ce89b4..27ece87f07f29c396173c29ae1093e5d5bf73c7c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -34,6 +34,7 @@ <string name="label_cancel">Abbrechen</string> <string name="label_update_user_password">Benutzernamen/Passwort ändern</string> <string name="label_certificates">Zertifikate</string> + <string name="label_clear_search">Eingabe löschen</string> <string name="label_close">Schließen</string> <string name="label_colors_custom">Anpassen</string> <string name="label_colors_mirc">mIRC</string> @@ -47,6 +48,7 @@ <string name="label_delete">Löschen</string> <string name="label_delete_all">Alle Löschen</string> <string name="label_disconnect">Verbindung trennen</string> + <string name="label_edit_core">Account bearbeiten</string> <string name="label_edit_nick">Spitznamen bearbeiten</string> <string name="label_edit_topic">Thema ändern</string> <string name="label_edit_topic_long">Open dialog to change the channel topic</string> diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml index 80e796d0022806a7e6e5ec150dc2137443b10f89..a48568dd3e29b7cfe8aff09d7611ff65047d6ee1 100644 --- a/app/src/main/res/values-fr-rCA/strings.xml +++ b/app/src/main/res/values-fr-rCA/strings.xml @@ -17,7 +17,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. --> -<resources xmlns:tools="http://schemas.android.com/tools"> +<resources> <string name="app_name">Quasseldroid</string> <string name="app_description">Un client Android pour Quassel, un client IRC décentralisé.</string> <string name="app_description_long">Quassel est un client IRC distribué et décentralisé, écrit en C++ et en Qt. Quasseldroid est un client pour le Quassel Core écrit purement en Kotlin, vous offrant la possibilité de vous connecter à un Quassel Core avec votre téléphone Android™.</string> @@ -44,7 +44,6 @@ <string name="label_delete">Supprimer</string> <string name="label_delete_all">Supprimer Tout</string> <string name="label_disconnect">Déconnecter</string> - <string name="label_edit_nick">Changer le Nom d\'Utilisateur</string> <string name="label_edit_topic">Changer le Topique</string> <string name="label_edit_topic_long">Ouvrir un dialogue pour changer le topique de la chaîne</string> <string name="label_filter_messages">Filtrer les Messages</string> @@ -129,12 +128,11 @@ <string name="notification_channel_connection_title">Connection</string> <string name="label_missing_features">Fonctionnalités Manquantes</string> - <string name="info_missing_features" tools:ignore="StringFormatCount">Votre Core manque certaines fonctionnalités qui sont requises pour que Quasseldroid marche correctement.</string> - <string name="buffer_delete_confirmation">Voulez-vous supprimer ce tchat en permanence?</string> <string name="delete_confirmation">Êtes-vous surs que vous voulez supprimer ceci en permanence? Cette action ne peut pas être réparée.</string> <string name="cancel_confirmation">Vous avez des changements non-sauvegardés. Voulez-vous les abandonner?</string> <string name="info_copied_version">Version copiée au clipboard</string> + </resources> diff --git a/app/src/debug/res/values-de/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 91% rename from app/src/debug/res/values-de/strings.xml rename to app/src/main/res/values-it/strings.xml index c36fe03b9e1ff85ee2b030979aaf511777bcc8bc..c985cffecb48cbd75f82ef840f5613a04c314922 100644 --- a/app/src/debug/res/values-de/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -17,6 +17,4 @@ with this program. If not, see <http://www.gnu.org/licenses/>. --> -<resources> - <string name="app_name">QuasselTest</string> -</resources> +<resources></resources> diff --git a/app/src/main/res/values-it/strings_contributors.xml b/app/src/main/res/values-it/strings_contributors.xml new file mode 100644 index 0000000000000000000000000000000000000000..c985cffecb48cbd75f82ef840f5613a04c314922 --- /dev/null +++ b/app/src/main/res/values-it/strings_contributors.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_defaults.xml b/app/src/main/res/values-it/strings_defaults.xml new file mode 100644 index 0000000000000000000000000000000000000000..b37145ba1c4996d409846c479f670486cdc449db --- /dev/null +++ b/app/src/main/res/values-it/strings_defaults.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_error.xml b/app/src/main/res/values-it/strings_error.xml new file mode 100644 index 0000000000000000000000000000000000000000..c985cffecb48cbd75f82ef840f5613a04c314922 --- /dev/null +++ b/app/src/main/res/values-it/strings_error.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_format.xml b/app/src/main/res/values-it/strings_format.xml new file mode 100644 index 0000000000000000000000000000000000000000..c985cffecb48cbd75f82ef840f5613a04c314922 --- /dev/null +++ b/app/src/main/res/values-it/strings_format.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_info.xml b/app/src/main/res/values-it/strings_info.xml new file mode 100644 index 0000000000000000000000000000000000000000..c985cffecb48cbd75f82ef840f5613a04c314922 --- /dev/null +++ b/app/src/main/res/values-it/strings_info.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_messages.xml b/app/src/main/res/values-it/strings_messages.xml new file mode 100644 index 0000000000000000000000000000000000000000..c985cffecb48cbd75f82ef840f5613a04c314922 --- /dev/null +++ b/app/src/main/res/values-it/strings_messages.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_preferences.xml b/app/src/main/res/values-it/strings_preferences.xml new file mode 100644 index 0000000000000000000000000000000000000000..c985cffecb48cbd75f82ef840f5613a04c314922 --- /dev/null +++ b/app/src/main/res/values-it/strings_preferences.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_settings.xml b/app/src/main/res/values-it/strings_settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..c985cffecb48cbd75f82ef840f5613a04c314922 --- /dev/null +++ b/app/src/main/res/values-it/strings_settings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_setup.xml b/app/src/main/res/values-it/strings_setup.xml new file mode 100644 index 0000000000000000000000000000000000000000..0707ee8513a2fd49bf52fd9b86d1270c319d0534 --- /dev/null +++ b/app/src/main/res/values-it/strings_setup.xml @@ -0,0 +1,20 @@ +<!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-it/strings_status.xml b/app/src/main/res/values-it/strings_status.xml new file mode 100644 index 0000000000000000000000000000000000000000..c985cffecb48cbd75f82ef840f5613a04c314922 --- /dev/null +++ b/app/src/main/res/values-it/strings_status.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Quasseldroid - Quassel client for Android + + Copyright (c) 2019 Janne Koschinski + Copyright (c) 2019 The Quassel Project + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3 as published + by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources></resources> diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index c681c2ededbb0d3f8e3dbcac923b955df4a87275..bb0cbd728ed480a78e3be1c3f6f7e7da3c9828b9 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -44,7 +44,6 @@ <string name="label_delete">Ištrinti</string> <string name="label_delete_all">Ištrinti viską</string> <string name="label_disconnect">Atsijungti</string> - <string name="label_edit_nick">Keisti slapyvardį</string> <string name="label_edit_topic">Keisti temą</string> <string name="label_edit_topic_long">Atverti kanalo temos keitimo dialogą</string> <string name="label_filter_messages">Filtruoti žinutes</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 567792a7d1d8da3ed2db6a348a680839ef7c8092..7c05f8fd20e6a147e63f41ae5971e215a75c182d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -45,7 +45,6 @@ <string name="label_delete">Apagar</string> <string name="label_delete_all">Apagar Todos</string> <string name="label_disconnect">Desligar</string> - <string name="label_edit_nick">Editar alcunha</string> <string name="label_edit_topic">Editar Tópico</string> <string name="label_edit_topic_long">Abre a caixa de diálogo para alterar o tópico do canal</string> <string name="label_filter_messages">Filtrar Mensagens</string> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index d4f413a5c125c42b5a03962c036bd02a6d4cb03c..89bb0d75bc53d05c69f76e8b7285915b78202407 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -45,7 +45,6 @@ <string name="label_delete">Obriši</string> <string name="label_delete_all">Obriši sve</string> <string name="label_disconnect">Prekini vezu</string> - <string name="label_edit_nick">Izmeni nadimak</string> <string name="label_edit_topic">Izmeni temu</string> <string name="label_edit_topic_long">Otvori dijalog za mijenjanje teme kanala</string> <string name="label_filter_messages">Filtriraj poruke</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f3af61d2db8d81c9eed84c0676854fd9882d6f69..9e16b82203a8817a0a61917b18b91e8d93470d60 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,8 +22,6 @@ <string name="app_description">An Android-based client for the decentralized Quassel IRC client.</string> <string name="app_description_long">Quassel is a distributed, decentralized IRC client, written using C++ and Qt. Quasseldroid is a pure-kotlin client for the Quassel core, allowing you to connect to your Quassel core using your Android™ phone.</string> - <string name="package_name" translatable="false">com.iskrembilen.quasseldroid</string> - <string name="connection_service_title">Connection Service</string> <string name="connection_service_description">Keeps a connection to your core to allow for notifications, and to transmit messages.</string> @@ -157,11 +155,8 @@ <string name="label_feature_context_missing">Your core is missing features that are required for Quasseldroid to work correctly.</string> <string name="label_feature_context_missing_button">Details</string> - <string name="notification_channel_background" translatable="false">background</string> <string name="notification_channel_connection_title">Connection</string> - <string name="notification_channel_highlight" translatable="false">highlight</string> <string name="notification_channel_highlight_title">Highlights</string> - <string name="notification_channel_old_highlight" translatable="false">old_highlight</string> <string name="notification_channel_old_highlight_title">Old Highlights</string> <string name="label_missing_features">Missing Features</string> @@ -176,6 +171,4 @@ <string name="advertisement_support_patreon">Please help support the development of this app on Patreon</string> <string name="advertisement_support_button">Donate</string> - - <string name="drag_intercept_bottom_sheet_behavior" translatable="false">de.kuschku.quasseldroid.util.ui.DragInterceptBottomSheetBehavior</string> </resources> diff --git a/app/src/main/res/values/strings_constants.xml b/app/src/main/res/values/strings_constants.xml new file mode 100644 index 0000000000000000000000000000000000000000..171da684971bf13f3f4a8cd5a6d301d92dbe61f2 --- /dev/null +++ b/app/src/main/res/values/strings_constants.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="package_name" translatable="false">com.iskrembilen.quasseldroid</string> + + <string name="notification_channel_background" translatable="false">background</string> + <string name="notification_channel_highlight" translatable="false">highlight</string> + <string name="notification_channel_old_highlight" translatable="false">old_highlight</string> + + <string name="drag_intercept_bottom_sheet_behavior" translatable="false">de.kuschku.quasseldroid.util.ui.DragInterceptBottomSheetBehavior</string> +</resources>