Merge remote-tracking branch 'origin/master'

OsmAnd/res/values-be/strings.xml

@@ -1957,7 +1957,7 @@
     <string name="favorite_category_add_new_title">Дадаць новую катэгорыю</string>
     <string name="favorite_category_dublicate_message">Катэгорыя з пазначанай назвай ужо існуе. Калі ласка, падайце іншую назву.</string>
     <string name="confirm_download_roadmaps">Вы ўпэўненыя, што хочаце сьцягнуць мапу аўтадарог, нават калі ў вас ёсць поўная мапа?</string>
-    <string name="value_downloaded_from_max">%1$.1f з %2$.1f Мб</string>
+    <string name="value_downloaded_of_max">%1$.1f з %2$.1f Мб</string>
     <string name="file_size_in_mb">%.1f Мб</string>
     <string name="update_all">Абнавіць усе (%1$s МБ)</string>
     <string name="free_downloads_used">Выкарыстана бясплатных загрузак</string>

OsmAnd/res/values-ca/strings.xml

@@ -1771,7 +1771,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="favorite_category_name">Nom de categoria</string>
     <string name="favorite_category_add_new_title">Afegeix una nova categoria</string>
     <string name="confirm_download_roadmaps">N\'esteu segur de baixar el mapa amb només carreteres, quan ja teniu el mapa normal (complet)?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualitzeu tot (%1$s MB)</string>
     <string name="free_downloads_used">Baixades gratuïtes realitzades</string>

OsmAnd/res/values-cs/strings.xml

@@ -1767,7 +1767,7 @@
     <string name="later">Později</string>
     <string name="get_full_version">Plná verze</string>
     <string name="downloads">Stahování</string>
-    <string name="value_downloaded_from_max">%1$.1f z %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f z %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Aktualizovat vše (%1$s MB)</string>
     <string name="free_downloads_used">Použito volných stáhnutí</string>

OsmAnd/res/values-da/strings.xml

@@ -2011,7 +2011,7 @@
     <string name="favorite_category_name">Kategorinavn</string>
     <string name="favorite_category_add_new_title">Tilføj ny kategori</string>
     <string name="confirm_download_roadmaps">Hent kort kun med veje, selv om et komplet standardkort allerede er hentet?</string>
-    <string name="value_downloaded_from_max">%1$.1f af %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f af %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Opdater alle (%1$s MB)</string>
     <string name="free_downloads_used_description">Indstil hvormange gratis filhentninger der er brugt</string>

OsmAnd/res/values-de/strings.xml

@@ -2176,7 +2176,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="activate_srtm_plugin">Bitte das SRTM-Plugin aktivieren</string>
     <string name="get_full_version">Vollversion</string>
     <string name="confirm_download_roadmaps">Soll wirklich die reine Straßenkarte heruntergeladen werden, obwohl bereits die vollständige Standardkarte vorhanden ist?</string>
-    <string name="value_downloaded_from_max">%1$.1f von %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f von %2$.1f MB</string>
     <string name="update_all">Alles aktualisieren (%1$s MB)</string>
     <string name="free_downloads_used">Verbrauchte freie Downloads</string>
     <string name="enter_country_name">Name des Landes eingeben</string>

OsmAnd/res/values-es-rAR/strings.xml

@@ -1900,7 +1900,7 @@
     <string name="favorite_category_name">Nombre de categoría</string>
     <string name="favorite_category_add_new_title">Añadir nueva categoría</string>
     <string name="confirm_download_roadmaps">¿Desea descargar el mapa vial, aunque ya tenga el mapa estándar (completo)?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualizar todo (%1$s MB)</string>
     <string name="free_downloads_used">Descargas gratis usadas</string>

OsmAnd/res/values-es/strings.xml

@@ -1898,7 +1898,7 @@
     <string name="favorite_category_name">Nombre de categoría</string>
     <string name="favorite_category_add_new_title">Añadir nueva categoría</string>
     <string name="confirm_download_roadmaps">¿Desea descargar el mapa de sólo carreteras, aunque ya tenga el mapa estándar (completo)?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualizar todo (%1$s MB)</string>
     <string name="free_downloads_used">Descargas gratis usadas</string>

OsmAnd/res/values-fr/strings.xml

@@ -2028,7 +2028,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="favorite_category_add_new_title">Ajouter une catégorie</string>
     <string name="favorite_category_dublicate_message">Cette catégorie existe déjà. Merci d\'indiquer un autre nom.</string>
     <string name="confirm_download_roadmaps">Êtes-vous certain de vouloir télécharger la carte des routes alors que vous disposez déjà d\'une carte complète ?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Tout mettre à jour (%1$s MB)</string>
     <string name="free_downloads_used">Téléchargements gratuits effectués</string>

OsmAnd/res/values-gl/strings.xml

@@ -1905,7 +1905,7 @@
     <string name="get_full_version">Versión completa</string>
     <string name="downloads">Descargas</string>
     <string name="confirm_download_roadmaps">Confirma que desexa descargar un mapa de estradas, aínda que ten o mapa completo?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualizar todo (%1$s MB)</string>
     <string name="free_downloads_used">Descargas gratuítas empregadas</string>

OsmAnd/res/values-hu/strings.xml

@@ -1944,7 +1944,7 @@
     <string name="favorite_category_name">Kategórianév</string>
     <string name="favorite_category_add_new_title">Új kategória létrehozása</string>
     <string name="confirm_download_roadmaps">Biztosan letöltesz csak utakat tartalmazó térképet, annak ellenére, hogy már van teljes térképed?</string>
-    <string name="value_downloaded_from_max">%1$.1f / %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f / %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Összes frissítése (%1$s MB)</string>
     <string name="free_downloads_used">Elhasznált ingyenes letöltés</string>

OsmAnd/res/values-it/strings.xml

@@ -1989,7 +1989,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="favorite_category_name">Nome della categoria</string>
     <string name="favorite_category_add_new_title">Aggiungi una nuova categoria</string>
     <string name="confirm_download_roadmaps">Sei sicuro di volere scaricare mappe solo stradali anche se disponi di mappe complete?</string>
-    <string name="value_downloaded_from_max">%1$.1f di %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f di %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Aggiorna tutto (%1$s MB)</string>
     <string name="free_downloads_used">Download gratuiti utilizzati</string>

OsmAnd/res/values-ja/strings.xml

@@ -2030,7 +2030,7 @@ POIの更新は利用できません</string>
     <string name="get_full_version">フルバージョンを入手</string>
     <string name="downloads">ダウンロード</string>
 <string name="confirm_download_roadmaps">標準の(完全な)マップがありますが、道路のみのマップをダウンロードしてよろしいですか？</string>
-    <string name="value_downloaded_from_max">%1$.1f ／ %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f ／ %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">全て更新(%1$s MB)</string>
     <string name="free_downloads_used">使用済み無料ダウンロード枠</string>

OsmAnd/res/values-ko/strings.xml

@@ -2213,5 +2213,5 @@
     <string name="downloads">다운로드</string>
     <string name="confirm_download_roadmaps">모든 지도를 가지고 있더러도 지도를 다운로드 하시겠습니까?</string>
     <string name="file_size_in_mb">%.1f MB</string>
-<string name="value_downloaded_from_max">%2$.1f MB 에서 %1$.1f</string>
+<string name="value_downloaded_of_max">%2$.1f MB 에서 %1$.1f</string>
     </resources>

OsmAnd/res/values-lt/strings.xml

@@ -1934,7 +1934,7 @@
     <string name="favorite_category_add_new_title">Pridėti naują kategoriją</string>
     <string name="get_full_version">Visa versija</string>
     <string name="downloads">Atsisiuntimai</string>
-    <string name="value_downloaded_from_max">%1$.1f iš %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f iš %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Atnaujinti viską (%1$s MB)</string>
     <string name="srtm_plugin_disabled">Kontūro linijos išjungtos</string>

OsmAnd/res/values-nb/strings.xml

@@ -1401,7 +1401,7 @@
     <string name="map_downloaded_descr">Kart over %1$s har blitt lastet ned. Gå tilbake til kartet for å begynne å bruke det.</string>
     <string name="go_to_map">Gå til kartet</string>
     <string name="downloads">Nedlastinger</string>
-    <string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f av %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Oppdater alle (%1$s MB)</string>
     <string name="free_downloads_used">Gratis nedlastinger brukt</string>

OsmAnd/res/values-nl/strings.xml

@@ -2162,7 +2162,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="later">Later</string>
     <string name="downloads">Downloads</string>
     <string name="confirm_download_roadmaps">U heeft de volledige kaart al. Wilt u echt de kaart met alleen wegen downloaden?</string>
-    <string name="value_downloaded_from_max">%1$.1f van %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f van %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Alles updaten (%1$s MB)</string>
     <string name="free_downloads_used">Gebruikte gratis downloads</string>

OsmAnd/res/values-pl/strings.xml

@@ -2055,7 +2055,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
     <string name="update_all">Uaktualnij wszystko (%1$s MB)</string>
     <string name="free_downloads_used">Wykorzystano darmowe pobrania</string>
     <string name="application_dir_description">Proszę wybrać położenie zapisywania plików map.</string>
-<string name="value_downloaded_from_max">%1$.1f z %2$.1f MB</string>
+<string name="value_downloaded_of_max">%1$.1f z %2$.1f MB</string>
     <string name="shared_string_qr_code">Kod QR</string>
     <string name="enter_country_name">Proszę wybrać kraj</string>
 <string name="map_downloaded_descr">Mapa %1$s została pobrana. Proszę powrócić do mapy, aby rozpocząć jej używanie.</string>

OsmAnd/res/values-ru/strings.xml

@@ -1792,7 +1792,7 @@
     <string name="show_free_version_banner">Показывать баннер бесплатной версии</string>
     <string name="show_free_version_banner_description">Даже если у вас купленная версия вы также можете видеть баннер для бесплатной версии</string>
     <string name="confirm_download_roadmaps">Вы уверены, что хотите скачать карту автодорог, даже если у вас есть полная карта?</string>
-    <string name="value_downloaded_from_max">%1$.1f из %2$.1f Мб</string>
+    <string name="value_downloaded_of_max">%1$.1f из %2$.1f Мб</string>
     <string name="file_size_in_mb">%.1f МБ</string>
     <string name="update_all">Обновить все (%1$s МБ)</string>
     <string name="free_downloads_used">Использовано бесплатных загрузок</string>

OsmAnd/res/values-sc/strings.xml

@@ -1931,7 +1931,7 @@
     <string name="favorite_category_name">Nùmene de sa categoria</string>
     <string name="favorite_category_add_new_title">Annanghe una categoria noa</string>
     <string name="confirm_download_roadmaps">Seguru ses de bòlere iscarrigare sa mapa cun petzi sas istradas, fintzas si tenes giai cussa cumprida?</string>
-    <string name="value_downloaded_from_max">%1$.1f dae %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f dae %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Agiorna totu (%1$s MB)</string>
     <string name="free_downloads_used">Iscarrigamentos gratùitos impreados</string>

OsmAnd/res/values-sk/strings.xml

@@ -1843,7 +1843,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="favorite_category_name">Názov kategórie</string>
     <string name="favorite_category_add_new_title">Pridať novú kategóriu</string>
     <string name="confirm_download_roadmaps">Naozaj chcete stiahnuť mapu obsahujúcu iba cesty, keď už máte štandardnú (plnú) mapu?</string>
-    <string name="value_downloaded_from_max">%1$.1f z %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f z %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Aktualizovať všetko (%1$s MB)</string>
     <string name="free_downloads_used">Počet použitých voľných stiahnutí</string>

OsmAnd/res/values-sl/strings.xml

@@ -1935,7 +1935,7 @@
     <string name="favorite_category_name">Ime kategorije</string>
     <string name="favorite_category_add_new_title">Dodaj kategorijo</string>
     <string name="confirm_download_roadmaps">Ali ste prepričani, da želite prejeti zemljevid le s podatki cest, čeprav je nameščen že polni zemljevid?</string>
-    <string name="value_downloaded_from_max">%1$.1f od %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f od %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Posodobi vse (%1$s MB)</string>
     <string name="free_downloads_used">Omejitev brezplačnih prejemov je dosežena.</string>

OsmAnd/res/values-sv/strings.xml

@@ -1920,7 +1920,7 @@
     <string name="favorite_category_add_new_title">Lägg till en ny kategori</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="confirm_download_roadmaps">Är du säker på att du vill hämta kartan med enbart vägar trots att du redan har den fullständiga kartan?</string>
-    <string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f av %2$.1f MB</string>
     <string name="update_all">Uppdatera alla (%1$s MB)</string>
     <string name="free_downloads_used">Gratis nedladdningar hämtade</string>
     <string name="free_downloads_used_description">Du kan ange hur många gratis nedladdningar som du har gjort</string>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -1917,7 +1917,7 @@
     <string name="favorite_category_name">類別名稱</string>
     <string name="favorite_category_add_new_title">增加新的類別</string>
     <string name="confirm_download_roadmaps">您確定要下載只有道路的地圖，即使您已經擁有標準(完整的)地圖？</string>
-    <string name="value_downloaded_from_max">%1$.1f 從 %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f 從 %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">全部更新 (%1$s MB)</string>
     <string name="free_downloads_used">免費下載使用</string>

OsmAnd/res/values/strings.xml

@@ -1693,7 +1693,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="osmand_net_previously_installed">A previous OsmAnd version is installed. All offline data will be supported by the new application. But Favorite points should be exported in the old application and later imported by the new one.</string>
 	<string name="build_installed">Build {0} successfully installed ({1}).</string>
 	<string name="downloading_build">Downloading build…</string>
-	<string name="install_selected_build">Do you want to install OsmAnd - {0} from {1} {2} MB ?</string>
+	<string name="install_selected_build">Do you want to install OsmAnd - {0} of {1} {2} MB ?</string>
 	<string name="loading_builds_failed">Retrieving the list of OsmAnd builds failed</string>
 	<string name="loading_builds">Loading OsmAnd builds…</string>
 	<string name="select_build_to_install">Select an OsmAnd build to install</string>
@@ -2063,7 +2063,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="get_full_version">Full version</string>
     <string name="downloads">Downloads</string>
     <string name="confirm_download_roadmaps">Are you sure you want to download the roads-only map, even though you already have the standard (full) map?</string>
-    <string name="value_downloaded_from_max">%1$.1f from %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f of %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Update all (%1$s MB)</string>
     <string name="free_downloads_used">Free downloads used</string>

OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java

@@ -189,7 +189,7 @@ public class ItemViewHolder {
 				double mb = indexItem.getArchiveSizeMB();
 				String v ;
 				if (progress != -1) {
-					v = context.getString(R.string.value_downloaded_from_max, mb * progress / 100, mb);
+					v = context.getString(R.string.value_downloaded_of_max, mb * progress / 100, mb);
 				} else {
 					v = context.getString(R.string.file_size_in_mb, mb);
 				}

OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java

@@ -260,7 +260,7 @@ public class MapDataMenuController extends MenuController {
 			double mb = indexItem.getArchiveSizeMB();
 			String v ;
 			if (titleProgressController.progress != -1) {
-				v = getMapActivity().getString(R.string.value_downloaded_from_max, mb * titleProgressController.progress / 100, mb);
+				v = getMapActivity().getString(R.string.value_downloaded_of_max, mb * titleProgressController.progress / 100, mb);
 			} else {
 				v = getMapActivity().getString(R.string.file_size_in_mb, mb);
 			}