Fix merge

This commit is contained in:
Dima-1 2020-06-04 17:40:58 +03:00
parent 8ff2ee215d
commit 8d1fc4d61a

View file

@ -19,7 +19,6 @@
<string name="delete_all_actions_message_q">Are you sure you want to irrevocably delete %d quick actions?</string> <string name="delete_all_actions_message_q">Are you sure you want to irrevocably delete %d quick actions?</string>
<string name="shared_string_delete_all_q">Delete all?</string> <string name="shared_string_delete_all_q">Delete all?</string>
<string name="export_import_quick_actions_with_profiles_promo">You can Export or Import quick actions with application profiles.</string> <string name="export_import_quick_actions_with_profiles_promo">You can Export or Import quick actions with application profiles.</string>
<string name="default_screen_timeout">System screen timeout</string>
<string name="tiles_storage_descr">Choose how downloaded tiles will be stored.</string> <string name="tiles_storage_descr">Choose how downloaded tiles will be stored.</string>
<string name="expire_time_descr">Expiration time in minutes. Cached tiles will be reloaded after specified time. <string name="expire_time_descr">Expiration time in minutes. Cached tiles will be reloaded after specified time.
Leave this field empty to never refresh tiles for this source. Leave this field empty to never refresh tiles for this source.
@ -37,7 +36,6 @@
<string name="sqlite_db_file">SQLiteDB file</string> <string name="sqlite_db_file">SQLiteDB file</string>
<string name="one_image_per_tile">One image file per tile</string> <string name="one_image_per_tile">One image file per tile</string>
<string name="pseudo_mercator_projection">Pseudo-Mercator projection</string> <string name="pseudo_mercator_projection">Pseudo-Mercator projection</string>
<string name="screen_timeout_descr">This is only effective if \"%1$s\" is disabled.</string>
<string name="keep_screen_off">Keep screen off</string> <string name="keep_screen_off">Keep screen off</string>
<string name="keep_screen_on">Keep screen on</string> <string name="keep_screen_on">Keep screen on</string>
<string name="turn_screen_on_wake_time_descr">Select the screen timeout after waking up. (\"%1$s\" applies no timeout.)</string> <string name="turn_screen_on_wake_time_descr">Select the screen timeout after waking up. (\"%1$s\" applies no timeout.)</string>