diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 06242a91ee..207030a376 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -714,9 +714,10 @@
 	<string name="splash_subtitle">بيانات الخريطة من خريطة الشارع المفتوحة</string>
 
 	<!-- SECTION: Types -->
+	<string name="type.aerialway.cable_car">تلفريك</string>
 	<string name="type.aerialway.station">محطة تلفريك</string>
 	<string name="type.aeroway.aerodrome">مطار</string>
-	<string name="type.aeroway.aerodrome.international">مطار</string>
+	<string name="type.aeroway.aerodrome.international">مطار دولي</string>
 	<string name="type.aeroway.helipad">مهبط مروحيات</string>
 	<string name="type.amenity">أثر</string>
 	<string name="type.amenity.arts_centre">مركز فن</string>
@@ -741,7 +742,7 @@
 	<string name="type.amenity.charging_station.motorcar">محطة شحن</string>
 	<string name="type.amenity.childcare">حضانة</string>
 	<string name="type.amenity.cinema">سينما</string>
-	<string name="type.leisure.bowling_alley">ﺞﻨﻴﻟﻮﺑ ﺔﻟﺎﺻ</string>
+	<string name="type.leisure.bowling_alley">صالة بولينج</string>
 	<string name="type.amenity.clinic">عيادة</string>
 	<string name="type.amenity.college">كلية</string>
 	<string name="type.amenity.community_centre">مركز اجتماعي</string>
@@ -750,18 +751,19 @@
 	<string name="type.amenity.doctors">طبيب</string>
 	<string name="type.amenity.drinking_water">مياه شرب</string>
 	<string name="type.amenity.driving_school">مدرسة قيادة</string>
-	<string name="type.amenity.music_school">ﻰﻘﻴﺳﻮﻣ ﺔﺳﺭﺪﻣ</string>
-	<string name="type.amenity.language_school">ﺔﻐﻟ ﺔﺳﺭﺪﻣ</string>
+	<string name="type.amenity.music_school">مدرسة موسيقى</string>
+	<string name="type.amenity.language_school">مدرسة لغة</string>
 	<string name="type.office.diplomatic">سفارة</string>
 	<string name="type.amenity.fast_food">وجبات سريعة</string>
 	<string name="type.amenity.ferry_terminal">محطة عبّارات</string>
 	<string name="type.amenity.fire_station">محطة إطفاء</string>
+	<string name="type.amenity.food_court">مكان تناول الطعام</string>
 	<string name="type.amenity.fountain">نافورة</string>
 	<string name="type.amenity.fuel">محطة وقود</string>
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.amenity.grave_yard">مقبرة</string>
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
-	<string name="type.amenity.grave_yard.christian">مقبرة</string>
+	<string name="type.amenity.grave_yard.christian">مقبرة مسيحية</string>
 	<string name="type.amenity.hospital">عيادة</string>
 	<string name="type.amenity.hunting_stand">منصة صيد</string>
 	<string name="type.amenity.ice_cream">كشك أيس كريم</string>
@@ -773,21 +775,21 @@
 	<string name="type.amenity.nightclub">نادي ليلي</string>
 	<string name="type.amenity.nursing_home">دار تمريض</string>
 	<string name="type.amenity.parking">موقف سيارات</string>
-	<string name="type.amenity.parking.fee">ﺮﺟﻷﺍ ﺔﻋﻮﻓﺪﻣ ﺕﺍﺭﺎﻴﺳ ﻒﻗﺍﻮﻣ</string>
-	<string name="type.amenity.parking.multi.storey">ﻖﺑﺍﻮﻄﻟﺍ ﺓﺩﺪﻌﺘﻣ ﻒﻗﺍﻮﻣ</string>
-	<string name="type.amenity.parking.no.access">ﺹﺎﺧ ﻒﻗﻮﻣ</string>
-	<string name="type.amenity.parking.permissive">ﺹﺎﺧ ﻒﻗﻮﻣ</string>
-	<string name="type.amenity.parking.private">ﺹﺎﺧ ﻒﻗﻮﻣ</string>
+	<string name="type.amenity.parking.fee">موقف سيارات مدفوع</string>
+	<string name="type.amenity.parking.multi.storey">موقف سيارات متعدد الطوابق</string>
+	<string name="type.amenity.parking.no.access">موقف سيارات خاص</string>
+	<string name="type.amenity.parking.permissive">موقف سيارات خاص</string>
+	<string name="type.amenity.parking.private">موقف سيارات خاص</string>
 	<string name="type.amenity.parking.park_and_ride">موقف سيارات</string>
-	<string name="type.amenity.parking.underground">ﺽﺭﻻﺍ ﺖﺤﺗ ﻒﻗﻮﻣ</string>
-	<string name="type.amenity.parking_entrance">ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ</string>
-	<string name="type.amenity.parking_entrance.private">ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ</string>
-	<string name="type.amenity.parking_entrance.permissive">ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ</string>
+	<string name="type.amenity.parking.underground">موقف سيارات تحت الأرض</string>
+	<string name="type.amenity.parking_entrance">مدخل موقف سيارات</string>
+	<string name="type.amenity.parking_entrance.private">مدخل موقف سيارات</string>
+	<string name="type.amenity.parking_entrance.permissive">مدخل موقف سيارات</string>
 	<string name="type.amenity.parking_space">مكان لوقوف السيارات</string>
 	<string name="type.amenity.parking_space.permissive">مكان لوقوف السيارات</string>
 	<string name="type.amenity.parking_space.private">مكان لوقوف السيارات</string>
 	<string name="type.amenity.parking_space.underground">مكان لوقوف السيارات</string>
-	<string name="type.amenity.parking_space.disabled">ﺔﺻﺎﺨﻟﺍ ﺕﺎﺟﺎﻴﺘﺣﻻﺍ ﻱﻭﺬﻟ ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻮﻟ ﻦﻛﺎﻣﺃ</string>
+	<string name="type.amenity.parking_space.disabled">مكان لوقوف السيارات لذوي الاحتياجات الخاصة</string>
 	<string name="type.amenity.payment_terminal">محطة دفع</string>
 	<string name="type.amenity.pharmacy">متجر أدوية</string>
 	<string name="type.amenity.place_of_worship">مكان عبادة</string>
@@ -801,14 +803,15 @@
 	<string name="type.amenity.police">شرطة</string>
 	<string name="type.amenity.post_box">صندوق بريد</string>
 	<string name="type.amenity.post_office">مكتب بريد</string>
-	<string name="type.amenity.pub">بار</string>
+	<string name="type.amenity.prison">سجن</string>
+	<string name="type.amenity.pub">حانة</string>
 	<string name="type.amenity.public_bookcase">مكتبة، تبادل كتب</string>
 
 	<!-- SECTION: Types: Recycling -->
 	<string name="type.amenity.recycling.centre">مركز إعادة تدوير</string>
 	<string name="type.amenity.recycling">حاوية لإعادة التدوير</string>
 	<string name="type.amenity.recycling.container">حاوية لإعادة التدوير</string>
-	<string name="type.recycling.batteries">ﺕﺎﻳﺭﺎﻄﺑ</string>
+	<string name="type.recycling.batteries">بطاريات</string>
 	<string name="type.recycling.clothes">ملابس قديمة</string>
 	<string name="type.recycling.glass_bottles">زجاجات زجاجية</string>
 	<string name="type.recycling.paper">نفايات ورقية</string>
@@ -816,6 +819,11 @@
 	<string name="type.recycling.plastic_bottles">زجاجات بلاستيكية</string>
 	<string name="type.recycling.scrap_metal">نفايات معدنية</string>
 	<string name="type.recycling.small_appliances">نفايات الكترونية</string>
+	<string name="type.recycling.cardboard">ورق مقوى</string>
+	<string name="type.recycling.cans">علب</string>
+	<string name="type.recycling.shoes">أحذية</string>
+	<string name="type.recycling.green_waste">نفايات عضوية</string>
+	<string name="type.recycling.cartons">علب مشروبات</string>
 	<string name="type.amenity.restaurant">مطعم</string>
 	<string name="type.amenity.school">مدرسة</string>
 	<string name="type.amenity.shelter">ملجأ</string>
@@ -826,19 +834,28 @@
 	<string name="type.amenity.toilets">حمام</string>
 	<string name="type.amenity.townhall">مبنى البلدية</string>
 	<string name="type.amenity.university">جامعة</string>
+	<string name="type.amenity.vending_machine">ماكينة بيع</string>
 	<string name="type.amenity.vending_machine.cigarettes">ماكينة بيع سجائر</string>
+	<string name="type.amenity.vending_machine.coffee">ماكينة بيع قهوة</string>
 	<string name="type.amenity.vending_machine.drinks">ماكينة بيع مشروبات</string>
+	<string name="type.amenity.vending_machine.food">ماكينة بيع طعام</string>
 	<string name="type.amenity.vending_machine.parking_tickets">ماكينة دفع تذاكر الموقف</string>
 	<string name="type.amenity.vending_machine.public_transport_tickets">آلة بيع تذاكر النقل العام</string>
+	<string name="type.amenity.vending_machine.sweets">ماكينة بيع الحلويات</string>
+	<string name="type.amenity.vending_machine.excrement_bags">ماكينة بيع حقائب النفايات</string>
+	<string name="type.amenity.parcel_locker">خزانة الطرود</string>
+	<string name="type.amenity.vending_machine.fuel">ماكينة بيع الوقود</string>
 	<string name="type.amenity.veterinary">طبيب بيطري</string>
 	<string name="type.amenity.waste_basket">صندوق قمامة</string>
 	<string name="type.amenity.waste_disposal">قمامة</string>
+	<string name="type.amenity.waste_transfer_station">محطة نقل النفايات</string>
 	<string name="type.amenity.water_point">نقطة مائية</string>
+	<string name="type.barrier">حاجز</string>
 	<string name="type.barrier.block">حاجز</string>
 	<string name="type.barrier.bollard">عمود حاجز قصير</string>
 	<string name="type.barrier.border_control">أمن الحدود</string>
 	<string name="type.barrier.city_wall">جدار المدينة</string>
-	<string name="type.barrier.ditch">ﻕﺪﻨﺧ</string>
+	<string name="type.barrier.ditch">حفرة</string>
 	<string name="type.barrier.entrance">مدخل الحاجز</string>
 	<string name="type.barrier.gate">بوابة</string>
 	<string name="type.barrier.kissing_gate">بوابة</string>
@@ -846,13 +863,33 @@
 	<string name="type.barrier.stile">ممر عبور</string>
 	<string name="type.barrier.swing_gate">حاجز بوابة</string>
 	<string name="type.barrier.toll_booth">كشك رسوم عبور</string>
+	<string name="type.barrier.wall">جدار</string>
+	<string name="type.boundary">حدود</string>
+	<string name="type.boundary.administrative">حدود إدارية</string>
+	<string name="type.boundary.administrative.10">حدود إدارية</string>
+	<string name="type.boundary.administrative.11">حدود إدارية</string>
+	<string name="type.boundary.administrative.2">حدود دولية</string>
+	<string name="type.boundary.administrative.3">حدود إدارية</string>
+	<string name="type.boundary.administrative.4">حدود إدارية</string>
+	<string name="type.boundary.administrative.5">حدود إدارية</string>
+	<string name="type.boundary.administrative.6">حدود إدارية</string>
+	<string name="type.boundary.administrative.7">حدود إدارية</string>
+	<string name="type.boundary.administrative.8">حدود إدارية</string>
+	<string name="type.boundary.administrative.9">حدود إدارية</string>
+	<string name="type.boundary.administrative.city">حدود مدينة</string>
+	<string name="type.boundary.administrative.country">حدود دولية</string>
+	<string name="type.boundary.administrative.county">حدود مقاطعة</string>
+	<string name="type.boundary.administrative.municipality">حدود بلدية</string>
+	<string name="type.boundary.administrative.nation">حدود دولية</string>
+	<string name="type.boundary.administrative.region">حدود منطقة</string>
 	<string name="type.boundary.national_park">منتزه وطني</string>
 	<string name="type.building">مبنى</string>
 	<string name="type.building.address">مبنى</string>
 	<string name="type.building.garage">جراج</string>
 	<string name="type.building.has_parts">مبنى</string>
 	<string name="type.building.train_station">محطة سكك حديدية</string>
-	<string name="type.cemetery.grave">ﺮﻴﻄﺧ</string>
+	<string name="type.building.warehouse">مستودع</string>
+	<string name="type.cemetery.grave">قبر</string>
 	<string name="type.craft">حرفة</string>
 	<string name="type.craft.beekeeper">نحال</string>
 	<string name="type.craft.blacksmith">حداد</string>
@@ -861,14 +898,14 @@
 	<string name="type.craft.confectionery">حلواني</string>
 	<string name="type.craft.electrician">كهربائي</string>
 	<string name="type.craft.electronics_repair">إصلاح الإلكترونيات</string>
-	<string name="type.craft.gardener">مهندس مناظر</string>
+	<string name="type.craft.gardener">بستاني</string>
 	<string name="type.craft.handicraft">مشغولات يدوية</string>
 	<!-- Heating, Ventilation, and Air Conditioning -->
 	<string name="type.craft.hvac">تكييف</string>
 	<string name="type.craft.metal_construction">عامل معادن</string>
 	<string name="type.craft.painter">رسام</string>
 	<string name="type.craft.photographer">مصور فوتوغرافي</string>
-	<string name="type.craft.plumber">سمكري</string>
+	<string name="type.craft.plumber">سباك</string>
 	<string name="type.craft.sawmill">منشرة</string>
 	<string name="type.craft.shoemaker">تصليح الاحذية</string>
 	<string name="type.craft.winery">مصنع الخمرة</string>
@@ -1188,7 +1225,7 @@
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
 	<string name="type.landuse.cemetery">مقبرة</string>
 	<!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
-	<string name="type.landuse.cemetery.christian">مقبرة</string>
+	<string name="type.landuse.cemetery.christian">مقبرة مسيحية</string>
 	<string name="type.landuse.churchyard">فناء الكنيسة</string>
 	<string name="type.landuse.commercial">منطقة تجارية</string>
 	<string name="type.landuse.construction">منطقة بناء</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index ec45de112f..f4d8a4ad04 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -206,7 +206,7 @@
 	<!-- «Map style» entry value -->
 	<string name="pref_map_style_auto">Otomatik</string>
 	<!-- Settings «Map» category: «Perspective view» title -->
-	<string name="pref_map_3d_title">Perspektif görünüş</string>
+	<string name="pref_map_3d_title">Perspektif görünüm</string>
 	<!-- Settings «Map» category: «3D buildings» title -->
 	<string name="pref_map_3d_buildings_title">3D yapılar</string>
 	<!-- Settings «Route» category: «Tts enabled» title -->
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index aa78831e54..0217c430d3 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1241,7 +1241,7 @@
 
 "type.aerialway" = "Aerialway";
 
-"type.aerialway.cable_car" = "Cable car";
+"type.aerialway.cable_car" = "تلفريك";
 
 "type.aerialway.chair_lift" = "Chair lift";
 
@@ -1257,7 +1257,7 @@
 
 "type.aeroway.aerodrome" = "مطار";
 
-"type.aeroway.aerodrome.international" = "مطار";
+"type.aeroway.aerodrome.international" = "مطار دولي";
 
 "type.aeroway.apron" = "Apron";
 
@@ -1317,7 +1317,7 @@
 
 "type.amenity.cinema" = "سينما";
 
-"type.leisure.bowling_alley" = "ﺞﻨﻴﻟﻮﺑ ﺔﻟﺎﺻ";
+"type.leisure.bowling_alley" = "صالة بولينج";
 
 "type.amenity.clinic" = "عيادة";
 
@@ -1335,9 +1335,9 @@
 
 "type.amenity.driving_school" = "مدرسة قيادة";
 
-"type.amenity.music_school" = "ﻰﻘﻴﺳﻮﻣ ﺔﺳﺭﺪﻣ";
+"type.amenity.music_school" = "مدرسة موسيقى";
 
-"type.amenity.language_school" = "ﺔﻐﻟ ﺔﺳﺭﺪﻣ";
+"type.amenity.language_school" = "مدرسة لغة";
 
 "type.office.diplomatic" = "سفارة";
 
@@ -1347,7 +1347,7 @@
 
 "type.amenity.fire_station" = "محطة إطفاء";
 
-"type.amenity.food_court" = "Food Court";
+"type.amenity.food_court" = "مكان تناول الطعام";
 
 "type.amenity.fountain" = "نافورة";
 
@@ -1357,7 +1357,7 @@
 "type.amenity.grave_yard" = "مقبرة";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.amenity.grave_yard.christian" = "مقبرة";
+"type.amenity.grave_yard.christian" = "مقبرة مسيحية";
 
 "type.amenity.hospital" = "عيادة";
 
@@ -1381,25 +1381,25 @@
 
 "type.amenity.parking" = "موقف سيارات";
 
-"type.amenity.parking.fee" = "ﺮﺟﻷﺍ ﺔﻋﻮﻓﺪﻣ ﺕﺍﺭﺎﻴﺳ ﻒﻗﺍﻮﻣ";
+"type.amenity.parking.fee" = "موقف سيارات مدفوع";
 
-"type.amenity.parking.multi.storey" = "ﻖﺑﺍﻮﻄﻟﺍ ﺓﺩﺪﻌﺘﻣ ﻒﻗﺍﻮﻣ";
+"type.amenity.parking.multi.storey" = "موقف سيارات متعدد الطوابق";
 
-"type.amenity.parking.no.access" = "ﺹﺎﺧ ﻒﻗﻮﻣ";
+"type.amenity.parking.no.access" = "موقف سيارات خاص";
 
-"type.amenity.parking.permissive" = "ﺹﺎﺧ ﻒﻗﻮﻣ";
+"type.amenity.parking.permissive" = "موقف سيارات خاص";
 
-"type.amenity.parking.private" = "ﺹﺎﺧ ﻒﻗﻮﻣ";
+"type.amenity.parking.private" = "موقف سيارات خاص";
 
 "type.amenity.parking.park_and_ride" = "موقف سيارات";
 
-"type.amenity.parking.underground" = "ﺽﺭﻻﺍ ﺖﺤﺗ ﻒﻗﻮﻣ";
+"type.amenity.parking.underground" = "موقف سيارات تحت الأرض";
 
-"type.amenity.parking_entrance" = "ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ";
+"type.amenity.parking_entrance" = "مدخل موقف سيارات";
 
-"type.amenity.parking_entrance.private" = "ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ";
+"type.amenity.parking_entrance.private" = "مدخل موقف سيارات";
 
-"type.amenity.parking_entrance.permissive" = "ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ";
+"type.amenity.parking_entrance.permissive" = "مدخل موقف سيارات";
 
 "type.amenity.parking_space" = "مكان لوقوف السيارات";
 
@@ -1409,7 +1409,7 @@
 
 "type.amenity.parking_space.underground" = "مكان لوقوف السيارات";
 
-"type.amenity.parking_space.disabled" = "ﺔﺻﺎﺨﻟﺍ ﺕﺎﺟﺎﻴﺘﺣﻻﺍ ﻱﻭﺬﻟ ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻮﻟ ﻦﻛﺎﻣﺃ";
+"type.amenity.parking_space.disabled" = "مكان لوقوف السيارات لذوي الاحتياجات الخاصة";
 
 "type.amenity.payment_terminal" = "محطة دفع";
 
@@ -1437,9 +1437,9 @@
 
 "type.amenity.post_office" = "مكتب بريد";
 
-"type.amenity.prison" = "Prison";
+"type.amenity.prison" = "سجن";
 
-"type.amenity.pub" = "بار";
+"type.amenity.pub" = "حانة";
 
 "type.amenity.public_bookcase" = "مكتبة، تبادل كتب";
 
@@ -1452,7 +1452,7 @@
 
 "type.amenity.recycling.container" = "حاوية لإعادة التدوير";
 
-"type.recycling.batteries" = "ﺕﺎﻳﺭﺎﻄﺑ";
+"type.recycling.batteries" = "بطاريات";
 
 "type.recycling.clothes" = "ملابس قديمة";
 
@@ -1468,15 +1468,15 @@
 
 "type.recycling.small_appliances" = "نفايات الكترونية";
 
-"type.recycling.cardboard" = "Cardboard";
+"type.recycling.cardboard" = "ورق مقوى";
 
-"type.recycling.cans" = "Cans";
+"type.recycling.cans" = "علب";
 
-"type.recycling.shoes" = "Shoes";
+"type.recycling.shoes" = "أحذية";
 
-"type.recycling.green_waste" = "Green/Organic Waste";
+"type.recycling.green_waste" = "نفايات عضوية";
 
-"type.recycling.cartons" = "Beverage Cartons";
+"type.recycling.cartons" = "علب مشروبات";
 
 "type.amenity.restaurant" = "مطعم";
 
@@ -1500,17 +1500,17 @@
 
 "type.amenity.university" = "جامعة";
 
-"type.amenity.vending_machine" = "Vending Machine";
+"type.amenity.vending_machine" = "ماكينة بيع";
 
 "type.amenity.vending_machine.cigarettes" = "ماكينة بيع سجائر";
 
-"type.amenity.vending_machine.coffee" = "Coffee Dispenser";
+"type.amenity.vending_machine.coffee" = "ماكينة بيع قهوة";
 
 "type.amenity.vending_machine.condoms" = "Condoms Dispenser";
 
 "type.amenity.vending_machine.drinks" = "ماكينة بيع مشروبات";
 
-"type.amenity.vending_machine.food" = "Food Dispenser";
+"type.amenity.vending_machine.food" = "ماكينة بيع طعام";
 
 "type.amenity.vending_machine.newspapers" = "Newspapers Dispenser";
 
@@ -1518,13 +1518,13 @@
 
 "type.amenity.vending_machine.public_transport_tickets" = "آلة بيع تذاكر النقل العام";
 
-"type.amenity.vending_machine.sweets" = "Sweets Dispenser";
+"type.amenity.vending_machine.sweets" = "ماكينة بيع الحلويات";
 
-"type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
+"type.amenity.vending_machine.excrement_bags" = "ماكينة بيع حقائب النفايات";
 
-"type.amenity.parcel_locker" = "Parcel Locker";
+"type.amenity.parcel_locker" = "خزانة الطرود";
 
-"type.amenity.vending_machine.fuel" = "Fuel Dispenser";
+"type.amenity.vending_machine.fuel" = "ماكينة بيع الوقود";
 
 "type.amenity.veterinary" = "طبيب بيطري";
 
@@ -1532,11 +1532,11 @@
 
 "type.amenity.waste_disposal" = "قمامة";
 
-"type.amenity.waste_transfer_station" = "Waste Transfer Station";
+"type.amenity.waste_transfer_station" = "محطة نقل النفايات";
 
 "type.amenity.water_point" = "نقطة مائية";
 
-"type.barrier" = "Barrier";
+"type.barrier" = "حاجز";
 
 "type.barrier.block" = "حاجز";
 
@@ -1550,7 +1550,7 @@
 
 "type.barrier.cycle_barrier" = "Cycle Barrier";
 
-"type.barrier.ditch" = "ﻕﺪﻨﺧ";
+"type.barrier.ditch" = "حفرة";
 
 "type.barrier.entrance" = "مدخل الحاجز";
 
@@ -1572,43 +1572,43 @@
 
 "type.barrier.toll_booth" = "كشك رسوم عبور";
 
-"type.barrier.wall" = "Wall";
+"type.barrier.wall" = "جدار";
 
-"type.boundary" = "Boundary";
+"type.boundary" = "حدود";
 
-"type.boundary.administrative" = "Administrative Boundary";
+"type.boundary.administrative" = "حدود إدارية";
 
-"type.boundary.administrative.10" = "Administrative Boundary";
+"type.boundary.administrative.10" = "حدود إدارية";
 
-"type.boundary.administrative.11" = "Administrative Boundary";
+"type.boundary.administrative.11" = "حدود إدارية";
 
-"type.boundary.administrative.2" = "National Border";
+"type.boundary.administrative.2" = "حدود دولية";
 
-"type.boundary.administrative.3" = "Administrative Boundary";
+"type.boundary.administrative.3" = "حدود إدارية";
 
-"type.boundary.administrative.4" = "Administrative Boundary";
+"type.boundary.administrative.4" = "حدود إدارية";
 
-"type.boundary.administrative.5" = "Administrative Boundary";
+"type.boundary.administrative.5" = "حدود إدارية";
 
-"type.boundary.administrative.6" = "Administrative Boundary";
+"type.boundary.administrative.6" = "حدود إدارية";
 
-"type.boundary.administrative.7" = "Administrative Boundary";
+"type.boundary.administrative.7" = "حدود إدارية";
 
-"type.boundary.administrative.8" = "Administrative Boundary";
+"type.boundary.administrative.8" = "حدود إدارية";
 
-"type.boundary.administrative.9" = "Administrative Boundary";
+"type.boundary.administrative.9" = "حدود إدارية";
 
-"type.boundary.administrative.city" = "City Boundary";
+"type.boundary.administrative.city" = "حدود مدينة";
 
-"type.boundary.administrative.country" = "National Border";
+"type.boundary.administrative.country" = "حدود دولية";
 
-"type.boundary.administrative.county" = "County Boundary";
+"type.boundary.administrative.county" = "حدود مقاطعة";
 
-"type.boundary.administrative.municipality" = "Municipality Boundary";
+"type.boundary.administrative.municipality" = "حدود بلدية";
 
-"type.boundary.administrative.nation" = "National Border";
+"type.boundary.administrative.nation" = "حدود دولية";
 
-"type.boundary.administrative.region" = "Regional Boundary";
+"type.boundary.administrative.region" = "حدود منطقة";
 
 "type.boundary.administrative.state" = "State Boundary";
 
@@ -1626,9 +1626,9 @@
 
 "type.building.train_station" = "محطة سكك حديدية";
 
-"type.building.warehouse" = "Warehouse";
+"type.building.warehouse" = "مستودع";
 
-"type.cemetery.grave" = "ﺮﻴﻄﺧ";
+"type.cemetery.grave" = "قبر";
 
 "type.craft" = "حرفة";
 
@@ -1646,7 +1646,7 @@
 
 "type.craft.electronics_repair" = "إصلاح الإلكترونيات";
 
-"type.craft.gardener" = "مهندس مناظر";
+"type.craft.gardener" = "بستاني";
 
 "type.craft.handicraft" = "مشغولات يدوية";
 
@@ -1659,7 +1659,7 @@
 
 "type.craft.photographer" = "مصور فوتوغرافي";
 
-"type.craft.plumber" = "سمكري";
+"type.craft.plumber" = "سباك";
 
 "type.craft.sawmill" = "منشرة";
 
@@ -2293,7 +2293,7 @@
 "type.landuse.cemetery" = "مقبرة";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
-"type.landuse.cemetery.christian" = "مقبرة";
+"type.landuse.cemetery.christian" = "مقبرة مسيحية";
 
 "type.landuse.churchyard" = "فناء الكنيسة";
 
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index a845fd8686..c3b0c42ab7 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -221,7 +221,7 @@
 "pref_map_style_auto" = "Otomatik";
 
 /* Settings «Map» category: «Perspective view» title */
-"pref_map_3d_title" = "Perspektif görünüş";
+"pref_map_3d_title" = "Perspektif görünüm";
 
 /* Settings «Map» category: «3D buildings» title */
 "pref_map_3d_buildings_title" = "3D yapılar";