Merge branch 'master' of ssh://github.com/osmandapp/Osmand into general_preferences_fixes

This commit is contained in:
Chumva 2019-10-22 17:35:27 +03:00
commit 50b486405d
2 changed files with 3 additions and 3 deletions

View file

@ -3228,7 +3228,7 @@
<string name="sett_no_ext_input">Ingen</string>
<string name="change_data_storage_full_description">Flytt OsmAnd-datafiler til det nye målet\?
\n%1$s &gt; %2$s</string>
<string name="data_storage_preference_summary">%1$s • %2$s GB brukt</string>
<string name="data_storage_preference_summary">%1$s • %2$s</string>
<string name="data_storage_space_description">%1$s GB ledig • %2$s GB totalt</string>
<string name="shared_string_select_folder">Velg mappe</string>
<string name="change_osmand_data_folder_question">Endre OsmAnd-datamappe\?</string>

View file

@ -3259,8 +3259,8 @@
<string name="change_data_storage_full_description">Переместите файлы данных OsmAnd в новое место назначения\?
\n%1$s &gt; %2$s</string>
<string name="shared_string_by_default">По умолчанию</string>
<string name="data_storage_preference_summary">%1$s • Использовано %2$s ГБ</string>
<string name="data_storage_space_description">"Свободно %1$s • %2$s / %3$s ГБ"</string>
<string name="data_storage_preference_summary">%1$s • %2$s</string>
<string name="data_storage_space_description">"Свободно %1$s ГБ • Всего %2$s ГБ"</string>
<string name="enter_path_to_folder">Введите путь к папке</string>
<string name="shared_string_select_folder">Выберите папку</string>
<string name="paste_Osmand_data_folder_path">Вставить путь к папке с данными OsmAnd</string>