From 7cce801a1a5772e2544d25be237e14e5f9d97822 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Sun, 20 Jun 2021 17:08:10 -0400
Subject: [PATCH] New translations and string fixes

---
 .../ui/settings/SettingsAppearanceScreen.kt   |   2 +-
 .../ui/settings/SettingsGeneralScreen.kt      |   7 +-
 .../resources/values/values-hi/strings.xml    | 168 ++++++++++++++++++
 .../resources/values/values-tam/strings.xml   | 168 ++++++++++++++++++
 src/main/resources/values/values/strings.xml  |   2 +-
 5 files changed, 343 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/values/values-hi/strings.xml
 create mode 100644 src/main/resources/values/values-tam/strings.xml

diff --git a/src/main/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt b/src/main/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt
index 408dcdab..d88597bb 100644
--- a/src/main/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt
+++ b/src/main/kotlin/ca/gosyer/ui/settings/SettingsAppearanceScreen.kt
@@ -85,7 +85,7 @@ fun SettingsAppearance(navController: BackStack<Route>) {
                     choices = mapOf(
                         // ThemeMode.System to R.string.follow_system_settings,
                         ThemeMode.Light to stringResource("theme_light"),
-                        ThemeMode.Dark to stringResource("theme_Dark")
+                        ThemeMode.Dark to stringResource("theme_dark")
                     ),
                     title = stringResource("theme")
                 )
diff --git a/src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt b/src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt
index 41b81ee1..725e7f45 100644
--- a/src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt
+++ b/src/main/kotlin/ca/gosyer/ui/settings/SettingsGeneralScreen.kt
@@ -42,7 +42,7 @@ class SettingsGeneralViewModel @Inject constructor(
     private val now: Instant = Instant.now()
     private val currentLocale = Locale.getDefault()
 
-    fun getLocalePair(locale: String): Pair<String, String> {
+    private fun getLocalePair(locale: String): Pair<String, String> {
         return locale to Locale.forLanguageTag(locale).getDisplayName(currentLocale)
     }
 
@@ -52,7 +52,10 @@ class SettingsGeneralViewModel @Inject constructor(
 
         return mapOf(
             "" to resources.getString("language_system_default", currentLocaleDisplayName),
-            getLocalePair("en-CA")
+            getLocalePair("en"),
+            getLocalePair("en-CA"),
+            getLocalePair("hi"),
+            getLocalePair("tam")
         )
     }
 
diff --git a/src/main/resources/values/values-hi/strings.xml b/src/main/resources/values/values-hi/strings.xml
new file mode 100644
index 00000000..a1fdfc49
--- /dev/null
+++ b/src/main/resources/values/values-hi/strings.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  -->
+<resources>
+    <string name="app_name">TachideskJUI</string>
+
+    <!-- Main Menu -->
+    <string name="tachidesk_doesnt_exist">Tachidesk जार मौजूद नहीं है, Tachidesk को स्वयं चलाएं</string>
+    <string name="unable_to_start_server">सर्वर प्रारंभ करने में असमर्थ</string>
+
+    <!-- Actions -->
+    <string name="action_yes">हाँ</string>
+    <string name="action_no">नहीं</string>
+    <string name="action_cancel">कॅन्सल</string>
+    <string name="action_delete">डेलीट</string>
+    <string name="action_start_anyway">जबरन स्टार्ट करे</string>
+    <string name="action_rename">रिनेम</string>
+    <string name="action_create">क्रियेट</string>
+    <string name="action_add">एड</string>
+    <string name="action_pause">पॉज़</string>
+    <string name="action_continue">कंटिन्यू</string>
+    <string name="action_clear_queue">क्लियर क्यू</string>
+    <string name="action_move_to_bottom">मूव टू बॉटम</string>
+    <string name="action_install">इनस्टॉल</string>
+    <string name="action_uninstall">उनिन्स्टल्ल</string>
+    <string name="action_update">अपडेट</string>
+    <string name="action_toggle_read">टॉगल रीड</string>
+    <string name="action_mark_previous_read">मार्क प्रीवियस एज रीड</string>
+    <string name="action_toggle_bookmarked">टॉगल बुकमार्क्ड</string>
+    <string name="action_favorite">फेवरेट</string>
+    <string name="action_remove_favorite">अनफेवरेट</string>
+    <string name="action_refresh_manga">रिफ्रेश  manga</string>
+
+    <!-- Locations -->
+    <string name="location_library">Library</string>
+    <string name="location_sources">Sources</string>
+    <string name="location_extensions">Extensions</string>
+    <string name="location_downloads">Downloads</string>
+    <string name="location_settings">Settings</string>
+    <string name="location_categories">Categories</string>
+    <string name="location_manga">Manga</string>
+
+    <!-- Categories Menu -->
+    <string name="categories_delete_confirm">Do you wish to delete the category %1$s?</string>
+
+    <!-- Downloads Menu -->
+    <string name="downloads_remaining">%1$s remaining</string>
+
+    <!-- Extensions Menu -->
+    <string name="enabled_languages">Enabled languages</string>
+
+    <!-- Library Menu -->
+    <string name="default_category">Default</string>
+
+    <!-- Manga Menu -->
+    <string name="page_progress">Page %1$s</string>
+
+    <!-- Sources Menu -->
+    <string name="sources_home">Home</string>
+    <string name="move_to_browse">To Browse</string>
+    <string name="move_to_latest">To Latest</string>
+
+    <!-- Reader Menu -->
+    <string name="no_pages_found">No pages found</string>
+    <string name="no_previous_chapter">There is no previous chapter</string>
+    <string name="previous_chapter">Previous:\n %1$s</string>
+    <string name="next_chapter">Next:\n %1$s</string>
+    <string name="no_next_chapter">There is no next chapter</string>
+
+    <!-- Settings-->
+    <string name="settings_advanced">Advanced</string>
+    <string name="settings_appearance">Appearance</string>
+    <string name="settings_backup">Backup</string>
+    <string name="settings_browse">Browse</string>
+    <string name="settings_download">Download</string>
+    <string name="settings_general">General</string>
+    <string name="settings_library">Library</string>
+    <string name="settings_parental_controls">Parental Controls</string>
+    <string name="settings_reader">Reader</string>
+    <string name="settings_security">Security</string>
+    <string name="settings_server">Server</string>
+    <string name="settings_tracking">Tracking</string>
+
+    <!-- Settings Menu Titles-->
+    <string name="settings_advanced_screen">Advanced Settings</string>
+    <string name="settings_appearance_screen">Appearance Settings</string>
+    <string name="settings_backup_screen">Backup Settings</string>
+    <string name="settings_browse_screen">Browse Settings</string>
+    <string name="settings_download_screen">Download Settings</string>
+    <string name="settings_general_screen">General Settings</string>
+    <string name="settings_library_screen">Library Settings</string>
+    <string name="settings_parental_control_screen">Parental Control Settings</string>
+    <string name="settings_reader_screen">Reader Settings</string>
+    <string name="settings_security_screen">Security Settings</string>
+    <string name="settings_server_screen">Server Settings</string>
+    <string name="settings_tracking_screen">Tracking Settings</string>
+
+    <!-- Appearance Settings -->
+    <string name="theme">Theme</string>
+    <string name="theme_light">Light</string>
+    <string name="theme_dark">Dark</string>
+    <string name="theme_text">Text</string>
+    <string name="preset_themes">Preset themes</string>
+    <string name="color_primary">Color primary</string>
+    <string name="color_primary_sub">Displayed most frequently across your app</string>
+    <string name="color_secondary">Color secondary</string>
+    <string name="color_secondary_sub">Accents select parts of the UI</string>
+    <string name="window_decorations">Window Decorations</string>
+    <string name="window_decorations_sub">Restart JUI when this setting is changed</string>
+
+    <!-- Backup Settings -->
+    <string name="backup_restore">Restore Backup</string>
+    <string name="backup_restore_sub">Restore a backup into Tachidesk</string>
+    <string name="backup_create">Create Backup</string>
+    <string name="backup_create_sub">Create a backup from Tachidesk</string>
+
+    <!-- General Settings -->
+    <string name="start_screen">Start Screen</string>
+    <string name="confirm_exit">Confirm Exit</string>
+    <string name="language">Language</string>
+    <string name="language_system_default">System Default (%1$s)</string>
+    <string name="date_format">Date Format</string>
+    <string name="date_system_default">System Default</string>
+
+    <!-- Library Settings -->
+    <string name="show_all_category">Show all category</string>
+
+    <!-- Reader Settings -->
+    <string name="reader_mode">Reader Mode</string>
+    <string name="direction">Direction</string>
+    <string name="dir_down">Down</string>
+    <string name="dir_rtl">RTL</string>
+    <string name="dir_ltr">LTR</string>
+    <string name="dir_up">Up</string>
+    <string name="continuous">Continuous</string>
+    <string name="continuous_sub">If the reader is a pager or a scrolling window</string>
+    <string name="page_padding">Page Padding</string>
+    <string name="page_padding_none">None</string>
+    <string name="force_fit_width">Force fit width</string>
+    <string name="force_fit_width_sub">When the window's width is over the images width, scale the image to the window</string>
+    <string name="force_fit_height">Force fit height</string>
+    <string name="force_fit_height_sub">When the window's height is over the images height, scale the image to the window</string>
+    <string name="max_width">Max width</string>
+    <string name="max_width_sub">Width to restrict a image from going over, currently %1$sdp. Works with the above setting to scale images up but restrict them to a certain amount</string>
+    <string name="max_height">Max height</string>
+    <string name="max_height_sub">Height to restrict a image from going over, currently %1$sdp. Works with the above setting to scale images up but restrict them to a certain amount</string>
+    <string name="max_size_unrestricted">Unrestricted</string>
+    <string name="image_scale">Image Scale</string>
+    <string name="scale_fit_screen">Fit Screen</string>
+    <string name="scale_stretch">Stretch</string>
+    <string name="scale_fit_width">Fit Width</string>
+    <string name="scale_fit_height">Fit Height</string>
+    <string name="scale_original">Original Size</string>
+    <string name="scale_smart">Smart Fit</string>
+    <string name="navigation_mode">Navigation mode</string>
+    <string name="nav_l_shaped">L shaped</string>
+    <string name="nav_kindle_ish">Kindle-ish</string>
+    <string name="nav_edge">Edge</string>
+    <string name="nav_left_right">Right and Left</string>
+
+    <!-- Server Settings -->
+    <string name="host_server">Host server inside TachideskJUI</string>
+    <string name="server_url">Server Url</string>
+    <string name="server_port">Server Port</string>
+</resources>
\ No newline at end of file
diff --git a/src/main/resources/values/values-tam/strings.xml b/src/main/resources/values/values-tam/strings.xml
new file mode 100644
index 00000000..2be037dc
--- /dev/null
+++ b/src/main/resources/values/values-tam/strings.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  -->
+<resources>
+    <string name="app_name">தாச்சிடெஸ்க் ஜெ.யு.ஐ.</string> <!--தாச்சிடெஸ்க் - Tachidesk ஜெ.யு.ஐ. - JUI-->
+
+    <!-- Main Menu -->
+    <string name="tachidesk_doesnt_exist">"Tachidesk.jar" கண்டுபிடிக்க முடியவில்லை, "Tachidesk.jar"-ஐ நீங்களே ஆரம்பியுங்கள்</string> <!--Rough Translation, Jar cant be found, start Jar yourself -->
+    <string name="unable_to_start_server">சேவையகம் ஆரம்பிக்க முடியவில்லை</string>
+
+    <!-- Actions -->
+    <string name="action_yes">சரி</string>
+    <string name="action_no">இல்லை</string>
+    <string name="action_cancel">ஏற்காதே</string> 
+    <string name="action_delete">அழி</string> 
+    <string name="action_start_anyway">எப்படியும் ஆரம்பி</string> <!--Rough translation;anyway's translation is difficult-->
+    <string name="action_rename">மறுபெயரிடு</string>
+    <string name="action_create">உருவாக்கு</string>
+    <string name="action_add">கூட்டு</string>
+    <string name="action_pause">இடைநிறுத்தம்</string> 
+    <string name="action_continue">தொடரவும்</string>
+    <string name="action_clear_queue">வரிசையை அழிக்கு</string>
+    <string name="action_move_to_bottom">கீழே நகர்த்து</string>
+    <string name="action_install">நிறுவுக</string> 
+    <string name="action_uninstall">நிறுவல் நீக்கம்</string>
+    <string name="action_update">புதுப்பிப்பு</string>
+    <string name="action_toggle_read">வாசிப்பு நிலை மாற்று</string> 
+    <string name="action_mark_previous_read">முந்தியதை வாசித்ததாகக் குறி</string>
+    <string name="action_toggle_bookmarked">புத்தக அடையாள குறி மாற்று</string> <!--Rough translation;means change bookmark-->
+    <string name="action_favorite">பிடித்ததுனு குறி</string> <!--Rough translation;Mark favorite-->
+    <string name="action_remove_favorite">பிடித்ததுனு குறிக்காதே</string> <!--Rough translation;Do not mark favorite-->
+    <string name="action_refresh_manga">மங்காவை புதுஏற்றவும்</string> <!--Rough Translation;reload manga-->
+
+    <!-- Locations -->
+    <string name="location_library">நூலகம்</string>
+    <string name="location_sources">மூலங்கள்</string>
+    <string name="location_extensions">நீட்டிப்புகள்</string>
+    <string name="location_downloads">பதிவிறக்கங்கள்</string>
+    <string name="location_settings">அமைவுகள்</string> 
+    <string name="location_categories">பிரிவுகள்</string>
+    <string name="location_manga">மங்கா</string>
+
+    <!-- Categories Menu -->
+    <string name="categories_delete_confirm">%1$s-ஐ அழிக்க வரும்புகிறீர்களா?</string>
+
+    <!-- Downloads Menu -->
+    <string name="downloads_remaining">%1$s மீதி</string> <!--Translation;%1$s remaining; or "பதிவிறக்கம் மீதி"-download remaining, if needed to be specific-->
+
+    <!-- Extensions Menu -->
+    <string name="enabled_languages">இயக்கப்பட்ட மொழிகள்</string>
+
+    <!-- Library Menu -->
+    <string name="default_category">இயல்புநிலை</string> <!--This means default-->
+
+    <!-- Manga Menu -->
+    <string name="page_progress">பக்கம் %1$s</string>
+
+    <!-- Sources Menu -->
+    <string name="sources_home">முகப்பு</string>
+    <string name="move_to_browse">உலாவு</string> 
+    <string name="move_to_latest">சமீபம்</string>
+
+    <!-- Reader Menu -->
+    <string name="no_pages_found">எந்தப் பக்கமும் கிடைக்கவில்லை</string>
+    <string name="no_previous_chapter">முந்தைய அதிகாரம் இல்லை</string>
+    <string name="previous_chapter">முந்தைய அதிகாரம்:\n %1$s</string> <!--முந்தைய - previous, அதிகாரம்- chapter;change to "முந்தையது:\n %1$s" if space is limited-->
+    <string name="next_chapter">அடுத்த அதிகாரம்:\n %1$s</string><!--அடுத்த - next, அதிகாரம்- chapter;change to "அடுத்தது:\n %1$s" if space is limited-->
+    <string name="no_next_chapter">அடுத்த அதிகாரம் இல்லை</string>
+
+    <!-- Settings-->
+    <string name="settings_advanced">மேம்பட்ட</string>
+    <string name="settings_appearance">தோற்றம்</string>
+    <string name="settings_backup">பின்சேமிப்பு</string> 
+    <string name="settings_browse">உலாவு</string>
+    <string name="settings_download">பதிவிறக்க</string>
+    <string name="settings_general">பொது</string>
+    <string name="settings_library">நூலகம்</string>
+    <string name="settings_parental_controls">பெற்றோர் கட்டுப்பாடுகள்</string>
+    <string name="settings_reader">படிப்பி</string> 
+    <string name="settings_security">பாதுகாப்பு</string>
+    <string name="settings_server">சேவையகம்</string>
+    <string name="settings_tracking">கண்காணிப்பு சேவைகள்</string> <!--Translation;Tracking services; கண்காணிப்பு literally means watching, felt weird-->
+
+    <!-- Settings Menu Titles-->
+    <string name="settings_advanced_screen">மேம்பட்ட அமைவுகள்</string>
+    <string name="settings_appearance_screen">தோற்ற அமைவுகள்</string>
+    <string name="settings_backup_screen">பின்சேமிப்பு அமைவுகள்</string>
+    <string name="settings_browse_screen">உலாவ அமைவுகள்</string>
+    <string name="settings_download_screen">பதிவிறக்க அமைவுகள்</string>
+    <string name="settings_general_screen">பொது அமைவுகள்</string>
+    <string name="settings_library_screen">நூலகம் அமைவுகள்</string>
+    <string name="settings_parental_control_screen">பெற்றோர் கட்டுப்பு அமைவுகள்</string>
+    <string name="settings_reader_screen">படிப்பி அமைவுகள்</string> 
+    <string name="settings_security_screen">பாதுகாப்பு அமைவுகள்</string>
+    <string name="settings_server_screen">சேவையகமின் அமைவுகள்</string>
+    <string name="settings_tracking_screen">கண்காணிப்பு சேவைகளின் அமைவுகள்</string>
+
+    <!-- Appearance Settings -->
+    <string name="theme">பின்னனி</string>
+    <string name="theme_light">ஒளி பின்னனி</string> 
+    <string name="theme_dark">கருமை பின்னனி</string>
+    <string name="theme_text">உரை</string>
+    <string name="preset_themes">முன்நிறுவு themes</string>
+    <string name="color_primary">முதன்மை நிறம்</string> 
+    <string name="color_primary_sub">பொதுவான நிறம்</string> <!--wasnt sure what "app" is actually called in tamil, this means "common/general color"-->
+    <string name="color_secondary">இரண்டாம் நிலை நிறம்</string>
+    <string name="color_secondary_sub">குறிப்புகளின் நிறம்</string> <!--Rough translation;means "Color of markings"-->
+    <string name="window_decorations">ஜன்னல் அலங்காரம்</string>
+    <string name="window_decorations_sub">Restart JUI when this setting is changed</string> <!--here-->
+
+    <!-- Backup Settings -->
+    <string name="backup_restore">பின்சேமிப்பு மீட்டுதல்</string>
+    <string name="backup_restore_sub">தாச்சிடெஸ்கில் பின்சேமிப்பை மீட்க்கபடும் </string>
+    <string name="backup_create">பின்சேமிப்பை உருவாக்கு</string>
+    <string name="backup_create_sub">தாச்சிடெஸ்கில் பின்சேமிப்பை உருவாக்கபடும்</string>
+
+    <!-- General Settings -->
+    <string name="start_screen">தொடக்கத் திரை</string>
+    <string name="confirm_exit">வெளியேற்றும்போது உறுதிப்படுத்தவும்</string>
+    <string name="language">மொழி</string>
+    <string name="language_system_default">கருவியின் இயல்பு மொழி (%1$s)</string> <!--Translation;Systems default language; without language its a bit meaningless-->
+    <string name="date_format">தேதி வடிவமைப்பு</string>
+    <string name="date_system_default">கருவியின் இயல்பு வடிவமைப்பு</string> <!--Translation;Systems default format; without format its a bit meaningless-->
+
+    <!-- Library Settings -->
+    <string name="show_all_category">எல்லா பிரிவுகளை காமிக்கவும்</string>
+
+    <!-- Reader Settings -->
+    <string name="reader_mode">படிக்கும் முறை</string>
+    <string name="direction">படிக்கும் திசை</string> <!--reading direction-->
+    <string name="dir_down">கீழ்நோக்கி</string> <!--Downward-->
+    <string name="dir_rtl">வலமிருந்து இடமாக (RTL)</string>
+    <string name="dir_ltr">இடமிருந்து வலம் (LTR)</string>
+    <string name="dir_up">மேல்நோக்கி</string> <!--Upward-->
+    <string name="continuous">தொடர்ச்சியாக</string>
+    <string name="continuous_sub">If the reader is a pager or a scrolling window</string>
+    <string name="page_padding">Page Padding</string>
+    <string name="page_padding_none">None</string>
+    <string name="force_fit_width">Force fit width</string>
+    <string name="force_fit_width_sub">When the window's width is over the images width, scale the image to the window</string>
+    <string name="force_fit_height">Force fit height</string>
+    <string name="force_fit_height_sub">When the window's height is over the images height, scale the image to the window</string>
+    <string name="max_width">Max width</string>
+    <string name="max_width_sub">Width to restrict a image from going over, currently %1$sdp. Works with the above setting to scale images up but restrict them to a certain amount</string>
+    <string name="max_height">Max height</string>
+    <string name="max_height_sub">Height to restrict a image from going over, currently %1$sdp. Works with the above setting to scale images up but restrict them to a certain amount</string>
+    <string name="max_size_unrestricted">Unrestricted</string>
+    <string name="image_scale">Image Scale</string>
+    <string name="scale_fit_screen">Fit Screen</string>
+    <string name="scale_stretch">Stretch</string>
+    <string name="scale_fit_width">Fit Width</string>
+    <string name="scale_fit_height">Fit Height</string>
+    <string name="scale_original">Original Size</string>
+    <string name="scale_smart">Smart Fit</string>
+    <string name="navigation_mode">Navigation mode</string>
+    <string name="nav_l_shaped">L shaped</string>
+    <string name="nav_kindle_ish">Kindle-ish</string>
+    <string name="nav_edge">Edge</string>
+    <string name="nav_left_right">Right and Left</string>
+
+    <!-- Server Settings -->
+    <string name="host_server">தாச்சிடெஸ் ஜெ.யு.ஐ.-க்குள் சேவையகம் நடத்தப்படுத்தல்</string> <!--Rough translation;start server inside TachdeskJUI-->
+    <string name="server_url">சேவையகம் Url</string>
+    <string name="server_port">சேவையகம் Port</string>
+</resources>
\ No newline at end of file
diff --git a/src/main/resources/values/values/strings.xml b/src/main/resources/values/values/strings.xml
index 9119c2ff..934394d7 100644
--- a/src/main/resources/values/values/strings.xml
+++ b/src/main/resources/values/values/strings.xml
@@ -102,7 +102,7 @@
     <!-- Appearance Settings -->
     <string name="theme">Theme</string>
     <string name="theme_light">Light</string>
-    <string name="theme_Dark">Light</string>
+    <string name="theme_dark">Dark</string>
     <string name="theme_text">Text</string>
     <string name="preset_themes">Preset themes</string>
     <string name="color_primary">Color primary</string>