Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-11-06 13:00:56 +01:00
commit b664e7e861
13 changed files with 16 additions and 16 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Gebou</string> <string name="poi_yes">Gebou</string>
<string name="poi_administrative">Administratiewe grens</string> <string name="poi_administrative">Administratiewe grens</string>
<string name="poi_airport">Lughawe</string> <string name="poi_airport">Lughawe</string>
<string name="poi_alpine_hut">Berghut</string> <string name="poi_alpine_hut">Berghut</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">مبنى</string> <string name="poi_yes">مبنى</string>
<string name="poi_abandoned">سكة حديد مهجورة</string> <string name="poi_abandoned">سكة حديد مهجورة</string>
<string name="poi_administrative">حدود إدارية</string> <string name="poi_administrative">حدود إدارية</string>
<string name="poi_airport">مطار</string> <string name="poi_airport">مطار</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Edifici</string> <string name="poi_yes">Edifici</string>
<string name="poi_airport">Aeroport</string> <string name="poi_airport">Aeroport</string>
<string name="poi_alpine_hut">Cabanya alpina</string> <string name="poi_alpine_hut">Cabanya alpina</string>
<string name="poi_apartments">Bloc d\'apartaments</string> <string name="poi_apartments">Bloc d\'apartaments</string>

View file

@ -266,7 +266,7 @@
<string name="poi_fountain">Springbrunnen</string> <string name="poi_fountain">Springbrunnen</string>
<string name="poi_free_flying">Freeflying</string> <string name="poi_free_flying">Freeflying</string>
<string name="poi_fuel">Tankstelle</string> <string name="poi_fuel">Tankstelle</string>
<string name="poi_full-height_turnstile">hohes Drehkreuz</string> <string name="poi_full_height_turnstile">hohes Drehkreuz</string>
<string name="poi_funeral_directors">Bestatter</string> <string name="poi_funeral_directors">Bestatter</string>
<string name="poi_funicular">Seilbahn</string> <string name="poi_funicular">Seilbahn</string>
<string name="poi_furniture">Möbelgeschäft</string> <string name="poi_furniture">Möbelgeschäft</string>
@ -501,7 +501,7 @@
<string name="poi_rugby_union">Rugby Union</string> <string name="poi_rugby_union">Rugby Union</string>
<string name="poi_ruins">Ruine</string> <string name="poi_ruins">Ruine</string>
<string name="poi_running_track">Laufsport</string> <string name="poi_running_track">Laufsport</string>
<string name="poi_sally port">Gebäudedurchfahrt</string> <string name="poi_sally_port">Gebäudedurchfahrt</string>
<string name="poi_salon">Salon</string> <string name="poi_salon">Salon</string>
<string name="poi_salt_pond">Meerwassersaline</string> <string name="poi_salt_pond">Meerwassersaline</string>
<string name="poi_sauna">Sauna</string> <string name="poi_sauna">Sauna</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Edificio</string> <string name="poi_yes">Edificio</string>
<string name="poi_abandoned">Vía de tren abandonada</string> <string name="poi_abandoned">Vía de tren abandonada</string>
<string name="poi_account">Contable</string> <string name="poi_account">Contable</string>
<string name="poi_adit">Galería de mina</string> <string name="poi_adit">Galería de mina</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Eraikina</string> <string name="poi_yes">Eraikina</string>
<string name="poi_administrative">Muga Administratiboa</string> <string name="poi_administrative">Muga Administratiboa</string>
<string name="poi_airport">Aireportu</string> <string name="poi_airport">Aireportu</string>
<string name="poi_alpine_hut">Aterpe alpinoa</string> <string name="poi_alpine_hut">Aterpe alpinoa</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Rakennus</string> <string name="poi_yes">Rakennus</string>
<string name="poi_abandoned">Hylätty rautatie</string> <string name="poi_abandoned">Hylätty rautatie</string>
<string name="poi_administrative">Hallinnollinen raja</string> <string name="poi_administrative">Hallinnollinen raja</string>
<string name="poi_airport">Lentokenttä</string> <string name="poi_airport">Lentokenttä</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Bâtiment</string> <string name="poi_yes">Bâtiment</string>
<string name="poi_10pin">Bowling américain</string> <string name="poi_10pin">Bowling américain</string>
<string name="poi_9pin">Bowling à 9 quilles</string> <string name="poi_9pin">Bowling à 9 quilles</string>
<string name="poi_abandoned">Voie ferrée abandonnée</string> <string name="poi_abandoned">Voie ferrée abandonnée</string>
@ -271,7 +271,7 @@
<string name="poi_foundation">Fondation</string> <string name="poi_foundation">Fondation</string>
<string name="poi_fountain">Fontaine</string> <string name="poi_fountain">Fontaine</string>
<string name="poi_fuel">Carburant</string> <string name="poi_fuel">Carburant</string>
<string name="poi_full-height_turnstile">Tourniquet pleine hauteur</string> <string name="poi_full_height_turnstile">Tourniquet pleine hauteur</string>
<string name="poi_funeral_directors">Pompes funèbres</string> <string name="poi_funeral_directors">Pompes funèbres</string>
<string name="poi_funicular">Voie de funiculaire</string> <string name="poi_funicular">Voie de funiculaire</string>
<string name="poi_furniture">Magasin d\'ameublement</string> <string name="poi_furniture">Magasin d\'ameublement</string>
@ -418,7 +418,7 @@
<string name="poi_newspaper">Presse</string> <string name="poi_newspaper">Presse</string>
<string name="poi_ngo">ONG</string> <string name="poi_ngo">ONG</string>
<string name="poi_nightclub">Boîte de nuit</string> <string name="poi_nightclub">Boîte de nuit</string>
<string name="poi_not found">Non trouvé</string> <string name="poi_not_found">Non trouvé</string>
<string name="poi_notary">Notaire</string> <string name="poi_notary">Notaire</string>
<string name="poi_notice">Informations</string> <string name="poi_notice">Informations</string>
<string name="poi_nursery">Nurseries</string> <string name="poi_nursery">Nurseries</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Zgrada</string> <string name="poi_yes">Zgrada</string>
<string name="poi_abandoned">Napuštena prugas</string> <string name="poi_abandoned">Napuštena prugas</string>
<string name="poi_administrative">Administrativna granica</string> <string name="poi_administrative">Administrativna granica</string>
<string name="poi_airport">Zračna luka</string> <string name="poi_airport">Zračna luka</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Gebouw</string> <string name="poi_yes">Gebouw</string>
<string name="poi_abandoned">Vervallen spoorweg</string> <string name="poi_abandoned">Vervallen spoorweg</string>
<string name="poi_administrative">Administratieve grens</string> <string name="poi_administrative">Administratieve grens</string>
<string name="poi_airport">Luchthaven</string> <string name="poi_airport">Luchthaven</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Будівля</string> <string name="poi_yes">Будівля</string>
<string name="poi_abandoned">Кинуті колії</string> <string name="poi_abandoned">Кинуті колії</string>
<string name="poi_administrative">Адміністративний кордон</string> <string name="poi_administrative">Адміністративний кордон</string>
<string name="poi_airport">Аеропорт</string> <string name="poi_airport">Аеропорт</string>

View file

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<resources> <resources>
<string name="poi_&amp;quot;yes&amp;quot;">Tòa nhà</string> <string name="poi_yes">Tòa nhà</string>
<string name="poi_administrative">Biên giới Hành chính</string> <string name="poi_administrative">Biên giới Hành chính</string>
<string name="poi_airport">Trung tâm Nghệ thuật</string> <string name="poi_airport">Trung tâm Nghệ thuật</string>
<string name="poi_allotments">Khu Vườn Gia đình</string> <string name="poi_allotments">Khu Vườn Gia đình</string>

View file

@ -261,7 +261,7 @@ public class ConfigureMapMenu {
if (renderer != null) { if (renderer != null) {
List<RenderingRuleProperty> customRules = new ArrayList<RenderingRuleProperty>(renderer.PROPS.getCustomRules()); List<RenderingRuleProperty> customRules = new ArrayList<RenderingRuleProperty>(renderer.PROPS.getCustomRules());
//createProperties(customRules, R.string.rendering_category_transport, "transport", createProperties(customRules, R.string.rendering_category_transport, "transport",
adapter, activity); adapter, activity);
createProperties(customRules, R.string.rendering_category_routes, "routes", createProperties(customRules, R.string.rendering_category_routes, "routes",
adapter, activity); adapter, activity);