Conflict resolution.
This commit is contained in:
commit
b674006fcc
77 changed files with 8269 additions and 2352 deletions
|
|
@ -174,6 +174,24 @@
|
|||
</string-array>
|
||||
|
||||
<string name="default_file_charset_value" translatable="false">@string/charset_most_special_characters_value</string>
|
||||
|
||||
<string name="downloads_maximum_retry" translatable="false">downloads_max_retry</string>
|
||||
<string name="downloads_maximum_retry_default" translatable="false">3</string>
|
||||
<string-array name="downloads_maximum_retry_list" translatable="false">
|
||||
<item translatable="true">@string/minimize_on_exit_none_description</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
<item>3</item>
|
||||
<item>4</item>
|
||||
<item>5</item>
|
||||
<item>7</item>
|
||||
<item>10</item>
|
||||
<item>15</item>
|
||||
</string-array>
|
||||
|
||||
<string name="downloads_cross_network" translatable="false">cross_network_downloads</string>
|
||||
|
||||
<string name="default_download_threads" translatable="false">default_download_threads</string>
|
||||
|
||||
<!-- Preferred action on open (open from external app) -->
|
||||
<string name="preferred_open_action_key" translatable="false">preferred_open_action_key</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue