Merge branch 'dev' into patch-10
This commit is contained in:
Stypox
GitHub
commit
3b57135a6e
117 changed files with 2871 additions and 2498 deletions
|
|
@ -45,6 +45,7 @@
|
|||
<attr name="ic_grid" format="reference"/>
|
||||
<attr name="ic_delete" format="reference"/>
|
||||
<attr name="ic_settings_update" format="reference"/>
|
||||
<attr name="ic_done" format="reference"/>
|
||||
|
||||
<attr name="progress_horizontal_drawable" format="reference"/>
|
||||
<!-- Can't refer to colors directly in drawable's xml-->
|
||||
|
|
|
|||
|
|
@ -31,20 +31,20 @@
|
|||
<string name="seek_duration_key" translatable="false">seek_duration</string>
|
||||
<string name="seek_duration_default_value" translatable="false">10000</string>
|
||||
<string-array name="seek_duration_description" translatable="false">
|
||||
<item>5 seconds</item>
|
||||
<item>10 seconds</item>
|
||||
<item>15 seconds</item>
|
||||
<item>20 seconds</item>
|
||||
<item>25 seconds</item>
|
||||
<item>30 seconds</item>
|
||||
<item>5 seconds</item>
|
||||
<item>10 seconds</item>
|
||||
<item>15 seconds</item>
|
||||
<item>20 seconds</item>
|
||||
<item>25 seconds</item>
|
||||
<item>30 seconds</item>
|
||||
</string-array>
|
||||
<string-array name="seek_duration_value" translatable="false">
|
||||
<item>5000</item>
|
||||
<item>10000</item>
|
||||
<item>15000</item>
|
||||
<item>20000</item>
|
||||
<item>25000</item>
|
||||
<item>30000</item>
|
||||
<item>5000</item>
|
||||
<item>10000</item>
|
||||
<item>15000</item>
|
||||
<item>20000</item>
|
||||
<item>25000</item>
|
||||
<item>30000</item>
|
||||
</string-array>
|
||||
|
||||
<string name="minimize_on_exit_key" translatable="false">minimize_on_exit_key</string>
|
||||
|
|
@ -175,6 +175,8 @@
|
|||
<string name="main_page_content_key" translatable="false">main_page_content</string>
|
||||
<string name="enable_playback_resume_key" translatable="false">enable_playback_resume</string>
|
||||
<string name="enable_playback_state_lists_key" translatable="false">enable_playback_state_lists</string>
|
||||
|
||||
<string name="app_language_key" translatable="false">app_language_key</string>
|
||||
<string name="enable_lock_screen_video_thumbnail_key" translatable="false">enable_lock_screen_video_thumbnail</string>
|
||||
|
||||
<string name="import_data" translatable="false">import_data</string>
|
||||
|
|
@ -924,6 +926,138 @@
|
|||
<item>ZW</item>
|
||||
</string-array>
|
||||
|
||||
<!--The next two arrays are set to change the app language-->
|
||||
<string-array name="app_language_code" translatable="false">
|
||||
<item>system</item>
|
||||
<item>ar</item>
|
||||
<item>az</item>
|
||||
<item>ast</item>
|
||||
<item>be</item>
|
||||
<item>bg-bd</item>
|
||||
<item>bn</item>
|
||||
<item>ca</item>
|
||||
<item>cs</item>
|
||||
<item>da</item>
|
||||
<item>de</item>
|
||||
<item>el</item>
|
||||
<item>en</item>
|
||||
<item>eo</item>
|
||||
<item>es</item>
|
||||
<item>et</item>
|
||||
<item>eu</item>
|
||||
<item>fa</item>
|
||||
<item>fi</item>
|
||||
<item>fil</item>
|
||||
<item>fr</item>
|
||||
<item>gl</item>
|
||||
<item>he</item>
|
||||
<item>hi</item>
|
||||
<item>hr</item>
|
||||
<item>hu</item>
|
||||
<item>hy</item>
|
||||
<item>ia</item>
|
||||
<item>in</item>
|
||||
<item>it</item>
|
||||
<item>ja</item>
|
||||
<item>ko</item>
|
||||
<item>ku</item>
|
||||
<item>lt</item>
|
||||
<item>mk</item>
|
||||
<item>ms</item>
|
||||
<item>nb-no</item>
|
||||
<item>ne</item>
|
||||
<item>nl</item>
|
||||
<item>nl-be</item>
|
||||
<item>oc</item>
|
||||
<item>pa</item>
|
||||
<item>pl</item>
|
||||
<item>pr</item>
|
||||
<item>pt</item>
|
||||
<item>pt-br</item>
|
||||
<item>ro</item>
|
||||
<item>ru</item>
|
||||
<item>sk</item>
|
||||
<item>sl</item>
|
||||
<item>sq</item>
|
||||
<item>sr</item>
|
||||
<item>sv</item>
|
||||
<item>ta</item>
|
||||
<item>te</item>
|
||||
<item>th</item>
|
||||
<item>tr</item>
|
||||
<item>uk</item>
|
||||
<item>ur</item>
|
||||
<item>vi</item>
|
||||
<item>zh-cn</item>
|
||||
<item>zh-hk</item>
|
||||
<item>zh-tw</item>
|
||||
</string-array>
|
||||
<string-array name="app_language_name" translatable="false">
|
||||
<item>@string/systems_language</item>
|
||||
<item>العربية</item>
|
||||
<item>Azərbaycan dili</item>
|
||||
<item>Asturianu</item>
|
||||
<item>Беларуская</item>
|
||||
<item>български език</item>
|
||||
<item>বাংলা</item>
|
||||
<item>Català</item>
|
||||
<item>Čeština</item>
|
||||
<item>Dansk</item>
|
||||
<item>Deutsch</item>
|
||||
<item>Ελληνικά</item>
|
||||
<item>English</item>
|
||||
<item>Esperanto</item>
|
||||
<item>Español</item>
|
||||
<item>Eesti keel</item>
|
||||
<item>Euskara</item>
|
||||
<item>فارسی</item>
|
||||
<item>Suomen kieli</item>
|
||||
<item>Wikang Filipino</item>
|
||||
<item>Français</item>
|
||||
<item>Galego</item>
|
||||
<item>עברית</item>
|
||||
<item>हिन्दी</item>
|
||||
<item>Hrvatski</item>
|
||||
<item>magyar</item>
|
||||
<item>Հայերեն</item>
|
||||
<item>Interlingua</item>
|
||||
<item>Bahasa Indonesia</item>
|
||||
<item>Italiano</item>
|
||||
<item>日本語</item>
|
||||
<item>한국어</item>
|
||||
<item>کوردی</item>
|
||||
<item>Lietuvių kalba</item>
|
||||
<item>македонски јазик</item>
|
||||
<item>Bahasa Melayu</item>
|
||||
<item>Norsk bokmål</item>
|
||||
<item>Nनेपाली</item>
|
||||
<item>Nederlands (NL)</item>
|
||||
<item>Nederlands (BE)</item>
|
||||
<item>Occitan</item>
|
||||
<item>ਪੰਜਾਬੀ</item>
|
||||
<item>Polski</item>
|
||||
<item>Pirate Language</item>
|
||||
<item>Português (PT)</item>
|
||||
<item>Português (BR)</item>
|
||||
<item>Română</item>
|
||||
<item>русский язык</item>
|
||||
<item>Slovenčina</item>
|
||||
<item>Slovenščina</item>
|
||||
<item>Shqip</item>
|
||||
<item>Српски</item>
|
||||
<item>Svenska</item>
|
||||
<item>தமிழ்</item>
|
||||
<item>తెలుగు</item>
|
||||
<item>ไทย</item>
|
||||
<item>Türkçe</item>
|
||||
<item>українська мова</item>
|
||||
<item>اردو</item>
|
||||
<item>Tiếng Việt</item>
|
||||
<item>简体中文</item>
|
||||
<item>繁體中文（廣東話）</item>
|
||||
<item>正體中文</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Limit mobile data usage -->
|
||||
<string name="limit_mobile_data_usage_key" translatable="false">limit_mobile_data_usage</string>
|
||||
<string name="limit_data_usage_none_key" translatable="false">limit_data_usage_none</string>
|
||||
|
|
|
|||
|
|
@ -227,6 +227,7 @@
|
|||
<string name="saved_tabs_invalid_json">Could not read saved tabs, so using default ones</string>
|
||||
<string name="restore_defaults">Restore defaults</string>
|
||||
<string name="restore_defaults_confirmation">Do you want to restore defaults?</string>
|
||||
<string name="permission_display_over_apps">Give permission to display over other apps</string>
|
||||
<!-- error activity -->
|
||||
<string name="sorry_string">Sorry, that should not have happened.</string>
|
||||
<string name="guru_meditation" translatable="false">Guru Meditation.</string>
|
||||
|
|
@ -326,10 +327,12 @@
|
|||
<!-- Checksum types -->
|
||||
<string name="md5" translatable="false">MD5</string>
|
||||
<string name="sha1" translatable="false">SHA-1</string>
|
||||
<string name="reCaptchaActivity" translatable="false">reCAPTCHA</string>
|
||||
<string name="reCaptcha_title">reCAPTCHA challenge</string>
|
||||
<!-- reCAPTCHA -->
|
||||
<string name="recaptcha" translatable="false">reCAPTCHA</string>
|
||||
<string name="title_activity_recaptcha">reCAPTCHA challenge</string>
|
||||
<string name="subtitle_activity_recaptcha">Press \"Done\" when solved</string>
|
||||
<string name="recaptcha_request_toast">reCAPTCHA challenge requested</string>
|
||||
<!-- End of GigaGet's Strings -->
|
||||
<string name="recaptcha_done_button">Done</string>
|
||||
<!-- Downloads -->
|
||||
<string name="settings_category_downloads_title">Download</string>
|
||||
<string name="settings_file_charset_title">Allowed characters in filenames</string>
|
||||
|
|
@ -569,8 +572,10 @@
|
|||
<string name="error_progress_lost">Progress lost, because the file was deleted</string>
|
||||
<string name="error_timeout">Connection timeout</string>
|
||||
<string name="error_download_resource_gone">Cannot recover this download</string>
|
||||
<string name="clear_finished_download">Clear finished downloads</string>
|
||||
<string name="confirm_prompt">Are you sure?</string>
|
||||
<string name="clear_download_history">Clear download history</string>
|
||||
<string name="confirm_prompt">Do you want to clear your download history or delete all downloaded files?</string>
|
||||
<string name="delete_downloaded_files">Delete downloaded files</string>
|
||||
<string name="deleted_downloads">Deleted %1$s downloads</string>
|
||||
<string name="stop">Stop</string>
|
||||
<string name="max_retry_msg">Maximum retries</string>
|
||||
<string name="max_retry_desc">Maximum number of attempts before canceling the download</string>
|
||||
|
|
@ -587,5 +592,6 @@
|
|||
<string name="downloads_storage_use_saf_title">Use SAF</string>
|
||||
<string name="downloads_storage_use_saf_summary">The \'Storage Access Framework\' allows downloads to an external SD card.\nNote: Some devices are incompatible</string>
|
||||
<string name="choose_instance_prompt">Choose an instance</string>
|
||||
|
||||
<string name="app_language_title">App language</string>
|
||||
<string name="systems_language">System default</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
<item name="ic_grid">@drawable/ic_grid_black_24dp</item>
|
||||
<item name="ic_delete">@drawable/ic_delete_black_24dp</item>
|
||||
<item name="ic_settings_update">@drawable/ic_settings_update_black</item>
|
||||
<item name="ic_done">@drawable/ic_done_black_24dp</item>
|
||||
|
||||
<item name="separator_color">@color/light_separator_color</item>
|
||||
<item name="contrast_background_color">@color/light_contrast_background_color</item>
|
||||
|
|
@ -129,6 +130,7 @@
|
|||
<item name="ic_delete">@drawable/ic_delete_white_24dp</item>
|
||||
<item name="pause">@drawable/ic_pause_white_24dp</item>
|
||||
<item name="ic_settings_update">@drawable/ic_settings_update_white</item>
|
||||
<item name="ic_done">@drawable/ic_done_white_24dp</item>
|
||||
|
||||
<item name="separator_color">@color/dark_separator_color</item>
|
||||
<item name="contrast_background_color">@color/dark_contrast_background_color</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue