update strings and finalise PR

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -74,6 +74,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         presenter.loadEmojis()
         setupToolbar()
         setupNavigationView()
+        loadLocale()
     }
 
     override fun onSaveInstanceState(outState: Bundle?) {
@@ -215,7 +216,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     }
 
     fun setupNavigationView() {
-        with (view_navigation.menu) {
+        with(view_navigation.menu) {
             clear()
             setupMenu(this)
         }
@@ -234,7 +235,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     fun showLogoutDialog() {
         val builder = AlertDialog.Builder(this)
         builder.setTitle(R.string.title_are_you_sure)
-            .setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout()}
+                .setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout() }
                 .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }
                 .create()
                 .show()
@@ -261,35 +262,35 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         progressDialog = null
     }
 
-      fun changeLanguage(){
+    fun changeLanguage() {
         val languages = arrayOf("English", "Hindi", "Japanese", "Russian", "Italian")
 
         val builder = AlertDialog.Builder(this)
         builder.setTitle("Choose Language")
-        builder.setSingleChoiceItems(languages,-1) { dialog, which ->
-            if (which==0){
+        builder.setSingleChoiceItems(languages, -1) { dialog, which ->
+            if (which == 0) {
                 setLocale("en")
                 recreate()
-            }else if (which==1){
+            } else if (which == 1) {
                 setLocale("hi")
                 recreate()
-            }else if (which==2){
+            } else if (which == 2) {
                 setLocale("ja")
                 recreate()
-            }else if (which==3){
+            } else if (which == 3) {
                 setLocale("ru")
                 recreate()
-            }else if (which==4){
+            } else if (which == 4) {
                 setLocale("it")
                 recreate()
             }
             dialog.dismiss()
         }
-            val mdialog=builder.create()
+        val mdialog = builder.create()
         mdialog.show()
     }
 
-     fun setLocale(lang: String) {
+    private fun setLocale(lang: String) {
         val locale = Locale(lang)
         Locale.setDefault(locale)
         val config = Configuration()
@@ -301,12 +302,9 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         editor.apply()
     }
 
-    private fun loadLocale(){
-        val sharedPreferences =getSharedPreferences("settings",Activity.MODE_PRIVATE)
-        val language = sharedPreferences.getString("My_Lang","")
+    private fun loadLocale() {
+        val sharedPreferences = getSharedPreferences("Settings", Activity.MODE_PRIVATE)
+        val language = sharedPreferences.getString("My_Lang", "")
         setLocale(language)
     }
-
-
-
 }
\ No newline at end of file

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

@@ -153,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

@@ -147,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 del team</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>

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

@@ -166,18 +166,12 @@
     <string name="msg_view_more">更に表示</string>
     <string name="msg_view_less">隠す</string>
     <string name="msg_muted_on_this_channel">あなたはこのチャンネルでミュートされています</string>
-<<<<<<< HEAD
     <string name="msg_no_topic">トピックが追加されていない</string>
     <string name="msg_no_announcement">お知らせが追加されていません</string>
     <string name="msg_no_description">説明が追加されていない</string>
-    <!-- TODO - Add proper translation -->
-=======
-    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
-    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
-    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
     <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 -->
->>>>>>> 04c07f98e16556040c2bf7c827137a9f918e69c7
+
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item>     <!-- TODO - Add proper translation -->

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

@@ -150,7 +150,7 @@
     <string name="msg_channel_name">Название канала</string>
     <string name="msg_search">Поиск</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">Войти с помощью <b>e-mail</b></string>
     <string name="msg_create_account">Создать аккаунт</string>
     <string name="msg_continue_with_facebook">Войти с помощью <b>Facebook</b></string>

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

@@ -18,7 +18,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_share_the_app">Share App</string>
     <string name="title_register_username">Register username</string>
     <string name="title_reset_password">Reset password</string>
-    <string name="title_sign_up">Sign up</string>
+    <string name="title_sign_up" translatable="false">Sign up</string>
     <string name="title_authentication">Authentication</string>
     <string name="title_legal_terms">Legal Terms</string>
     <string name="title_chats">Chats</string>