Merge pull request #2214 from HusseinElFeky/patch-1

[FIX] Typos and Translation Mistakes

Author: philipbrito

app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsView.kt

@@ -25,18 +25,18 @@ interface LoginOptionsView : LoadingView, MessageView {
     fun setupFacebookButtonListener(facebookOauthUrl: String, state: String)
 
     /**
-     * Shows the "login by Github" view if it is enabled by the server settings.
+     * Shows the "login by GitHub" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Github button listener before enabling it
+     * REMARK: We must set up the GitHub button listener before enabling it
      * [setupGithubButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByGithub()
 
     /**
-     * Setups the Github button.
+     * Setups the GitHub button.
      *
-     * @param githubUrl The Github OAuth URL to authenticate with.
+     * @param githubUrl The GitHub OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
@@ -61,36 +61,36 @@ interface LoginOptionsView : LoadingView, MessageView {
     fun setupGoogleButtonListener(googleUrl: String, state: String)
 
     /**
-     * Shows the "login by Linkedin" view if it is enabled by the server settings.
+     * Shows the "login by LinkedIn" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Linkedin button listener before enabling it
+     * REMARK: We must set up the LinkedIn button listener before enabling it
      * [setupLinkedinButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByLinkedin()
 
     /**
-     * Setups the Linkedin button.
+     * Setups the LinkedIn button.
      *
-     * @param linkedinUrl The Linkedin OAuth URL to authenticate with.
+     * @param linkedinUrl The LinkedIn OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
     fun setupLinkedinButtonListener(linkedinUrl: String, state: String)
 
     /**
-     * Shows the "login by Gitlab" view if it is enabled by the server settings.
+     * Shows the "login by GitLab" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Gitlab button listener before enabling it
+     * REMARK: We must set up the GitLab button listener before enabling it
      * [setupGitlabButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByGitlab()
 
     /**
-     * Setups the Gitlab button.
+     * Setups the GitLab button.
      *
-     * @param gitlabUrl The Gitlab OAuth URL to authenticate with.
+     * @param gitlabUrl The GitLab OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
@@ -99,7 +99,7 @@ interface LoginOptionsView : LoadingView, MessageView {
     /**
      * Shows the "login by WordPress" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Gitlab button listener before enabling it [setupWordpressButtonListener].
+     * REMARK: We must set up the GitLab button listener before enabling it [setupWordpressButtonListener].
      */
     fun enableLoginByWordpress()
 

app/src/main/java/chat/rocket/android/helper/OauthHelper.kt

@@ -15,11 +15,11 @@ object OauthHelper {
                 "\"isCordova\":true}").encodeToBase64()
 
     /**
-     * Returns the Github Oauth URL.
+     * Returns the GitHub Oauth URL.
      *
      * @param clientId The GitHub client ID.
      * @param state An unguessable random string used to protect against forgery attacks.
-     * @return The Github Oauth URL.
+     * @return The GitHub Oauth URL.
      */
     fun getGithubOauthUrl(clientId: String, state: String): String {
         return "https://github.com/login/oauth/authorize" +
@@ -46,12 +46,12 @@ object OauthHelper {
     }
 
     /**
-     * Returns the Linkedin Oauth URL.
+     * Returns the LinkedIn Oauth URL.
      *
-     * @param clientId The Linkedin client ID.
+     * @param clientId The LinkedIn client ID.
      * @param serverUrl The server URL.
      * @param state An unguessable random string used to protect against forgery attacks.
-     * @return The Linkedin Oauth URL.
+     * @return The LinkedIn Oauth URL.
      */
     fun getLinkedinOauthUrl(clientId: String, serverUrl: String, state: String): String {
         return "https://linkedin.com/oauth/v2/authorization" +
@@ -62,13 +62,13 @@ object OauthHelper {
     }
 
     /**
-     * Returns the Gitlab Oauth URL.
+     * Returns the GitLab Oauth URL.
      *
-     * @param host The Gitlab host.
-     * @param clientId The Gitlab client ID.
+     * @param host The GitLab host.
+     * @param clientId The GitLab client ID.
      * @param serverUrl The server URL.
      * @param state An unguessable random string used to protect against forgery attacks.
-     * @return The Gitlab Oauth URL.
+     * @return The GitLab Oauth URL.
      */
     fun getGitlabOauthUrl(
         host: String? = "https://gitlab.com",

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -141,7 +141,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     }
 
     override fun showProfileUpdateSuccessfullyMessage() {
-        showMessage(getString(R.string.msg_profile_update_successfully))
+        showMessage(getString(R.string.msg_profile_updated_successfully))
     }
 
     override fun invalidateToken(token: String) = invalidateFirebaseToken(token)
@@ -267,8 +267,8 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
             text_email.asObservable()
         ) { text_name, text_username, text_email ->
             return@combineLatest (text_name.toString() != currentName ||
-                    text_username.toString() != currentUsername ||
-                    text_email.toString() != currentEmail)
+                text_username.toString() != currentUsername ||
+                text_email.toString() != currentEmail)
         }.subscribe { isValid ->
             activity?.invalidateOptionsMenu()
             if (isValid) {

app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt

@@ -452,7 +452,7 @@ abstract class CheckServerPresenter constructor(
 
     /**
      * Returns the OAuth client ID of a [serviceMap].
-     * REMARK: This function works for common OAuth providers (Google, Facebook, Github and so on)
+     * REMARK: This function works for common OAuth providers (Google, Facebook, GitHub and so on)
      * as well as custom OAuth.
      *
      * @param serviceMap The service map to get the OAuth client ID.

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

@@ -81,7 +81,7 @@ class SettingsFragment : Fragment(), SettingsView {
         text_share_this_app.setOnClickListener { shareApp() }
 
         text_license.setOnClickListener {
-            presenter.toLicense(getString(R.string.license_url), getString(R.string.title_licence))
+            presenter.toLicense(getString(R.string.license_url), getString(R.string.title_license))
         }
 
         text_app_version.text = getString(R.string.msg_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)

app/src/main/res/layout/fragment_authentication_log_in.xml

@@ -54,7 +54,7 @@
         android:id="@+id/button_forgot_your_password"
         style="@style/Authentication.Button.Borderless"
         android:layout_marginTop="10dp"
-        android:text="@string/msg_forgot__your_password"
+        android:text="@string/msg_forgot_your_password"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/fragment_settings.xml

@@ -182,7 +182,7 @@
                 android:paddingTop="8dp"
                 android:paddingEnd="16dp"
                 android:paddingBottom="8dp"
-                android:text="@string/msg_licence"
+                android:text="@string/msg_license"
                 android:textColor="#DE000000"
                 android:textSize="16sp"
                 android:textStyle="normal"

app/src/main/res/layout/item_chat.xml

@@ -63,7 +63,7 @@
         app:layout_constraintEnd_toStartOf="@+id/layout_unread_messages_badge"
         app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
         app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
-        tools:text="Filipe de Lima Brito: Type something that is very big and need at least to lines, or maybe even more" />
+        tools:text="Filipe de Lima Brito: Type something that is very long and need at least two lines, or maybe even more" />
 
     <include
         android:id="@+id/layout_unread_messages_badge"

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

@@ -21,7 +21,7 @@
     <string name="title_password">تغيير كلمة السر</string>
     <string name="title_update_profile">تحديث الملف الشخصي</string>
     <string name="title_create_channel">إنشاء قناة</string>
-    <string name="title_licence">الترخيص</string>
+    <string name="title_license">الترخيص</string>
     <string name="title_are_you_sure">هل أنت متأكد؟</string>
     <string name="title_channel_details">تفاصيل القناة</string>
     <string name="title_topic">موضوع</string>
@@ -60,27 +60,26 @@
     <string name="action_favorite">Favorite</string> <!-- TODO Translate -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Translate -->
 
-    <!-- Settings messages-->
+    <!-- Settings messages -->
     <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
     <string name="msg_language">Language</string> <!-- TODO Translate -->
     <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
     <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
     <string name="msg_administration">Administration</string> <!-- TODO Translate -->
-    <string name="msg_licence">Licence</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
     <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
     <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
     <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
     <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
     <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
-
     <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">نأسف حدث خطأ ما حاول مرة أخرى</string>
     <string name="msg_no_data_to_display">لا يوجد بيانات للعرض</string>
     <string name="msg_check_this_out">تحقق من هذا</string>
     <string name="msg_share_using">نشر بواسطة</string>
-    <string name="msg_profile_update_successfully">تم تحديث الملف الشخصي بنجاح</string>
+    <string name="msg_profile_updated_successfully">تم تحديث الملف الشخصي بنجاح</string>
     <string name="msg_username">اسم المستخدم</string>
     <string name="msg_username_or_email">اسم المستخدم أو عنوان بريد</string>
     <string name="msg_password">كلمة السر</string>
@@ -89,7 +88,7 @@
     <string name="msg_avatar_url">رابط الشخصية</string>
     <string name="msg_or_continue_using_social_accounts">استمرار باستخدام حساب التواصل الاجتماعي</string>
     <string name="msg_new_user">مستخدم جديد؟ %1$s</string>
-    <string name="msg_forgot__your_password">نسيت كلمة السر؟</string>
+    <string name="msg_forgot_your_password">نسيت كلمة السر؟</string>
     <string name="msg_reset">إعادة تعيين</string>
     <string name="msg_check_your_email_to_reset_your_password">تم إرسال الإيميل راجع إيميلك لتحديث كلمة السر</string>
     <string name="msg_invalid_email">من فضلك أدخل عنوان بريد صحيح</string>
@@ -104,12 +103,12 @@
     <string name="msg_invalid_file">ملف غير صالح</string>
     <string name="msg_invalid_server_url">رابط خادم غير صحيح</string>
     <string name="msg_content_description_log_in_using_facebook">تسجيل باستخدام فيسبوك</string>
-    <string name="msg_content_description_log_in_using_github">تسجيل باستخدام Github</string>
+    <string name="msg_content_description_log_in_using_github">تسجيل باستخدام GitHub</string>
     <string name="msg_content_description_log_in_using_google">تسجيل باستخدام Google</string>
     <string name="msg_content_description_log_in_using_linkedin">تسجيل باستخدام LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">تسجيل باستخدام Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">تسجيل باستخدام Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">تسجيل باستخدام Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">تسجيل باستخدام GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">تسجيل باستخدام WordPress</string>
     <string name="msg_content_description_send_message">ارسال رسالة</string>
     <string name="msg_content_description_show_more_login_options">إظهار طرق تسجيل أخرى</string>
@@ -130,11 +129,8 @@
     <string name="msg_no_messages_yet">ليس هناك رسائل بعد</string>
     <string name="msg_build">Build %1$d - %2$s - %3$s</string>
     <string name="msg_update_app_version_in_order_to_continue">خادم منتهي برجاء التواصل مع مدير الخادم للاستمرار</string>
-    <string name="msg_ver_not_recommended">
-        يبدو أن خادمك قديم %1$s يمكنك الاستمرار لكن ليس بكامل الفعالية</string>
-    <string name="msg_ver_not_minimum">
-        يبدو أن خادمك قديم %1$s من فضلك حدث الخادم للاستمرار
-    </string>
+    <string name="msg_ver_not_recommended">يبدو أن خادمك قديم %1$s يمكنك الاستمرار لكن ليس بكامل الفعالية</string>
+    <string name="msg_ver_not_minimum">يبدو أن خادمك قديم %1$s من فضلك حدث الخادم للاستمرار</string>
     <string name="msg_no_chat_title">لا توجد رسائل</string>
     <string name="msg_no_chat_description">إبدأ المحادثة لترى الرسائل هنا</string>
     <string name="msg_http_insecure">أنت تستخدم  HTTP وهو غير آمن ونحن لا نحبذ ذلك.</string>
@@ -155,16 +151,16 @@
     <string name="msg_sent_attachment">إرسال مرفق</string>
     <string name="msg_welcome_to_rocket_chat">أهلا بك في Rocket.Chat</string>
     <string name="msg_team_communication">التواصل مع الفريق</string>
-    <string name="msg_login_with_email">تسجيل ب  <b>عنوان البريد </b></string>
+    <string name="msg_login_with_email">تسجيل ب <b>عنوان البريد</b></string>
     <string name="msg_create_account">إنشاء حساب</string>
     <string name="msg_continue_with_facebook">استمرار ب <b>Facebook</b></string>
-    <string name="msg_continue_with_github">استمرار ب <b>Github</b></string>
+    <string name="msg_continue_with_github">استمرار ب <b>GitHub</b></string>
     <string name="msg_continue_with_google">استمرار ب <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">استمرار ب <b>Linkedin</b></string>
+    <string name="msg_continue_with_linkedin">استمرار ب <b>LinkedIn</b></string>
     <string name="msg_continue_with_gitlab">استمرار ب <b>GitLab</b></string>
     <string name="msg_continue_with_wordpress">استمرار ب <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">مصادقة مزدوجة</string>
-    <string name="msg__your_2fa_code">ما هو رمز 2FA?</string>
+    <string name="msg_your_2fa_code">ما هو رمز 2FA؟</string>
     <string name="msg_permalink_copied">الرابط الثابت المنسوخ</string>
     <string name="msg_no_topic">لا يوجد موضوع مضاف</string>
     <string name="msg_no_announcement">لا يوجد ملف مضاف</string>
@@ -200,8 +196,8 @@
     <string name="msg_member_not_found">عضو غير موجود</string>
     <string name="msg_channel_created_successfully">تم انشاء القناة بنجاح</string>
     <string name="msg_message_copied">تم نسخ الرسالة</string>
-    <string name="msg_delete_message">تم حذف الرسالة</string>
-    <string name="msg_delete_description">هل أنت متأكد من حذف هذه الرسالة</string>
+    <string name="msg_delete_message">حذف الرسالة</string>
+    <string name="msg_delete_description">هل أنت متأكد من حذف هذه الرسالة؟</string>
     <string name="msg_view_more">رؤية المزيد</string>
     <string name="msg_view_less">رؤية أقل</string>
     <string name="msg_muted_on_this_channel">لقد جعلت هذه القناة صامتة</string>
@@ -278,7 +274,7 @@
     <string name="msg_all_files_appear_here">الملفات تظهر هنا</string>
 
     <!-- Upload Messages -->
-    <string name="max_file_size_exceeded">ملف كبير</string>
+    <string name="max_file_size_exceeded">تجاوز حجم الملف %1$d بايت الحد الأقصى لحجم التحميل وهو %2$d بايت</string>
 
     <!-- Socket status -->
     <string name="status_connected">اتصال</string>