Merge branch 'develop' into patch-1

README.md

@@ -14,9 +14,8 @@ This repository contains all the code related to the Android native application
 
 ## How to build
 
-- You need to download the latest [Android Studio Preview](https://developer.android.com/studio/preview/) version since the stable IDE version does not support the [JetPack](https://developer.android.com/jetpack/) that is being used on this application.
 - Make sure that you have the latest **Gradle** and the **Android plugin** versions installed. Go to `File > Project Structure > Project` and make sure that you have the latest versions installed. Refer [this](https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle) to see the compatible versions.
-- Kotlin is already configured in the project. To check, go to `Tools > Kotlin > Configure Kotlin in project`. A message saying Kotlin is already configured in the project pops up. You can update Kotlin to the latest version by going to `Tools > Kotlin > Configure Kotlin updates` and download the latest version of Kotlin.
+- Kotlin is already configured in the project. To check, go to `Tools > Kotlin > Configure Kotlin in project`. A message saying kotlin is already configured in the project pops up. You can update kotlin to the latest version by going to `Tools > Kotlin > Configure Kotlin updates` and download the latest version of kotlin.
 
 ### SDK Instructions
 

app/src/main/res/values-de/strings.xml

@@ -14,21 +14,25 @@
     <string name="title_members">Benutzer</string>
     <string name="title_counted_members">Benutzer (%d)</string>
     <string name="title_settings">Einstellungen</string>
-    <string name="title_preferences">Einstellungen</string>
+
+    <string name="title_preferences">Eigenschaften</string>
     <string name="title_change_password">Ändere Passwort</string>
     <string name="title_rate_us">Bewerten Sie uns</string>
     <string name="title_admin_panel">Administrationsmenü</string>
+
     <string name="title_password">Ändere Passwort</string>
     <string name="title_update_profile">Update Profil</string>
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
-    <string name="title_are_you_sure">Bist du sicher?</string>
+
+    <string name="title_are_you_sure">Sind Sie sicher?</string>
     <string name="title_channel_details">Channel-Details</string>
     <string name="title_topic">Thema</string>
     <string name="title_announcement">Ankündigung</string>
     <string name="title_description">Beschreibung</string>
     <string name="title_licence">Lizenz</string>
 
+
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
     <string name="action_use_this_username">Benutze den Benutzernamen</string>
@@ -40,7 +44,9 @@
     <string name="action_create_channel">Erstelle Raum</string>
     <string name="action_create">Erstelle</string>
     <string name="action_logout">Abmelden</string>
+
     <string name="action_attach_a_files">Eine Datei anhängen</string>
+  
     <string name="action_confirm_password">Bestätige Passwort Änderung</string>
     <string name="action_join_chat">Trete Chat bei</string>
     <string name="action_add_account">Erstelle Account</string>
@@ -50,25 +56,27 @@
     <string name="action_invisible">Unsichtbar</string>
     <string name="action_drawing">Zeichnung</string>
     <string name="action_save_to_gallery">Sichern in Gallerie</string>
+
     <string name="action_select_photo_from_gallery">Foto aus der Galerie auswählen</string>
-    <string name="action_take_a_photo">Mach ein Foto</string>
+    <string name="action_take_a_photo">Ein Foto aufnehmen und senden</string>
     <string name="action_reset_avatar">Avatar zurücksetzen</string>
     <string name="action_connect_server">Verbinden Sie sich mit einem Server</string>
-    <string name="action_join_community">Trete der Community bei</string>
-    <string name="action_create_server">Erstellen Sie einen neuen Server</string>
+    <string name="action_join_community">Der Community beitreten</string>
+    <string name="action_create_server">Einen eigenen Server erstellen</string>
     <string name="action_register">Registrieren</string>
     <string name="action_confirm">Bestätigen</string>
     <string name="action_delete_account">Konto löschen</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Einstellungen</item>
-        <item name="item_password">Ändere das Passwort</item>
-        <item name="item_share_app">App teilen</item>
+        <item name="item_preferences">Eigenschaften</item>
+        <item name="item_password">Passwort ändern</item>
+        <item name="item_share_app">Link zur App teilen</item>
         <item name="item_rate_us">Bewerten Sie uns</item>
-        <item name="item_contact_us">Kontaktiere uns</item>
+        <item name="item_contact_us">Kontaktieren Sie uns</item>
         <item name="item_licence">Lizenz</item>
         <item name="item_about">Über</item>
+
     </string-array>
 
     <!-- Regular information messages -->
@@ -106,7 +114,9 @@
     <string name="msg_content_description_log_in_using_gitlab">Login mit Gitlab</string>
     <string name="msg_content_description_log_in_using_wordpress">Login mit WordPress</string>
     <string name="msg_content_description_send_message">Sende Nachricht</string>
-    <string name="msg_content_description_show_more_login_options">Show more login options</string>
+
+    <string name="msg_content_description_show_more_login_options">Zeige mehr Login-Optionen</string>
+
     <string name="msg_content_description_show_attachment_options">Zeige Anhang Optionen</string>
     <string name="msg_you">Du</string>
     <string name="msg_unknown">Unbekannt</string>
@@ -145,29 +155,31 @@
     <string name="msg_file_description">Datei Beschreibung</string>
     <string name="msg_send">Sende</string>
     <string name="msg_sent_attachment">Sende Anhang</string>
-    <string name="msg_welcome_to_rocket_chat">Willkommen bei Rocket.Chat</string>
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
-    <string name="msg_login_with_email">Einloggen mit <b>e-mail</b></string>
-    <string name="msg_create_account">Ein Konto erstellen</string>
-    <string name="msg_continue_with_facebook">Weitermachen mit <b>Facebook</b></string>
-    <string name="msg_continue_with_github">Weitermachen mit <b>Github</b></string>
-    <string name="msg_continue_with_google">Weitermachen mit <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">Weitermachen mit <b>Linkedin</b></string>
-    <string name="msg_continue_with_gitlab">Weitermachen mit <b>GitLab</b></string>
-    <string name="msg_continue_with_wordpress">Weitermachen mit <b>WordPress</b></string>
+
+    <string name="msg_welcome_to_rocket_chat">Wilkommen bei Rocket.Chat</string>
+    <string name="msg_team_communication">Team Kommunikation</string>
+    <string name="msg_login_with_email">Mit <b>e-mail</b> einloggen</string>
+    <string name="msg_create_account">Einen Account erstellen</string>
+    <string name="msg_continue_with_facebook">Mit <b>Facebook</b> einloggen</string>
+    <string name="msg_continue_with_github">Mit <b>Github</b> einloggen</string>
+    <string name="msg_continue_with_google">Mit <b>Google</b> einloggen</string>
+    <string name="msg_continue_with_linkedin">Mit <b>Linkedin</b> einloggen</string>
+    <string name="msg_continue_with_gitlab">Mit <b>GitLab</b> einloggen</string>
+    <string name="msg_continue_with_wordpress">Mit <b>WordPress</b> einloggen</string>
     <string name="msg_two_factor_authentication">Zwei-Faktor-Authentifizierung</string>
-    <string name="msg__your_2fa_code">Wie lautet Ihr 2FA-Code?</string>
+    <string name="msg__your_2fa_code">Wie lautet Ihr F2A Code?</string>
     <string name="msg_muted_on_this_channel">Sie sind auf diesem Kanal stummgeschaltet</string>
     <string name="msg_no_topic">Kein Thema hinzugefügt</string>
     <string name="msg_no_announcement">Keine Ankündigung hinzugefügt</string>
     <string name="msg_no_description">Keine Beschreibung hinzugefügt</string>
-    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
-    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Änderung des Passworts nicht möglich. Fehlermeldung: %1$s</string>
+    <string name="msg_password_updated_successfully">Passwort erfolgreich geändert</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$ s reagierte mit %2$s</item>
         <item quantity="other">%1$s reagierte mit %2$s</item>
     </plurals>
 
+
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privat</string>
     <string name="msg_public_channel">Öffentlich</string>
@@ -182,17 +194,19 @@
     <string name="msg_message_copied">Nachricht kopiert</string>
     <string name="msg_delete_message">Lösche Nachricht</string>
     <string name="msg_delete_description">Sind Sie sicher, dass Sie diese Nachricht löschen wollen?</string>
-    <string name="msg_view_more">mehr sehen</string>
-    <string name="msg_view_less">weniger anzeigen</string>
-    <string name="msg_permalink_copied">Permalink kopiert</string>
+
+    <string name="msg_view_more">Zeige mehr</string>
+    <string name="msg_view_less">Zeige weniger</string>
+    <string name="msg_permalink_copied">Permanenter Link kopiert</string>
     <string name="msg_send_email">E-Mail senden</string>
     <string name="msg_android_app_support">Android App-Unterstützung</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string>
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string>
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string>
+    <string name="msg_analytics_tracking">Daten für Analysezwecke</string>
+    <string name="msg_send_analytics_tracking">Anonyme Statistiken senden um diese App weiter zu verbessern</string>
+    <string name="msg_do_not_send_analytics_tracking">KEINE anonymen Statistiken senden um diese App weiter zu verbessern</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Nicht anwendbar, da es sich um eine FOSS version handelt</string>
+
 
     <!-- System messages -->
     <string name="message_room_name_changed">Raum Namen geändert zu: %1$s von %2$s</string>
@@ -328,15 +342,18 @@
     <string name="notif_success_sending">Nachricht gesendet nach %1$s!</string>
     <string name="read_by">Gelesen von</string>
     <string name="message_information_title">Nachricht Information</string>
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+
+    <string name="message_room_changed_privacy">Raumtyp geändert zu: %1$s durch %2$s</string>
+
     <!-- User Details -->
-    <string name="message">Botschaft</string>
+    <string name="message">Nachrticht</string>
     <string name="timezone">Zeitzone</string>
     <string name="error_opening_dm">Etwas ist schiefgegangen, als wir dieses Gespräch erstellt haben…</string>
     <string name="retry">Wiederholen</string>
 
     <!-- Report -->
-    <string name="submit">einreichen</string>
+    <string name="submit">Senden</string>
     <string name="required">*erforderlich</string>
     <string name="report_sent">Ihr Bericht wurde gesendet!</string>
+
 </resources>

app/src/main/res/values-hi-rIN/strings.xml

@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">पसंद</item>
         <item name="item_password">पासवर्ड बदलें</item>
+        <item name="change_language">भाषा बदलें</item>
         <item name="item_share_app">ऐप शेयर करें</item>
         <item name="item_rate_us">हमें रेटिंग दें</item>
         <item name="item_contact_us">हमसे संपर्क करें</item>
@@ -152,7 +153,7 @@
     <string name="msg_delete_message">संदेश को हटाएं</string>
     <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं</string>
     <string name="msg_welcome_to_rocket_chat">Rocket.Chat में आपका स्वागत है</string>
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
+    <string name="msg_team_communication">टीम संचार</string>
     <string name="msg_login_with_email">ई-मेल के साथ लॉगिन करें</string>
     <string name="msg_create_account">खाता बनाएं</string>
     <string name="msg_continue_with_facebook"><b>Facebook</b> के साथ जारी रखें</string>

app/src/main/res/values-it/strings.xml

@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferenze</item>
         <item name="item_password">Cambia password</item>
+        <item name="change_language">Change Language</item><!-- TODO Add translation -->
         <item name="item_share_app">Condividi app</item>
         <item name="item_rate_us">Votaci</item>
         <item name="item_contact_us">Contattaci</item>
@@ -146,7 +147,7 @@
     <string name="msg_send">Inviare</string>
     <string name="msg_sent_attachment">Inviato allegato</string>
     <string name="msg_welcome_to_rocket_chat">Benvenuto in Rocket.Chat </string>
-    <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
+    <string name="msg_team_communication">Comunicazione dei Gruppi</string>
     <string name="msg_login_with_email">Accedi con <b>e-mail</b></string>
     <string name="msg_create_account">Crea un utente</string>
     <string name="msg_continue_with_facebook">Continua con <b>Facebook</b></string>
@@ -163,8 +164,8 @@
     <string name="msg_no_description">Nessuna descrizione aggiunta</string>
     <string name="msg_send_email">Invia una email</string>
     <string name="msg_android_app_support">Supporto per le app Android</string>
-    <string name="msg_unable_to_update_password">Unable to update password. Error message: %1$s</string> <!-- TODO - Add proper translation -->
-    <string name="msg_password_updated_successfully">Password updated successfully</string> <!-- TODO - Add proper translation -->
+    <string name="msg_unable_to_update_password">Impossibile aggiornare la password. Messaggio di errore: %1$s</string>
+    <string name="msg_password_updated_successfully">Password aggiornata con successo</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>
         <item quantity="other">%1$s ha reagito con %2$s</item>

app/src/main/res/values-ja/strings.xml

@@ -22,7 +22,7 @@
     <string name="title_admin_panel">管理パネル</string>
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
-    <string name="title_about">About</string>
+    <string name="title_about">About</string><!-- TODO Add translation -->
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_create_channel">新しいチャネルを作成</string>
     <string name="title_are_you_sure">本気ですか？</string>
@@ -66,6 +66,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Change password</item> <!-- TODO Add translation -->
+        <item name="change_language">Change Language </item><!-- TODO Add translation -->
         <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
         <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
         <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->

app/src/main/res/values-ru-rRU/strings.xml

@@ -64,6 +64,7 @@
     <string-array name="settings_actions">
         <item name="item_preferences">Персональные</item>
         <item name="item_password">Изменить пароль</item>
+        <item name="change_language">Изменить язык</item>
         <item name="item_share_app">Поделиться приложением</item>
         <item name="item_rate_us">Оцените нас</item>
         <item name="item_contact_us">Связаться с нами</item>

app/src/main/res/values/strings.xml

@@ -76,6 +76,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string-array name="settings_actions">
         <item name="item_preferences">Preferences</item>
         <item name="item_password">Change password</item>
+        <item name="change_language">Change Language </item>
         <item name="item_share_app">Share app</item>
         <item name="item_rate_us">Rate us</item>
         <item name="item_contact_us">Contact us</item>