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

This commit is contained in:
Victor Shcherb 2015-04-08 23:14:21 +02:00
commit 4af70a04af
6 changed files with 10 additions and 2 deletions

View file

@ -1946,4 +1946,5 @@
<string name="shared_string_address">Адрас</string> <string name="shared_string_address">Адрас</string>
<string name="shared_string_show_description">Паказаць апісаньне</string> <string name="shared_string_show_description">Паказаць апісаньне</string>
<string name="shared_string_search">Пошук</string> <string name="shared_string_search">Пошук</string>
<string name="shared_string_places">Месцы</string>
</resources> </resources>

View file

@ -1987,9 +1987,10 @@
<string name="confirm_usage_speed_cameras">I mange lande (Tyskland, Frankrig, Italien og andre) er anvendelse af fartkamera advarsler ikke tilladt ved lov. OsmAnd påtager sig ikke ansvaret, hvis loven overtrædes. Klik kun på Ja, hvis det er berettiget at bruge denne funktion.</string> <string name="confirm_usage_speed_cameras">I mange lande (Tyskland, Frankrig, Italien og andre) er anvendelse af fartkamera advarsler ikke tilladt ved lov. OsmAnd påtager sig ikke ansvaret, hvis loven overtrædes. Klik kun på Ja, hvis det er berettiget at bruge denne funktion.</string>
<string name="agps_info">A-GPS information</string> <string name="agps_info">A-GPS information</string>
<string name="agps_data_last_downloaded">A-GPS data sidst hentet: %1$s</string> <string name="agps_data_last_downloaded">A-GPS data sidst hentet: %1$s</string>
<string name="shared_string_message">Besked</string> <string name="shared_string_message">Meddelelse</string>
<string name="shared_string_do_not_use">Brug ikke</string> <string name="shared_string_do_not_use">Brug ikke</string>
<string name="shared_string_address">Adresse</string> <string name="shared_string_address">Adresse</string>
<string name="shared_string_show_description">Vis beskrivelse</string> <string name="shared_string_show_description">Vis beskrivelse</string>
<string name="shared_string_search">Søg</string> <string name="shared_string_search">Søg</string>
<string name="shared_string_places">Steder</string>
</resources> </resources>

View file

@ -2011,4 +2011,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="shared_string_address">Adresse</string> <string name="shared_string_address">Adresse</string>
<string name="shared_string_show_description">Afficher la description</string> <string name="shared_string_show_description">Afficher la description</string>
<string name="shared_string_search">Rechercher</string> <string name="shared_string_search">Rechercher</string>
<string name="shared_string_places">Lieux</string>
</resources> </resources>

View file

@ -2168,4 +2168,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="shared_string_do_not_use">Non usare</string> <string name="shared_string_do_not_use">Non usare</string>
<string name="shared_string_address">Indirizzi</string> <string name="shared_string_address">Indirizzi</string>
<string name="shared_string_show_description">Mostra la descrizione</string> <string name="shared_string_show_description">Mostra la descrizione</string>
<string name="shared_string_places">Luoghi</string>
<string name="shared_string_search">Cerca</string>
</resources> </resources>

View file

@ -2143,4 +2143,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="shared_string_do_not_use">Nepoužívať</string> <string name="shared_string_do_not_use">Nepoužívať</string>
<string name="shared_string_address">Adresa</string> <string name="shared_string_address">Adresa</string>
<string name="shared_string_show_description">Zobraziť popis</string> <string name="shared_string_show_description">Zobraziť popis</string>
<string name="shared_string_places">Miesta</string>
<string name="shared_string_search">Hľadať</string>
</resources> </resources>

View file

@ -324,11 +324,12 @@ public class ConfigureMapMenu {
} }
} }
static String[] mapNamesIds = new String[] { "", "en", "be", "ca", "cs", "da", "de", "el", "es", "fi", "fr", "he", "hi", static String[] mapNamesIds = new String[] { "", "en", "ar", "be", "ca", "cs", "da", "de", "el", "es", "fi", "fr", "he", "hi",
"hr", "hu", "it", "ja", "ko", "lv", "nl", "pl", "ro", "ru", "sk", "sl", "sv", "sw", "zh" }; "hr", "hu", "it", "ja", "ko", "lv", "nl", "pl", "ro", "ru", "sk", "sl", "sv", "sw", "zh" };
private String[] getMapNamesValues(Context ctx) { private String[] getMapNamesValues(Context ctx) {
return new String[] { ctx.getString(R.string.local_map_names), ctx.getString(R.string.lang_en), return new String[] { ctx.getString(R.string.local_map_names), ctx.getString(R.string.lang_en),
ctx.getString(R.string.lang_ar),
ctx.getString(R.string.lang_be), ctx.getString(R.string.lang_ca), ctx.getString(R.string.lang_cs), ctx.getString(R.string.lang_be), ctx.getString(R.string.lang_ca), ctx.getString(R.string.lang_cs),
ctx.getString(R.string.lang_da), ctx.getString(R.string.lang_de), ctx.getString(R.string.lang_el), ctx.getString(R.string.lang_da), ctx.getString(R.string.lang_de), ctx.getString(R.string.lang_el),
ctx.getString(R.string.lang_es), ctx.getString(R.string.lang_fi), ctx.getString(R.string.lang_fr), ctx.getString(R.string.lang_es), ctx.getString(R.string.lang_fi), ctx.getString(R.string.lang_fr),