Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-08-03 14:16:37 +02:00
commit 74a8139ac9
11 changed files with 131 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/res/values/settings_keys.xml
View file

@ -232,4 +232,22 @@
</string-array>
<string name="show_age_restricted_content" translatable="false">show_age_restricted_content</string>
<string name="use_tor_key" translatable="false">use_tor</string>
<string name="settings_file_charset_key" translatable="false">file_rename</string>
<string name="settings_file_replacement_character_key" translatable="false">file_replacement_character</string>
<string name="settings_file_replacement_character_default_value" translatable="false">_</string>
<string-array
translatable="false"
name="settings_filename_charset">
<item>@string/charset_letters_and_digits_value</item>
<item>@string/charset_most_special_characters_value</item>
</string-array>
<string-array name="settings_filename_charset_name">
<item>@string/charset_letters_and_digits</item>
<item>@string/charset_most_special_characters</item>
</string-array>
<string name="default_file_charset_value" translatable="false">@string/charset_most_special_characters_value</string>
</resources>

12
app/src/main/res/values/strings.xml
View file

@ -190,6 +190,18 @@
<!-- End of GigaGet's Strings -->
<!-- Downloads -->
<string name="settings_category_downloads" translatable="false">settings_category_downloads</string>
<string name="settings_category_downloads_title">Download</string>
<string name="settings_file_charset_title">Allowed characters in filenames</string>
<string name="settings_file_replacement_character_summary">Invalid characters are replaced with this value</string>
<string name="settings_file_replacement_character_title">Replacement character</string>
<string name="charset_letters_and_digits_value" translatable="false">[^\\w\\d]+</string>
<string name="charset_most_special_characters_value" translatable="false">[\\n\\r|\\?*&lt;":&gt;/']+</string>
<string name="charset_letters_and_digits">Letters and digits</string>
<string name="charset_most_special_characters">Most special characters</string>
<!-- About -->
<string name="title_activity_about">About NewPipe</string>
<string name="action_settings">Settings</string>

26
app/src/main/res/xml/settings.xml
View file

@ -133,10 +133,10 @@
</PreferenceCategory>
<PreferenceCategory
android:key="@string/settings_category_other"
android:textAllCaps="true"
android:title="@string/settings_category_other_title">
android:key="@string/settings_category_downloads"
android:title="@string/settings_category_downloads_title">
<Preference
android:dialogTitle="@string/download_path_dialog_title"
@ -150,6 +150,26 @@
android:summary="@string/download_path_audio_summary"
android:title="@string/download_path_audio_title"/>
<ListPreference
android:key="@string/settings_file_charset_key"
android:summary="%s"
android:defaultValue="@string/default_file_charset_value"
android:title="@string/settings_file_charset_title"
android:entryValues="@array/settings_filename_charset"
android:entries="@array/settings_filename_charset_name" />
<EditTextPreference
android:key="@string/settings_file_replacement_character_key"
android:summary="@string/settings_file_replacement_character_summary"
android:defaultValue="@string/settings_file_replacement_character_default_value"
android:title="@string/settings_file_replacement_character_title" />
</PreferenceCategory>
<PreferenceCategory
android:key="@string/settings_category_other"
android:textAllCaps="true"
android:title="@string/settings_category_other_title">
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/autoplay_through_intent_key"