resolve conflicts

Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>

android/sdk/src/main/res/values-bn/types_strings.xml

@@ -50,4 +50,37 @@
     <string name="type.amenity.place_of_worship.hindu">হিন্দু মন্দির</string>
     <string name="type.amenity.prison">কারাগার</string>
     <string name="type.barrier.fence">বেড়া</string>
+    <string name="type.waterway.waterfall">ঝর্ণা</string>
+    <string name="type.waterway.river">নদী</string>
+    <string name="type.waterway.dam">বাঁধ</string>
+    <string name="type.attraction.historic">ঐতিহাসিক আকর্ষণ</string>
+    <string name="type.area_highway.steps">সিঁড়ি</string>
+    <string name="type.area_highway.path">পথ</string>
+    <string name="type.amenity.theatre">থিয়েটার</string>
+    <string name="type.sport.soccer">ফুটবল</string>
+    <string name="type.sport.swimming">সাঁতার</string>
+    <string name="type.sport.table_tennis">টেবিল টেনিস</string>
+    <string name="type.sport.yoga">যোগ</string>
+    <string name="type.tourism">পর্যটন</string>
+    <string name="type.tourism.artwork.statue">মূর্তি</string>
+    <string name="type.tourism.attraction">আকর্ষণ</string>
+    <string name="type.tourism.artwork.sculpture">ভাস্কর্য</string>
+    <string name="type.tourism.hostel">হোস্টেল</string>
+    <string name="type.tourism.hotel">হোটেল</string>
+    <string name="type.tourism.zoo">চিড়িয়াখানা</string>
+    <string name="type.tourism.museum">জাদুঘর</string>
+    <string name="type.sport.volleyball">ভলিবল</string>
+    <string name="type.sport.golf">গল্ফ</string>
+    <string name="type.sport.cricket">ক্রিকেট</string>
+    <string name="type.sport.chess">দাবা</string>
+    <string name="type.sport.basketball">বাস্কেটবল</string>
+    <string name="type.sport.badminton">ব্যাডমিন্টন</string>
+    <string name="type.sport">ক্রীড়া</string>
+    <string name="type.sport.multi">বিভিন্ন ক্রীড়া</string>
+    <string name="type.amenity.toilets">শৌচালয়</string>
+    <string name="type.shop.watches">ঘড়ির দোকান</string>
+    <string name="type.shop.paint">রঙের দোকান</string>
+    <string name="type.shop.lottery">লটারি টিকিট</string>
+    <string name="type.shop.boutique">বুটিক</string>
+    <string name="type.shop.bag">ব্যাগের দোকান</string>
 </resources>

android/sdk/src/main/res/values-cs/types_strings.xml

@@ -145,7 +145,7 @@
     <string name="type.amenity.vending_machine.cigarettes">Automat na cigarety</string>
     <string name="type.amenity.vending_machine.drinks">Automat na nápoje</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parkovací automat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">Automat na jízdenky</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Automat na jízdenky MHD</string>
     <string name="type.amenity.vehicle_inspection">Kontrola vozidla</string>
     <string name="type.amenity.veterinary">Veterinář</string>
     <string name="type.amenity.waste_basket">Odpadkový koš</string>
@@ -1260,7 +1260,7 @@
     <string name="type.recycling.cardboard">Lepenka</string>
     <string name="type.recycling.shoes">Boty</string>
     <string name="type.building.warehouse">Sklad</string>
-    <string name="type.amenity.shelter.lean_to">Otevřený přístřešek</string>
+    <string name="type.amenity.shelter.lean_to">Otevřený spací přístřešek</string>
     <string name="type.amenity.vending_machine.coffee">Automat na kávu</string>
     <string name="type.amenity.taxi">Stanoviště taxislužby</string>
     <string name="type.amenity.vending_machine">Prodejní automat</string>

android/sdk/src/main/res/values-de/strings.xml

@@ -11,7 +11,7 @@
     <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
     <string name="maps_storage_removable">SD-Karte</string>
     <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Externer gemeinsamer Speicher</string>
+    <string name="maps_storage_external">Externer geteilter Speicher</string>
     <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
     <string name="category_wifi">WLAN</string>
     <string name="postal_code">Postleitzahl</string>

android/sdk/src/main/res/values-de/types_strings.xml

@@ -154,7 +154,7 @@
     <!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
     <string name="type.amenity.shelter.basic_hut">Biwakschachtel</string>
     <!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
-    <string name="type.amenity.shelter.lean_to">Überdachung zum Schlafen</string>
+    <string name="type.amenity.shelter.lean_to">Lean-to Schlafunterstand</string>
     <string name="type.amenity.public_bath">Öffentliches Bad</string>
     <string name="type.amenity.shower">Dusche</string>
     <string name="type.amenity.stripclub">Stripclub</string>
@@ -173,7 +173,7 @@
     <string name="type.amenity.vending_machine.food">Essensautomat</string>
     <string name="type.amenity.vending_machine.newspapers">Zeitungsautomat</string>
     <string name="type.amenity.vending_machine.parking_tickets">Parkautomat</string>
-    <string name="type.amenity.vending_machine.public_transport_tickets">5Fahrkartenautomat|4Ticketautomat|4Busticket|4Zugticket|5Bahnticket|4Zugfahrschein|U+1F3AB|U+1F39F|U+1F9FE</string>
+    <string name="type.amenity.vending_machine.public_transport_tickets">Fahrkartenautomat</string>
     <string name="type.amenity.vending_machine.sweets">Süßigkeitenautomat</string>
     <string name="type.amenity.vending_machine.excrement_bags">Hundekotbeutelspender</string>
     <string name="type.amenity.parcel_locker">Paketstation</string>
@@ -374,9 +374,9 @@
     <string name="type.spherical_buoy.special_purpose">Kugelförmige Spezialboje</string>
     <string name="type.lateral.port">Backbord</string>
     <string name="type.lateral.starboard">Steuerbord</string>
-    <string name="type.cardinal.east">Ost</string>
-    <string name="type.cardinal.north">Nord</string>
-    <string name="type.cardinal.south">Süd</string>
+    <string name="type.cardinal.east">Osten</string>
+    <string name="type.cardinal.north">Norden</string>
+    <string name="type.cardinal.south">Süden</string>
     <string name="type.cardinal.west">Westen</string>
     <!-- A mountain rescue base for search and rescue activities. -->
     <string name="type.emergency.mountain_rescue">Bergrettungsstation</string>

android/sdk/src/main/res/values-lt/types_strings.xml

@@ -1274,7 +1274,7 @@
     <string name="type.sport.beachvolleyball">Paplūdimo tinklinis</string>
     <string name="type.sport.bowls">Rutulių sportas</string>
     <string name="type.sport.chess">Šachmatai</string>
-    <string name="type.sport.climbing">Alpinizmo centras</string>
+    <string name="type.sport.climbing">Laipiojimo centras</string>
     <string name="type.sport.cricket">Kriketas</string>
     <string name="type.sport.curling">Akmenslydis</string>
     <string name="type.sport.diving">Šuoliai į vandenį</string>