Merge branch 'organicmaps:master' into Android_Auto

.github/workflows/android-beta.yaml

@@ -7,6 +7,7 @@ on:
     paths-ignore:
       - .gitignore
       - .github/**
+      - '!.github/workflows/android-beta.yaml'  # Run check on self change
       - '**/*_tests/**'
       - '**/CMakeLists.txt'
       - CONTRIBUTORS
@@ -65,10 +66,6 @@ jobs:
           ./configure.sh ./private.git
           rm -rf ./private.git
 
-      - name: Set up SDK
-        shell: bash
-        run: (cd tools/android; ./set_up_android.py --sdk $ANDROID_SDK_ROOT)
-
       - name: Compile
         shell: bash
         working-directory: android

.github/workflows/android-check-metadata.yaml

@@ -3,8 +3,10 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
+      - .github/workflows/android-check-metadata.yaml  # Run check on self change
       - android/src/fdroid/**
       - android/src/google/**
+      - tools/python/check_store_metadata.py
 
 jobs:
   android-check-metadata:

.github/workflows/android-check.yaml

@@ -5,6 +5,7 @@ on:
     paths-ignore:
       - .gitignore
       - .github/**
+      - '!.github/workflows/android-check.yaml'  # Run check on self change
       - '**/*_tests/**'
       - CONTRIBUTORS
       - LICENSE

.github/workflows/android-monkey.yaml

@@ -72,10 +72,6 @@ jobs:
           ./configure.sh ./private.git
           rm -rf ./private.git
 
-      - name: Set up SDK
-        shell: bash
-        run: (cd tools/android; ./set_up_android.py --sdk $ANDROID_SDK_ROOT)
-
       - name: Compile
         shell: bash
         working-directory: android

.github/workflows/ios-beta.yaml

@@ -7,6 +7,7 @@ on:
     paths-ignore:
       - .gitignore
       - .github/**
+      - '!.github/workflows/ios-beta.yaml'  # Run check on self change
       - '**/*_tests/**'
       - '**/CMakeLists.txt'
       - CONTRIBUTORS
@@ -29,7 +30,6 @@ jobs:
     name: Apple TestFlight
     runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer
       LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8

.github/workflows/ios-check-metadata.yaml

@@ -3,7 +3,9 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
+      - .github/workflows/ios-check-metadata.yaml  # Run check on self change
       - iphone/metadata/**
+      - tools/python/check_store_metadata.py
 
 jobs:
   ios-check-metadata:

.github/workflows/ios-check.yaml

@@ -5,6 +5,7 @@ on:
     paths-ignore:
       - .gitignore
       - .github/**
+      - '!.github/workflows/ios-check.yaml'  # Run check on self change
       - '**/*_tests/**'
       - '**/CMakeLists.txt'
       - CONTRIBUTORS
@@ -26,9 +27,8 @@ on:
 jobs:
   ios-check:
     name: Build iOS
-    runs-on: macos-11
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
       LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8

.github/workflows/ios-release.yaml

@@ -5,9 +5,8 @@ on:
 jobs:
   ios-release:
     name: iOS Release
-    runs-on: macos-11
+    runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
       LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8

.github/workflows/linux-check.yaml

@@ -5,6 +5,7 @@ on:
     paths-ignore:
       - .gitignore
       - .github/**
+      - '!.github/workflows/linux-check.yaml'  # Run check on self change
       - CONTRIBUTORS
       - LICENSE
       - NOTICE
@@ -16,6 +17,9 @@ on:
       - packaging/**
       - pyhelpers/**
       - tools/**
+      - '!tools/python/run_desktop_tests.py'
+      - '!tools/python/testserver.py'
+      - '!tools/python/SiblingKiller.py'
       - xcode/**
 
 jobs:

.github/workflows/strings-check.yaml

@@ -3,8 +3,10 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - data/strings/strings.txt
-      - data/strings/types_strings.txt
+      - .github/workflows/strings-check.yaml  # Run check on self change
+      - data/countries_names.txt
+      - data/strings/*
+      - tools/python/strings_utils.py
 
 jobs:
   validate-translation-strings:

3party/opening_hours/rules_evaluation.cpp

@@ -2,8 +2,10 @@
 #include "rules_evaluation_private.hpp"
 
 #include <algorithm>
+#include <cstdlib>
 #include <ctime>
 #include <iomanip>
+#include <iostream>
 #include <sstream>
 #include <tuple>
 
@@ -110,6 +112,9 @@ osmoh::RuleState ModifierToRuleState(osmoh::RuleSequence::Modifier const modifie
     case Modifier::Comment:
       return osmoh::RuleState::Unknown;
   }
+  std::cerr << "Unreachable\n";
+  std::abort();
+  return osmoh::RuleState::Unknown;
 }
 
 // Transform timspan with extended end of the form of

android/jni/com/mapswithme/maps/Framework.cpp

@@ -59,6 +59,8 @@
 #include <utility>
 #include <vector>
 
+#include <android/api-level.h>
+
 using namespace std;
 using namespace std::placeholders;
 
@@ -174,7 +176,8 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
   // Vulkan is supported only since Android 8.0, because some Android devices with Android 7.x
   // have fatal driver issue, which can lead to process termination and whole OS destabilization.
   int constexpr kMinSdkVersionForVulkan = 26;
-  int const sdkVersion = GetAndroidSdkVersion();
+  int const sdkVersion = android_get_device_api_level();
+  LOG(LINFO, ("Android SDK version in the Drape Engine:", sdkVersion));
   auto const vulkanForbidden = sdkVersion < kMinSdkVersionForVulkan ||
                                dp::SupportManager::Instance().IsVulkanForbidden();
   if (vulkanForbidden)

android/jni/com/mapswithme/maps/SearchEngine.cpp

@@ -39,7 +39,7 @@ FeatureID const kEmptyFeatureId;
 Results g_results;
 
 // Timestamp of last search query. Results with older stamps are ignored.
-uint64_t g_queryTimestamp;
+jlong g_queryTimestamp;
 // Implements 'NativeSearchListener' java interface.
 jobject g_javaListener;
 jmethodID g_updateResultsId;
@@ -74,7 +74,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b
   jni::TScopedLocalIntArrayRef ranges(
       env, env->NewIntArray(static_cast<jsize>(result.GetHighlightRangesCount() * 2)));
   jint * rawArr = env->GetIntArrayElements(ranges, nullptr);
-  for (int i = 0; i < result.GetHighlightRangesCount(); i++)
+  for (size_t i = 0; i < result.GetHighlightRangesCount(); i++)
   {
     auto const & range = result.GetHighlightRange(i);
     rawArr[2 * i] = range.first;
@@ -146,7 +146,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b
 }
 
 void OnResults(Results const & results, vector<search::ProductInfo> const & productInfo,
-               long long timestamp, bool isMapAndTable, bool hasPosition, double lat, double lon)
+               jlong timestamp, bool isMapAndTable, bool hasPosition, double lat, double lon)
 {
   // Ignore results from obsolete searches.
   if (g_queryTimestamp > timestamp)
@@ -158,13 +158,12 @@ void OnResults(Results const & results, vector<search::ProductInfo> const & prod
   {
     jni::TScopedLocalObjectArrayRef jResults(
         env, BuildSearchResults(results, productInfo, hasPosition, lat, lon));
-    env->CallVoidMethod(g_javaListener, g_updateResultsId, jResults.get(),
-                        static_cast<jlong>(timestamp));
+    env->CallVoidMethod(g_javaListener, g_updateResultsId, jResults.get(), timestamp);
   }
 
   if (results.IsEndMarker())
   {
-    env->CallVoidMethod(g_javaListener, g_endResultsId, static_cast<jlong>(timestamp));
+    env->CallVoidMethod(g_javaListener, g_endResultsId, timestamp);
     if (isMapAndTable && results.IsEndedNormal())
       g_framework->NativeFramework()->GetSearchAPI().PokeSearchInViewport();
   }

android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp

@@ -10,6 +10,7 @@
 #include <algorithm>
 
 #include <EGL/egl.h>
+#include <android/api-level.h>
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 
@@ -106,14 +107,9 @@ AndroidOGLContextFactory::AndroidOGLContextFactory(JNIEnv * env, jobject jsurfac
   }
 
   // Check ES3 availability.
-  bool availableES3 = IsSupportedRGB8(m_display, true /* es3 */);
-  if (availableES3)
-  {
-    int const sdkVersion = GetAndroidSdkVersion();
-    if (sdkVersion != 0)
-      availableES3 = (sdkVersion >= kMinSdkVersionForES3);
-  }
-  m_supportedES3 = availableES3 && gl3stubInit();
+  bool const isES3Supported = IsSupportedRGB8(m_display, true /* es3 */) &&
+             android_get_device_api_level() >= kMinSdkVersionForES3;
+  m_supportedES3 = isES3Supported && gl3stubInit();
 
   SetSurface(env, jsurface);
 

android/jni/com/mapswithme/platform/Platform.cpp

@@ -16,8 +16,6 @@
 #include <memory>
 #include <utility>
 
-#include <sys/system_properties.h>
-
 std::string Platform::GetMemoryInfo() const
 {
   JNIEnv * env = jni::GetEnv();
@@ -243,19 +241,6 @@ void Platform::AndroidSecureStorage::Remove(std::string const & key)
   env->CallStaticVoidMethod(m_secureStorageClass, removeMethodId, context,
                             jni::TScopedLocalRef(env, jni::ToJavaString(env, key)).get());
 }
-
-int GetAndroidSdkVersion()
-{
-  char osVersion[PROP_VALUE_MAX + 1];
-  if (__system_property_get("ro.build.version.sdk", osVersion) == 0)
-    return 0;
-
-  int version;
-  if (!strings::to_int(std::string(osVersion), version))
-    version = 0;
-
-  return version;
-}
 }  // namespace android
 
 Platform & GetPlatform()

android/jni/com/mapswithme/platform/Platform.hpp

@@ -55,7 +55,4 @@ private:
   jobject m_functorProcessObject = nullptr;
   AndroidSecureStorage m_secureStorage;
 };
-
-extern int GetAndroidSdkVersion();
-
 } // namespace android

android/res/values-ar/strings.xml

@@ -1254,22 +1254,28 @@
 	<string name="type.shop.convenience">متجر صغير</string>
 	<string name="type.shop.copyshop">محل نسخ</string>
 	<string name="type.shop.cosmetics">مستحضرات تجميل</string>
+	<string name="type.shop.deli">ﺔﺒﻠﻌﻤﻟﺍ ﺔﻤﻌﻃﻷﺍ ﻊﻴﺒﻟ ﻞﺤﻣ</string>
 	<string name="type.shop.department_store">متجر شامل</string>
 	<string name="type.shop.doityourself">متجر عدد وأدوات</string>
 	<string name="type.shop.dry_cleaning">غسيل جاف</string>
 	<string name="type.shop.electronics">متجر إلكترونيات</string>
 	<string name="type.shop.erotic">متجر منتجات جنسية</string>
 	<string name="type.shop.fabric">متجر</string>
+	<string name="type.shop.farm">ﺔﻋﺭﺰﻤﻟﺍ ﺔﻳﺬﻏﺃ ﺮﺠﺘﻣ</string>
 	<string name="type.shop.florist">متجر زهور</string>
 	<string name="type.shop.funeral_directors">منظموا الجنازات</string>
 	<string name="type.shop.furniture">معرض أثاث</string>
 	<string name="type.shop.garden_centre">حضانة</string>
 	<string name="type.shop.gift">متجر هدايا</string>
 	<string name="type.shop.greengrocer">متجر خضروات وفواكه</string>
+	<string name="type.shop.grocery">ﺕﺍﻭﺮﻀﺧ</string>
 	<string name="type.shop.hairdresser">مصفف شعر</string>
-	<string name="type.shop.hardware">متجر عدد وأدوات</string>
+	<string name="type.shop.hardware">ﺕﺍﺪﻌﻣ ﻞﺤﻣ</string>
+	<string name="type.shop.health_food">ﺔﻴﺤﺼﻟﺍ ﺔﻳﺬﻏﻼﻟ ﺮﺠﺘﻣ</string>
+	<string name="type.shop.houseware">ﺔﻴﻟﺰﻨﻣ ﺕﺍﻭﺩﺃ ﻞﺤﻣ</string>
 	<string name="type.shop.jewelry">مجوهرات</string>
 	<string name="type.shop.kiosk">كشك</string>
+	<string name="type.shop.kitchen">ﺦﺒﻄﻤﻟﺍ ﺮﺠﺘﻣ</string>
 	<string name="type.shop.laundry">مغسلة ملابس</string>
 	<string name="type.shop.mall">مركز تسوق</string>
 	<string name="type.shop.massage">قاعة تدليك</string>
@@ -1281,10 +1287,12 @@
 	<string name="type.shop.newsagent">كشك الجرائد</string>
 	<string name="type.shop.optician">مركز بصريات</string>
 	<string name="type.shop.outdoor">معدات خارجية</string>
+	<string name="type.shop.pastry">ﺕﺎﻨﺠﻌﻣ</string>
 	<string name="type.shop.pawnbroker">سمسار تسليف</string>
 	<string name="type.shop.pet">متجر للحيوانات الأليفة</string>
 	<string name="type.shop.photo">محل صور</string>
 	<string name="type.shop.seafood">سماك</string>
+	<string name="type.shop.second_hand">ﺔﻠﻤﻌﺘﺴﻣ ﺕﺍﻭﺩﺍ ﺮﺠﺘﻣ</string>
 	<string name="type.shop.shoes">متجر أحذية</string>
 	<string name="type.shop.sports">أدوات رياضية</string>
 	<string name="type.shop.stationery">متجر قرطاسية</string>
@@ -1299,6 +1307,29 @@
 	<string name="type.shop.video">متجر فيديو</string>
 	<string name="type.shop.video_games">متجر ألعاب فيديو</string>
 	<string name="type.shop.wine">متجر مشروبات روحية</string>
+	<string name="type.shop.antiques">ﻒﺤﺘﻟﺍ</string>
+	<string name="type.shop.art">ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ</string>
+	<string name="type.shop.baby_goods">ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ</string>
+	<string name="type.shop.bag">ﺐﺋﺎﻘﺤﻟﺍ ﺮﺠﺘﻣ</string>
+	<string name="type.shop.boutique">ﺮﺠﺘﻣ</string>
+	<string name="type.shop.charity">ﻱﺮﻴﺧ ﺮﺠﺘﻣ</string>
+	<string name="type.shop.cheese">ﻦﺒﺠﻟﺍ ﺮﺠﺘﻣ</string>
+	<string name="type.shop.craft">ﺔﻳﻭﺪﻴﻟﺍ ﻑﺮﺤﻟﺍﻭ ﻥﻮﻨﻔﻟﺍ</string>
+	<string name="type.shop.dairy">ﻥﺎﺒﻟﻷﺍ ﺕﺎﺠﺘﻨﻣ</string>
+	<string name="type.shop.electrical">ﺔﻴﺋﺎﺑﺮﻬﻜﻟﺍ ﺕﺍﻭﺩﻷﺍ ﺮﺠﺘﻣ</string>
+	<string name="type.shop.fishing">ﺪﻴﺻ ﺮﺠﺘﻣ</string>
+	<string name="type.shop.interior_decoration">ﺔﻴﻠﺧﺍﺩ ﺕﺍﺭﻮﻜﻳﺩ</string>
+	<string name="type.shop.lottery">ﺐﻴﺼﻧﺎﻴﻟﺍ ﺮﻛﺍﺬﺗ</string>
+	<string name="type.shop.medical_supply">ﺔﻴﺒﻄﻟﺍ ﺕﺍﺩﺍﺪﻣﻹﺍ</string>
+	<string name="type.shop.nutrition_supplements">ﺔﻴﺋﺍﺬﻏ ﺕﻼﻤﻜﻣ</string>
+	<string name="type.shop.paint">ﺕﺎﻧﺎﻫﺪﻟﺍ</string>
+	<string name="type.shop.perfumery">ﺭﻮﻄﻌﻟﺍ</string>
+	<string name="type.shop.sewing">ﺔﻃﺎﻴﺨﻟﺍ ﺕﺍﺪﻌﻣ</string>
+	<string name="type.shop.storage_rental">ﻦﻳﺰﺨﺘﻟﺍ ﺕﺍﺪﺣﻭ ﺮﻴﺟﺄﺗ</string>
+	<string name="type.shop.tobacco">ﻎﺒﺗ</string>
+	<string name="type.shop.trade">ﺔﻳﺭﺎﺠﺘﻟﺍ ﺕﺍﺪﻳﺭﻮﺘﻟﺍ</string>
+	<string name="type.shop.watches">ﺕﺎﻋﺎﺳ</string>
+	<string name="type.shop.wholesale">ﺔﻠﻤﺠﻟﺎﺑ ﺔﻴﺋﺍﺬﻐﻟﺍ ﺩﺍﻮﻤﻟﺍ ﺓﺭﺎﺠﺗ</string>
 	<string name="type.sport">رياضة</string>
 	<string name="type.sport.american_football">كرة القدم الأمريكية</string>
 	<string name="type.sport.archery">الرماية</string>

android/res/values-be/strings.xml

@@ -915,7 +915,39 @@
 	<string name="type.shop.beverages">Напоі</string>
 	<string name="type.shop.caravan">Продаж аўтадамоў</string>
 	<string name="type.shop.cosmetics">Касметыка</string>
+	<string name="type.shop.deli">Дэлікатэсная крама</string>
+	<string name="type.shop.farm">Сельскагаспадарчыя прадукты</string>
 	<string name="type.shop.funeral_directors">Рытуальныя паслугі</string>
+	<string name="type.shop.grocery">Бакалея</string>
+	<string name="type.shop.hardware">Будаўнічы магазін</string>
+	<string name="type.shop.health_food">Крама здаровай ежы</string>
+	<string name="type.shop.houseware">Крама посуду</string>
+	<string name="type.shop.kitchen">Крама для кухні</string>
+	<string name="type.shop.pastry">Кандытарскія вырабы</string>
+	<string name="type.shop.second_hand">Крама сэканд-хэнд</string>
+	<string name="type.shop.antiques">Антыкварыят</string>
+	<string name="type.shop.art">Крама мастацтваў</string>
+	<string name="type.shop.baby_goods">Дзіцячая крама</string>
+	<string name="type.shop.bag">Крама сумак</string>
+	<string name="type.shop.boutique">Буцік</string>
+	<string name="type.shop.charity">Дабрачынная крама</string>
+	<string name="type.shop.cheese">Сырны магазін</string>
+	<string name="type.shop.craft">Мастацтва і рамёствы</string>
+	<string name="type.shop.dairy">Малочныя прадукты</string>
+	<string name="type.shop.electrical">Крама электратэхнікі</string>
+	<string name="type.shop.fishing">Рыбалоўны магазін</string>
+	<string name="type.shop.interior_decoration">Ўпрыгажэнні інтэр\'еру</string>
+	<string name="type.shop.lottery">Латарэйныя білеты</string>
+	<string name="type.shop.medical_supply">Медыцынскія прыналежнасці</string>
+	<string name="type.shop.nutrition_supplements">Харчовыя дабаўкі</string>
+	<string name="type.shop.paint">Фарбы</string>
+	<string name="type.shop.perfumery">Парфумерыя</string>
+	<string name="type.shop.sewing">Швейныя прыналежнасці</string>
+	<string name="type.shop.storage_rental">Арэнда сховішчаў</string>
+	<string name="type.shop.tobacco">Тытунь</string>
+	<string name="type.shop.trade">Гандлёвая прыналежнасць</string>
+	<string name="type.shop.watches">Гадзіннік</string>
+	<string name="type.shop.wholesale">Аптовая крама</string>
 	<string name="type.sport">Спорт</string>
 	<string name="type.sport.american_football">Амерыканскі футбол</string>
 	<string name="type.sport.archery">Стральба з лука</string>

android/res/values-bg/strings.xml

@@ -780,6 +780,38 @@
 	<string name="type.natural.wetland.bog">Торфено блато</string>
 	<string name="type.natural.wetland.marsh">Блато</string>
 	<string name="type.office.telecommunication">Телекомуникационна компания</string>
+	<string name="type.shop.deli">Магазин за деликатеси</string>
+	<string name="type.shop.farm">Магазин за селскостопански храни</string>
+	<string name="type.shop.grocery">Хранителни стоки</string>
+	<string name="type.shop.hardware">Магазин за хардуер</string>
+	<string name="type.shop.health_food">Магазин за здравословни храни</string>
+	<string name="type.shop.houseware">Магазин за домакински принадлежности</string>
+	<string name="type.shop.kitchen">Магазин за кухня</string>
+	<string name="type.shop.pastry">Тестени изделия</string>
+	<string name="type.shop.second_hand">Магазин втора употреба</string>
+	<string name="type.shop.antiques">Антики</string>
+	<string name="type.shop.art">Магазин за изкуства</string>
+	<string name="type.shop.baby_goods">Детски магазин</string>
+	<string name="type.shop.bag">Магазин за чанти</string>
+	<string name="type.shop.boutique">Бутик</string>
+	<string name="type.shop.charity">Благотворителен магазин</string>
+	<string name="type.shop.cheese">Магазин за сирене</string>
+	<string name="type.shop.craft">Изкуства и занаяти</string>
+	<string name="type.shop.dairy">Млечни продукти</string>
+	<string name="type.shop.electrical">Електрически магазин</string>
+	<string name="type.shop.fishing">Риболовен магазин</string>
+	<string name="type.shop.interior_decoration">Вътрешни декорации</string>
+	<string name="type.shop.lottery">Лотарийни билети</string>
+	<string name="type.shop.medical_supply">Медицински изделия</string>
+	<string name="type.shop.nutrition_supplements">Хранителни добавки</string>
+	<string name="type.shop.paint">Бои</string>
+	<string name="type.shop.perfumery">Парфюмерия</string>
+	<string name="type.shop.sewing">Шивашки консумативи</string>
+	<string name="type.shop.storage_rental">Склад под наем</string>
+	<string name="type.shop.tobacco">Тютюн</string>
+	<string name="type.shop.trade">Търговия с консумативи</string>
+	<string name="type.shop.watches">Часовници</string>
+	<string name="type.shop.wholesale">Магазин на едро</string>
 	<string name="type.sport">Спорт</string>
 	<string name="type.sport.american_football">Американски футбол</string>
 	<string name="type.sport.archery">Стрелба с лък</string>

android/res/values-cs/strings.xml

@@ -1247,21 +1247,27 @@
 	<string name="type.shop.convenience">Smíšené zboží</string>
 	<string name="type.shop.copyshop">Kopírovací obchod</string>
 	<string name="type.shop.cosmetics">Kosmetika</string>
+	<string name="type.shop.deli">Prodejna lahůdek</string>
 	<string name="type.shop.department_store">Obchodní dům</string>
 	<string name="type.shop.doityourself">Železářství</string>
 	<string name="type.shop.dry_cleaning">Chemické čištění</string>
 	<string name="type.shop.electronics">Elektronika</string>
 	<string name="type.shop.erotic">Obchod s erotickými pomůckami</string>
 	<string name="type.shop.fabric">Obchod</string>
+	<string name="type.shop.farm">Prodejna farmářských potravin</string>
 	<string name="type.shop.florist">Květinářství</string>
 	<string name="type.shop.funeral_directors">Pohřební služba</string>
 	<string name="type.shop.furniture">Nábytek</string>
 	<string name="type.shop.garden_centre">Školka</string>
 	<string name="type.shop.gift">Obchod s dárkovým zbožím</string>
 	<string name="type.shop.greengrocer">Ovoce a zelenina</string>
+	<string name="type.shop.grocery">Potraviny</string>
 	<string name="type.shop.hairdresser">Kadeřnictví</string>
 	<string name="type.shop.hardware">Železářství</string>
+	<string name="type.shop.health_food">Prodejna zdravé výživy</string>
+	<string name="type.shop.houseware">Obchod s domácími potřebami</string>
 	<string name="type.shop.jewelry">Klenotnictví</string>
+	<string name="type.shop.kitchen">Prodejna kuchyní</string>
 	<string name="type.shop.laundry">Prádelna</string>
 	<string name="type.shop.mall">Obchoďák</string>
 	<string name="type.shop.massage">Masážní salon</string>
@@ -1273,10 +1279,12 @@
 	<string name="type.shop.newsagent">Novinový stánek</string>
 	<string name="type.shop.optician">Optika</string>
 	<string name="type.shop.outdoor">Venkovní vybavení</string>
+	<string name="type.shop.pastry">Pečivo</string>
 	<string name="type.shop.pawnbroker">Zastavárna</string>
 	<string name="type.shop.pet">Zverimex</string>
 	<string name="type.shop.photo">Fotografický obchod</string>
 	<string name="type.shop.seafood">Prodej ryb</string>
+	<string name="type.shop.second_hand">Obchod z druhé ruky</string>
 	<string name="type.shop.shoes">Obuv</string>
 	<string name="type.shop.sports">Sportovní zboží</string>
 	<string name="type.shop.stationery">Papírnictví</string>
@@ -1290,6 +1298,29 @@
 	<string name="type.shop.video">Videopůjčovna</string>
 	<string name="type.shop.video_games">Obchod s videohrami</string>
 	<string name="type.shop.wine">Vinařství</string>
+	<string name="type.shop.antiques">Starožitnosti</string>
+	<string name="type.shop.art">Obchod s uměním</string>
+	<string name="type.shop.baby_goods">Dětský obchod</string>
+	<string name="type.shop.bag">Obchod s taškami</string>
+	<string name="type.shop.boutique">Butik</string>
+	<string name="type.shop.charity">Charitativní obchod</string>
+	<string name="type.shop.cheese">Prodejna sýrů</string>
+	<string name="type.shop.craft">Umění a řemesla</string>
+	<string name="type.shop.dairy">Mléčné výrobky</string>
+	<string name="type.shop.electrical">Elektro obchod</string>
+	<string name="type.shop.fishing">Rybářský obchod</string>
+	<string name="type.shop.interior_decoration">Interiérové dekorace</string>
+	<string name="type.shop.lottery">Loterijní lístky</string>
+	<string name="type.shop.medical_supply">Zdravotní zásoby</string>
+	<string name="type.shop.nutrition_supplements">Doplňky výživy</string>
+	<string name="type.shop.paint">Barvy</string>
+	<string name="type.shop.perfumery">Parfumerie</string>
+	<string name="type.shop.sewing">Šicí potřeby</string>
+	<string name="type.shop.storage_rental">Pronájem skladu</string>
+	<string name="type.shop.tobacco">Tabák</string>
+	<string name="type.shop.trade">Obchod se zásobami</string>
+	<string name="type.shop.watches">Hodinky</string>
+	<string name="type.shop.wholesale">Velkoobchodní prodejna</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Americký fotbal</string>
 	<string name="type.sport.archery">Lukostřelba</string>

android/res/values-da/strings.xml

@@ -1236,21 +1236,27 @@
 	<string name="type.shop.convenience">Døgnbutik</string>
 	<string name="type.shop.copyshop">Kopieringsbutik</string>
 	<string name="type.shop.cosmetics">Kosmetik</string>
+	<string name="type.shop.deli">Delikatessebutik</string>
 	<string name="type.shop.department_store">Stormagasin</string>
 	<string name="type.shop.doityourself">Isenkræmmer</string>
 	<string name="type.shop.dry_cleaning">Renseri</string>
 	<string name="type.shop.electronics">Elektronikbutik</string>
 	<string name="type.shop.erotic">Erotisk butik</string>
 	<string name="type.shop.fabric">Butik</string>
+	<string name="type.shop.farm">Farm Food Shop</string>
 	<string name="type.shop.florist">Blomsterbutik</string>
 	<string name="type.shop.funeral_directors">Bedemand</string>
 	<string name="type.shop.furniture">Møbelbutik</string>
 	<string name="type.shop.garden_centre">Planteskole</string>
 	<string name="type.shop.gift">Gavebutik</string>
 	<string name="type.shop.greengrocer">Grønthandler</string>
+	<string name="type.shop.grocery">Købmand</string>
 	<string name="type.shop.hairdresser">Frisør</string>
 	<string name="type.shop.hardware">Isenkræmmer</string>
+	<string name="type.shop.health_food">Helsekostbutik</string>
+	<string name="type.shop.houseware">Husholdningsartikler butik</string>
 	<string name="type.shop.jewelry">Smykkebutik</string>
+	<string name="type.shop.kitchen">Køkkenforretning</string>
 	<string name="type.shop.laundry">Vaskeri</string>
 	<string name="type.shop.mall">Indkøbscenter</string>
 	<string name="type.shop.massage">Massageklinik</string>
@@ -1262,10 +1268,12 @@
 	<string name="type.shop.newsagent">Avis-kiosk</string>
 	<string name="type.shop.optician">Optiker</string>
 	<string name="type.shop.outdoor">Fritidsudstyr</string>
+	<string name="type.shop.pastry">Bagværk</string>
 	<string name="type.shop.pawnbroker">Pantelåner</string>
 	<string name="type.shop.pet">Dyrehandel</string>
 	<string name="type.shop.photo">Fotobutik</string>
 	<string name="type.shop.seafood">Fiskehandler</string>
+	<string name="type.shop.second_hand">Genbrugsbutik</string>
 	<string name="type.shop.shoes">Skobutik</string>
 	<string name="type.shop.sports">Sportsudstyr</string>
 	<string name="type.shop.stationery">Kontorartikler</string>
@@ -1280,6 +1288,29 @@
 	<string name="type.shop.video">Videobutik</string>
 	<string name="type.shop.video_games">Computerspilbutik</string>
 	<string name="type.shop.wine">Vinhandel</string>
+	<string name="type.shop.antiques">Antikviteter</string>
+	<string name="type.shop.art">Kunstbutik</string>
+	<string name="type.shop.baby_goods">Børnebutik</string>
+	<string name="type.shop.bag">Tasker butik</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Velgørenhedsbutik</string>
+	<string name="type.shop.cheese">Ostebutik</string>
+	<string name="type.shop.craft">Kunst og kunsthåndværk</string>
+	<string name="type.shop.dairy">Mejeriprodukter</string>
+	<string name="type.shop.electrical">El-butik</string>
+	<string name="type.shop.fishing">Fiskeri butik</string>
+	<string name="type.shop.interior_decoration">Indvendige dekorationer</string>
+	<string name="type.shop.lottery">Lotterikuponer</string>
+	<string name="type.shop.medical_supply">Medicinske forsyninger</string>
+	<string name="type.shop.nutrition_supplements">Kosttilskud</string>
+	<string name="type.shop.paint">Maling</string>
+	<string name="type.shop.perfumery">Parfumeri</string>
+	<string name="type.shop.sewing">Syudstyr</string>
+	<string name="type.shop.storage_rental">Lagerudlejning</string>
+	<string name="type.shop.tobacco">Tobak</string>
+	<string name="type.shop.trade">Handler forsyninger</string>
+	<string name="type.shop.watches">Ure</string>
+	<string name="type.shop.wholesale">Engros butik</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Amerikansk fodbold</string>
 	<string name="type.sport.archery">Bueskydning</string>

android/res/values-de/strings.xml

@@ -1451,21 +1451,27 @@
 	<string name="type.shop.convenience">Gemischtwarenladen</string>
 	<string name="type.shop.copyshop">Kopierladen</string>
 	<string name="type.shop.cosmetics">Kosmetikgeschäft</string>
+	<string name="type.shop.deli">Feinkostgeschäft</string>
 	<string name="type.shop.department_store">Kaufhaus</string>
 	<string name="type.shop.doityourself">Baumarkt</string>
 	<string name="type.shop.dry_cleaning">Chemische Reinigung</string>
 	<string name="type.shop.electronics">Elektronik</string>
 	<string name="type.shop.erotic">Erotikladen</string>
 	<string name="type.shop.fabric">Textilgeschäft</string>
+	<string name="type.shop.farm">Hoflebensmittelladen</string>
 	<string name="type.shop.florist">Florist</string>
 	<string name="type.shop.funeral_directors">Bestattungsinstitut</string>
 	<string name="type.shop.furniture">Möbelgeschäft</string>
 	<string name="type.shop.garden_centre">Gärtnerei</string>
 	<string name="type.shop.gift">Geschenkladen</string>
 	<string name="type.shop.greengrocer">Gemüseladen</string>
+	<string name="type.shop.grocery">Lebensmittelgeschäft</string>
 	<string name="type.shop.hairdresser">Friseur</string>
-	<string name="type.shop.hardware">Eisenwarengeschäft</string>
+	<string name="type.shop.hardware">Baumarkt</string>
+	<string name="type.shop.health_food">Reformhaus</string>
+	<string name="type.shop.houseware">Haushaltswarengeschäft</string>
 	<string name="type.shop.jewelry">Juweliergeschäft</string>
+	<string name="type.shop.kitchen">Küchengeschäft</string>
 	<string name="type.shop.laundry">Wäscherei</string>
 	<string name="type.shop.mall">Einkaufszentrum</string>
 	<string name="type.shop.massage">Massagesalon</string>
@@ -1477,10 +1483,12 @@
 	<string name="type.shop.newsagent">Zeitungsstand</string>
 	<string name="type.shop.optician">Optiker</string>
 	<string name="type.shop.outdoor">Outdoor-Ausrüstung</string>
+	<string name="type.shop.pastry">Gebäck</string>
 	<string name="type.shop.pawnbroker">Pfandleihe</string>
 	<string name="type.shop.pet">Tierhandlung</string>
 	<string name="type.shop.photo">Fotofachgeschäft</string>
 	<string name="type.shop.seafood">Fischhändler</string>
+	<string name="type.shop.second_hand">Second-Hand-Laden</string>
 	<string name="type.shop.shoes">Schuhgeschäft</string>
 	<string name="type.shop.sports">Sportartikel</string>
 	<string name="type.shop.stationery">Schreibwarenladen</string>
@@ -1495,6 +1503,29 @@
 	<string name="type.shop.video">Videothek</string>
 	<string name="type.shop.video_games">Gameshop</string>
 	<string name="type.shop.wine">Wein- und Spirituosengeschäft</string>
+	<string name="type.shop.antiques">Antiquitäten</string>
+	<string name="type.shop.art">Kunstgeschäft</string>
+	<string name="type.shop.baby_goods">Kinderladen</string>
+	<string name="type.shop.bag">Taschen Shop</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Wohltätigkeitsladen</string>
+	<string name="type.shop.cheese">Käseladen</string>
+	<string name="type.shop.craft">Kunst und Handwerk</string>
+	<string name="type.shop.dairy">Milchprodukte</string>
+	<string name="type.shop.electrical">Elektrogeschäft</string>
+	<string name="type.shop.fishing">Angelgeschäft</string>
+	<string name="type.shop.interior_decoration">Innendekorationen</string>
+	<string name="type.shop.lottery">Lotteriescheine</string>
+	<string name="type.shop.medical_supply">Medizinische Versorgung</string>
+	<string name="type.shop.nutrition_supplements">Nahrungsergänzungsmittel</string>
+	<string name="type.shop.paint">Farben</string>
+	<string name="type.shop.perfumery">Parfümerie</string>
+	<string name="type.shop.sewing">Nähzubehör</string>
+	<string name="type.shop.storage_rental">Speichermiete</string>
+	<string name="type.shop.tobacco">Tabak</string>
+	<string name="type.shop.trade">Handelsbedarf</string>
+	<string name="type.shop.watches">Uhren</string>
+	<string name="type.shop.wholesale">Großhandelsgeschäft</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">American Football</string>
 	<string name="type.sport.archery">Bogenschießen</string>

android/res/values-el/strings.xml

@@ -1250,22 +1250,28 @@
 	<string name="type.shop.convenience">Ψιλικατζίδικο</string>
 	<string name="type.shop.copyshop">Φωτοτυπείο</string>
 	<string name="type.shop.cosmetics">Καλλυντικά</string>
+	<string name="type.shop.deli">Κατάστημα Delicatessen</string>
 	<string name="type.shop.department_store">Πολυκατάστημα</string>
 	<string name="type.shop.doityourself">Είδη κιγκαλερίας</string>
 	<string name="type.shop.dry_cleaning">Στεγνό καθάρισμα</string>
 	<string name="type.shop.electronics">Ηλεκτρονικά</string>
 	<string name="type.shop.erotic">Κατάστημα ερωτικών ειδών</string>
 	<string name="type.shop.fabric">Κατάστημα</string>
+	<string name="type.shop.farm">Κατάστημα Αγροτικών Τροφίμων</string>
 	<string name="type.shop.florist">Ανθοπωλείο</string>
 	<string name="type.shop.funeral_directors">Γραφεία τελετών</string>
 	<string name="type.shop.furniture">Κατάστημα επίπλων</string>
 	<string name="type.shop.garden_centre">Κατάστημα ειδών κήπου</string>
 	<string name="type.shop.gift">Είδη δώρου</string>
 	<string name="type.shop.greengrocer">Μανάβικο</string>
+	<string name="type.shop.grocery">Παντοπωλείο</string>
 	<string name="type.shop.hairdresser">Κομμωτής</string>
-	<string name="type.shop.hardware">Είδη κιγκαλερίας</string>
+	<string name="type.shop.hardware">Κατάστημα υλικού</string>
+	<string name="type.shop.health_food">Κατάστημα υγιεινής διατροφής</string>
+	<string name="type.shop.houseware">Κατάστημα οικιακών ειδών</string>
 	<string name="type.shop.jewelry">Κοσμηματοπωλείο</string>
 	<string name="type.shop.kiosk">Περίπτερο</string>
+	<string name="type.shop.kitchen">Κατάστημα κουζίνας</string>
 	<string name="type.shop.laundry">Άπλυτα</string>
 	<string name="type.shop.mall">Εμπορικό κέντρο</string>
 	<string name="type.shop.massage">Αίθουσα μασάζ</string>
@@ -1277,10 +1283,12 @@
 	<string name="type.shop.newsagent">Εφημεριδοπώλης</string>
 	<string name="type.shop.optician">Κατάστημα οπτικών</string>
 	<string name="type.shop.outdoor">Εξοπλισμός υπαίθρου</string>
+	<string name="type.shop.pastry">Ζύμη</string>
 	<string name="type.shop.pawnbroker">Ενεχυροδανειστήριο</string>
 	<string name="type.shop.pet">Κατάστημα για κατοικίδια</string>
 	<string name="type.shop.photo">Φωτογραφείο</string>
 	<string name="type.shop.seafood">Κατάστημα με θαλασσινά</string>
+	<string name="type.shop.second_hand">Κατάστημα μεταχειρισμένων</string>
 	<string name="type.shop.shoes">Υποδηματοπωλείο</string>
 	<string name="type.shop.sports">Αθλητικά είδη</string>
 	<string name="type.shop.stationery">Κατάστημα γραφικής ύλης</string>
@@ -1295,6 +1303,29 @@
 	<string name="type.shop.video">Βίντεο Κλαμπ</string>
 	<string name="type.shop.video_games">Κατάστημα βιντεοπαιχνιδιών</string>
 	<string name="type.shop.wine">Οινοπωλείο</string>
+	<string name="type.shop.antiques">Αντίκες</string>
+	<string name="type.shop.art">Κατάστημα Τεχνών</string>
+	<string name="type.shop.baby_goods">Παιδικό κατάστημα</string>
+	<string name="type.shop.bag">Κατάστημα τσαντών</string>
+	<string name="type.shop.boutique">Μπουτίκ</string>
+	<string name="type.shop.charity">Φιλανθρωπικό κατάστημα</string>
+	<string name="type.shop.cheese">Τυροκομείο</string>
+	<string name="type.shop.craft">Τέχνες και χειροτεχνήματα</string>
+	<string name="type.shop.dairy">Γαλακτοκομικά προϊόντα</string>
+	<string name="type.shop.electrical">Μαγαζί ηλεκτρικών ειδών</string>
+	<string name="type.shop.fishing">Κατάστημα ψαρέματος</string>
+	<string name="type.shop.interior_decoration">Διακοσμήσεις εσωτερικών χώρων</string>
+	<string name="type.shop.lottery">Λαχεία</string>
+	<string name="type.shop.medical_supply">Ιατρικά Είδη</string>
+	<string name="type.shop.nutrition_supplements">Συμπληρώματα Διατροφής</string>
+	<string name="type.shop.paint">Βαφές</string>
+	<string name="type.shop.perfumery">Αρωματοποιία</string>
+	<string name="type.shop.sewing">Είδη Ραπτικής</string>
+	<string name="type.shop.storage_rental">Ενοικίαση αποθηκευτικού χώρου</string>
+	<string name="type.shop.tobacco">Καπνός</string>
+	<string name="type.shop.trade">Εμπόριο Προμήθειες</string>
+	<string name="type.shop.watches">Ρολόγια</string>
+	<string name="type.shop.wholesale">Κατάστημα χονδρικής</string>
 	<string name="type.sport">Αθλητισμός</string>
 	<string name="type.sport.american_football">αμερικάνικο ποδόσφαιρο</string>
 	<string name="type.sport.archery">Τοξοβολία</string>

android/res/values-es/strings.xml

@@ -1345,22 +1345,28 @@
 	<string name="type.shop.convenience">Tienda de barrio</string>
 	<string name="type.shop.copyshop">Centro de copiado</string>
 	<string name="type.shop.cosmetics">Productos cosméticos</string>
+	<string name="type.shop.deli">Tienda de delicatessen</string>
 	<string name="type.shop.department_store">Grandes almacenes</string>
 	<string name="type.shop.doityourself">Ferretería</string>
 	<string name="type.shop.dry_cleaning">Tintorería</string>
 	<string name="type.shop.electronics">Electrónica</string>
 	<string name="type.shop.erotic">Sex Shop</string>
 	<string name="type.shop.fabric">Tienda</string>
+	<string name="type.shop.farm">Tienda de alimentos de granja</string>
 	<string name="type.shop.florist">Floristería</string>
 	<string name="type.shop.funeral_directors">Funeraria</string>
 	<string name="type.shop.furniture">Tienda de muebles</string>
 	<string name="type.shop.garden_centre">Vivero</string>
 	<string name="type.shop.gift">Tienda de regalos</string>
 	<string name="type.shop.greengrocer">Frutería</string>
+	<string name="type.shop.grocery">Tienda de comestibles</string>
 	<string name="type.shop.hairdresser">Peluquería</string>
 	<string name="type.shop.hardware">Ferretería</string>
+	<string name="type.shop.health_food">Tienda de comida saludable</string>
+	<string name="type.shop.houseware">Tienda de artículos para el hogar</string>
 	<string name="type.shop.jewelry">Joyería</string>
 	<string name="type.shop.kiosk">Quiosco</string>
+	<string name="type.shop.kitchen">Tienda de cocina</string>
 	<string name="type.shop.laundry">Lavandería</string>
 	<string name="type.shop.mall">Centro comercial</string>
 	<string name="type.shop.massage">Salón de masajes</string>
@@ -1372,10 +1378,12 @@
 	<string name="type.shop.newsagent">Puesto de venta de periódicos</string>
 	<string name="type.shop.optician">Óptica</string>
 	<string name="type.shop.outdoor">Equipamiento</string>
+	<string name="type.shop.pastry">Pastelería</string>
 	<string name="type.shop.pawnbroker">Casa de empeños</string>
 	<string name="type.shop.pet">Tienda de mascotas</string>
 	<string name="type.shop.photo">Artículos de fotografía</string>
 	<string name="type.shop.seafood">Pescadería</string>
+	<string name="type.shop.second_hand">Tienda de segunda mano</string>
 	<string name="type.shop.shoes">Zapatería</string>
 	<string name="type.shop.sports">Artículos de deporte</string>
 	<string name="type.shop.stationery">Papelería</string>
@@ -1390,6 +1398,29 @@
 	<string name="type.shop.video">Tienda de vídeo</string>
 	<string name="type.shop.video_games">Tienda de videojuegos</string>
 	<string name="type.shop.wine">Tienda de vinos</string>
+	<string name="type.shop.antiques">Antigüedades</string>
+	<string name="type.shop.art">Tienda de artes</string>
+	<string name="type.shop.baby_goods">Tienda de niños</string>
+	<string name="type.shop.bag">Tienda de bolsos</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Tienda de caridad</string>
+	<string name="type.shop.cheese">Tienda de queso</string>
+	<string name="type.shop.craft">Artes y manualidades</string>
+	<string name="type.shop.dairy">Productos lácteos</string>
+	<string name="type.shop.electrical">Tienda de electricidad</string>
+	<string name="type.shop.fishing">Tienda de pesca</string>
+	<string name="type.shop.interior_decoration">Decoraciones interiores</string>
+	<string name="type.shop.lottery">Boletos de lotería</string>
+	<string name="type.shop.medical_supply">Suministros médicos</string>
+	<string name="type.shop.nutrition_supplements">Suplementos Nutricionales</string>
+	<string name="type.shop.paint">Pinturas</string>
+	<string name="type.shop.perfumery">Perfumería</string>
+	<string name="type.shop.sewing">Materiales de costura</string>
+	<string name="type.shop.storage_rental">Alquiler de almacenamiento</string>
+	<string name="type.shop.tobacco">Tabaco</string>
+	<string name="type.shop.trade">Suministros comerciales</string>
+	<string name="type.shop.watches">Relojes</string>
+	<string name="type.shop.wholesale">Almacén al por mayor</string>
 	<string name="type.sport">Deporte</string>
 	<string name="type.sport.american_football">Fútbol americano</string>
 	<string name="type.sport.archery">Tiro al arco</string>

android/res/values-eu/strings.xml

@@ -1311,22 +1311,28 @@
 	<string name="type.shop.convenience">Auzoko denda</string>
 	<string name="type.shop.copyshop">Kopiatu zentroa</string>
 	<string name="type.shop.cosmetics">Produktu kosmetikoak</string>
+	<string name="type.shop.deli">Delicatesen Denda</string>
 	<string name="type.shop.department_store">Denda handiak</string>
 	<string name="type.shop.doityourself">Burdindegia</string>
 	<string name="type.shop.dry_cleaning">Garbigailua</string>
 	<string name="type.shop.electronics">Elektronika</string>
 	<string name="type.shop.erotic">Sexu denda</string>
 	<string name="type.shop.fabric">Denda</string>
+	<string name="type.shop.farm">Baserriko Janari Denda</string>
 	<string name="type.shop.florist">Loradenda</string>
 	<string name="type.shop.funeral_directors">Tanatorioa</string>
 	<string name="type.shop.furniture">Altzari denda</string>
 	<string name="type.shop.garden_centre">Haurtzaindegia</string>
 	<string name="type.shop.gift">Denda</string>
 	<string name="type.shop.greengrocer">Fruta denda</string>
+	<string name="type.shop.grocery">Janariak</string>
 	<string name="type.shop.hairdresser">Barber-denda</string>
-	<string name="type.shop.hardware">Burdindegia</string>
+	<string name="type.shop.hardware">Hardware denda</string>
+	<string name="type.shop.health_food">Osasuneko Elikagaien Denda</string>
+	<string name="type.shop.houseware">Etxeko tresneria denda</string>
 	<string name="type.shop.jewelry">Bitxiak</string>
 	<string name="type.shop.kiosk">Kioskoa</string>
+	<string name="type.shop.kitchen">Sukalde-denda</string>
 	<string name="type.shop.laundry">Garbitegia</string>
 	<string name="type.shop.mall">Merkataritza-gune</string>
 	<string name="type.shop.massage">Masaje gela</string>
@@ -1338,10 +1344,12 @@
 	<string name="type.shop.newsagent">Kioskoa</string>
 	<string name="type.shop.optician">Optika</string>
 	<string name="type.shop.outdoor">Ekipamendua</string>
+	<string name="type.shop.pastry">Gozogintza</string>
 	<string name="type.shop.pawnbroker">Peoia</string>
 	<string name="type.shop.pet">Animali denda</string>
 	<string name="type.shop.photo">Argazkilaritza artikuluak</string>
 	<string name="type.shop.seafood">Arrain-denda</string>
+	<string name="type.shop.second_hand">Bigarren eskuko denda</string>
 	<string name="type.shop.shoes">Zapata-denda</string>
 	<string name="type.shop.sports">Kirol artikuluak</string>
 	<string name="type.shop.stationery">Papergintza</string>
@@ -1356,6 +1364,29 @@
 	<string name="type.shop.video">Bideo-denda</string>
 	<string name="type.shop.video_games">Bideo-jokoen denda</string>
 	<string name="type.shop.wine">Ardo-denda</string>
+	<string name="type.shop.antiques">Antigoalekoak</string>
+	<string name="type.shop.art">Arte Denda</string>
+	<string name="type.shop.baby_goods">Haurrentzako denda</string>
+	<string name="type.shop.bag">Poltsen Denda</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Ongintzazko Denda</string>
+	<string name="type.shop.cheese">Gazta Denda</string>
+	<string name="type.shop.craft">Arteak eta Eskulanak</string>
+	<string name="type.shop.dairy">Esnekiak</string>
+	<string name="type.shop.electrical">Elektrizitate Denda</string>
+	<string name="type.shop.fishing">Arrantza Denda</string>
+	<string name="type.shop.interior_decoration">Barruko Apaingarriak</string>
+	<string name="type.shop.lottery">Loteria Sarrerak</string>
+	<string name="type.shop.medical_supply">Medikuntza-hornidura</string>
+	<string name="type.shop.nutrition_supplements">Nutrizio osagarriak</string>
+	<string name="type.shop.paint">Margoak</string>
+	<string name="type.shop.perfumery">Lurringintza</string>
+	<string name="type.shop.sewing">Josteko hornigaiak</string>
+	<string name="type.shop.storage_rental">Biltegiratzeko alokairua</string>
+	<string name="type.shop.tobacco">Tabakoa</string>
+	<string name="type.shop.trade">Lanbideen hornidurak</string>
+	<string name="type.shop.watches">Erlojuak</string>
+	<string name="type.shop.wholesale">Handizkako denda</string>
 	<string name="type.sport">Kirola</string>
 	<string name="type.sport.american_football">Futbola</string>
 	<string name="type.sport.archery">Arku-tiroa</string>

android/res/values-fa/strings.xml

@@ -1157,22 +1157,28 @@
 	<string name="type.shop.convenience">فروشگاه</string>
 	<string name="type.shop.copyshop">فروشگاه چاپ و تکثیر</string>
 	<string name="type.shop.cosmetics">فروشگاه</string>
+	<string name="type.shop.deli">ﯽﺷﻭﺮﻓ ﻪﯾﺬﻏﺍ ﻩﺎﮕﺷﻭﺮﻓ</string>
 	<string name="type.shop.department_store">مرکز خرید</string>
 	<string name="type.shop.doityourself">فروشگاه</string>
 	<string name="type.shop.dry_cleaning">خشک شویی</string>
 	<string name="type.shop.electronics">فروشگاه</string>
 	<string name="type.shop.erotic">فروشگاه</string>
 	<string name="type.shop.fabric">فروشگاه</string>
+	<string name="type.shop.farm">ﻪﻋﺭﺰﻣ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ</string>
 	<string name="type.shop.florist">فروشگاه</string>
 	<string name="type.shop.funeral_directors">مسئول تشییع جنازه</string>
 	<string name="type.shop.furniture">فروشگاه</string>
 	<string name="type.shop.garden_centre">فروشگاه</string>
 	<string name="type.shop.gift">فروشگاه</string>
 	<string name="type.shop.greengrocer">فروشگاه</string>
+	<string name="type.shop.grocery">ﺭﺎﺑﺭﺍﻮﺧ</string>
 	<string name="type.shop.hairdresser">ارایشگاه</string>
-	<string name="type.shop.hardware">فروشگاه</string>
+	<string name="type.shop.hardware">ﺭﺍﺰﻓﺍ ﺖﺨﺳ ﻩﺎﮕﺷﻭﺮﻓ</string>
+	<string name="type.shop.health_food">ﯽﺘﺷﺍﺪﻬﺑ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ</string>
+	<string name="type.shop.houseware">ﯽﮕﻧﺎﺧ ﻡﺯﺍﻮﻟ ﻩﺎﮕﺷﻭﺮﻓ</string>
 	<string name="type.shop.jewelry">طلا فروشی</string>
 	<string name="type.shop.kiosk">دَکهِ</string>
+	<string name="type.shop.kitchen">ﻪﻧﺎﺧﺰﭙﺷﺁ ﻩﺎﮕﺷﻭﺮﻓ</string>
 	<string name="type.shop.laundry">لباس شویی</string>
 	<string name="type.shop.mall">فروشگاه</string>
 	<string name="type.shop.massage">سالن ماساژ</string>
@@ -1184,10 +1190,12 @@
 	<string name="type.shop.newsagent">فروشگاه</string>
 	<string name="type.shop.optician">فروشگاه</string>
 	<string name="type.shop.outdoor">فروشگاه</string>
+	<string name="type.shop.pastry">ﯽﻨﯾﺮﯿﺷ</string>
 	<string name="type.shop.pawnbroker">عتیقه فروشی</string>
 	<string name="type.shop.pet">فروشگاه</string>
 	<string name="type.shop.photo">فروشگاه</string>
 	<string name="type.shop.seafood">فروشگاه</string>
+	<string name="type.shop.second_hand">ﻡﻭﺩ ﺖﺳﺩ ﻩﺎﮕﺷﻭﺮﻓ</string>
 	<string name="type.shop.shoes">فروشگاه</string>
 	<string name="type.shop.sports">فروشگاه</string>
 	<string name="type.shop.stationery">لوازم التحریر</string>
@@ -1202,6 +1210,29 @@
 	<string name="type.shop.video">فروشگاه رسانه‌های تصویری</string>
 	<string name="type.shop.video_games">فروشگاه بازی‌های رایانه‌ای</string>
 	<string name="type.shop.wine">فروشگاه</string>
+	<string name="type.shop.antiques">ﺕﺎﺟ ﻪﻘﯿﺘﻋ</string>
+	<string name="type.shop.art">ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ</string>
+	<string name="type.shop.baby_goods">ﻥﺎﮐﺩﻮﮐ ﻩﺎﮕﺷﻭﺮﻓ</string>
+	<string name="type.shop.bag">ﻒﯿﮐ ﻩﺎﮕﺷﻭﺮﻓ</string>
+	<string name="type.shop.boutique">ﮏﯿﺗﻮﺑ</string>
+	<string name="type.shop.charity">ﻪﯾﺮﯿﺧ ﻩﺎﮕﺷﻭﺮﻓ</string>
+	<string name="type.shop.cheese">ﺮﯿﻨﭘ ﻩﺎﮕﺷﻭﺮﻓ</string>
+	<string name="type.shop.craft">ﯽﺘﺳﺩ ﻊﯾﺎﻨﺻ ﻭ ﺮﻨﻫ</string>
+	<string name="type.shop.dairy">ﯽﻨﺒﻟ ﺕﻻﻮﺼﺤﻣ</string>
+	<string name="type.shop.electrical">ﯽﮑﯾﺮﺘﮑﻟﺍ ﻡﺯﺍﻮﻟ ﻩﺯﺎﻐﻣ</string>
+	<string name="type.shop.fishing">ﯼﺮﯿﮕﯿﻫﺎﻣ ﻩﺎﮕﺷﻭﺮﻓ</string>
+	<string name="type.shop.interior_decoration">ﯽﻠﺧﺍﺩ ﻥﻮﯿﺳﺍﺭﻮﮐﺩ</string>
+	<string name="type.shop.lottery">ﯽﯾﺎﻣﺯﺁ ﺖﺨﺑ ﻂﯿﻠﺑ</string>
+	<string name="type.shop.medical_supply">ﯽﮑﺷﺰﭘ ﻡﺯﺍﻮﻟ</string>
+	<string name="type.shop.nutrition_supplements">ﯽﯾﺍﺬﻏ ﯼﺎﻫ ﻞﻤﮑﻣ</string>
+	<string name="type.shop.paint">ﺪﻨﮐ ﯽﻣ ﮓﻧﺭ</string>
+	<string name="type.shop.perfumery">ﯼﺯﺎﺳﺮﻄﻋ</string>
+	<string name="type.shop.sewing">ﯽﻃﺎﯿﺧ ﻡﺯﺍﻮﻟ</string>
+	<string name="type.shop.storage_rental">ﺭﺎﺒﻧﺍ ﻩﺭﺎﺟﺍ</string>
+	<string name="type.shop.tobacco">ﻮﮐﺎﺒﻨﺗ</string>
+	<string name="type.shop.trade">ﻡﺯﺍﻮﻟ ﺕﺭﺎﺠﺗ</string>
+	<string name="type.shop.watches">ﺖﻋﺎﺳ</string>
+	<string name="type.shop.wholesale">ﯽﺷﻭﺮﻓ ﻩﺪﻤﻋ ﻩﺎﮕﺷﻭﺮﻓ</string>
 	<string name="type.sport">ورزش</string>
 	<string name="type.sport.american_football">فوتبال آمریکایی</string>
 	<string name="type.sport.archery">تیراندازی با کمان</string>

android/res/values-fi/strings.xml

@@ -1261,22 +1261,28 @@
 	<string name="type.shop.convenience">Lähikauppa</string>
 	<string name="type.shop.copyshop">Painotalo</string>
 	<string name="type.shop.cosmetics">Kosmetiikka</string>
+	<string name="type.shop.deli">Herkkukauppa</string>
 	<string name="type.shop.department_store">Tavaratalo</string>
 	<string name="type.shop.doityourself">Rautakauppa</string>
 	<string name="type.shop.dry_cleaning">Kuivapesula</string>
 	<string name="type.shop.electronics">Elektroniikka</string>
 	<string name="type.shop.erotic">Erotiikkaliike</string>
 	<string name="type.shop.fabric">Kauppa</string>
+	<string name="type.shop.farm">Maatilaruokakauppa</string>
 	<string name="type.shop.florist">Floristi</string>
 	<string name="type.shop.funeral_directors">Hautaustoimisto</string>
 	<string name="type.shop.furniture">Huonekalukauppa</string>
 	<string name="type.shop.garden_centre">Taimitarha</string>
 	<string name="type.shop.gift">Lahjatavaraliike</string>
 	<string name="type.shop.greengrocer">Vihanneskauppias</string>
+	<string name="type.shop.grocery">Päivittäistavarakauppa</string>
 	<string name="type.shop.hairdresser">Kampaamo</string>
 	<string name="type.shop.hardware">Rautakauppa</string>
+	<string name="type.shop.health_food">Terveysruokakauppa</string>
+	<string name="type.shop.houseware">Taloustavarakauppa</string>
 	<string name="type.shop.jewelry">Korukauppa</string>
 	<string name="type.shop.kiosk">Kioski</string>
+	<string name="type.shop.kitchen">Keittiökauppa</string>
 	<string name="type.shop.laundry">Pesula</string>
 	<string name="type.shop.mall">Ostoskeskus</string>
 	<string name="type.shop.massage">Hierontahuone</string>
@@ -1288,10 +1294,12 @@
 	<string name="type.shop.newsagent">Lehtikioski</string>
 	<string name="type.shop.optician">Optikko</string>
 	<string name="type.shop.outdoor">Ulkoiluvarusteet</string>
+	<string name="type.shop.pastry">Leivonnainen</string>
 	<string name="type.shop.pawnbroker">Panttilainaamo</string>
 	<string name="type.shop.pet">Eläinkauppa</string>
 	<string name="type.shop.photo">Valokuvakauppa</string>
 	<string name="type.shop.seafood">Kalakauppias</string>
+	<string name="type.shop.second_hand">Second Hand Store</string>
 	<string name="type.shop.shoes">Kenkäkauppa</string>
 	<string name="type.shop.sports">Urheilukauppa</string>
 	<string name="type.shop.stationery">Kirjoitustarvikekauppa</string>
@@ -1306,6 +1314,29 @@
 	<string name="type.shop.video">Videokauppa</string>
 	<string name="type.shop.video_games">Videopelikauppa</string>
 	<string name="type.shop.wine">Alkoholimyymälä</string>
+	<string name="type.shop.antiques">Antiikkia</string>
+	<string name="type.shop.art">Taidekauppa</string>
+	<string name="type.shop.baby_goods">Lasten kauppa</string>
+	<string name="type.shop.bag">Laukkukauppa</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Hyväntekeväisyysmyymälä</string>
+	<string name="type.shop.cheese">Juustokauppa</string>
+	<string name="type.shop.craft">Käsityöt</string>
+	<string name="type.shop.dairy">Maitotuotteet</string>
+	<string name="type.shop.electrical">Sähköliike</string>
+	<string name="type.shop.fishing">Kalastuskauppa</string>
+	<string name="type.shop.interior_decoration">Sisustuskoristeet</string>
+	<string name="type.shop.lottery">Lottoliput</string>
+	<string name="type.shop.medical_supply">Lääketieteellisiä tarvikkeita</string>
+	<string name="type.shop.nutrition_supplements">Ravintolisät</string>
+	<string name="type.shop.paint">Maalit</string>
+	<string name="type.shop.perfumery">Hajuvedet</string>
+	<string name="type.shop.sewing">Ompelutarvikkeet</string>
+	<string name="type.shop.storage_rental">Varastoinnin vuokraus</string>
+	<string name="type.shop.tobacco">Tupakka</string>
+	<string name="type.shop.trade">Kauppa tarvikkeita</string>
+	<string name="type.shop.watches">Kellot</string>
+	<string name="type.shop.wholesale">Tukkukauppa</string>
 	<string name="type.sport">Urheilu</string>
 	<string name="type.sport.american_football">Amerikkalainen jalkapallo</string>
 	<string name="type.sport.archery">Jousiammunta</string>

android/res/values-fr/strings.xml

@@ -1409,22 +1409,28 @@
 	<string name="type.shop.convenience">Supérette</string>
 	<string name="type.shop.copyshop">Boutique de photocopies</string>
 	<string name="type.shop.cosmetics">Produits de beauté</string>
+	<string name="type.shop.deli">Épicerie fine</string>
 	<string name="type.shop.department_store">Grand magasin</string>
 	<string name="type.shop.doityourself">Magasin de bricolage</string>
 	<string name="type.shop.dry_cleaning">Nettoyage à sec</string>
 	<string name="type.shop.electronics">Magasin d\'électroménager</string>
 	<string name="type.shop.erotic">Boutique érotique</string>
 	<string name="type.shop.fabric">Magasin de tissus</string>
+	<string name="type.shop.farm">Magasin d\'alimentation à la ferme</string>
 	<string name="type.shop.florist">Fleuriste</string>
 	<string name="type.shop.funeral_directors">Pompes funèbres</string>
 	<string name="type.shop.furniture">Magasin de meubles</string>
 	<string name="type.shop.garden_centre">Jardinerie</string>
 	<string name="type.shop.gift">Boutique de souvenirs</string>
 	<string name="type.shop.greengrocer">Primeur</string>
+	<string name="type.shop.grocery">Épicerie</string>
 	<string name="type.shop.hairdresser">Coiffeur</string>
 	<string name="type.shop.hardware">Quincaillerie</string>
+	<string name="type.shop.health_food">Magasin d\'alimentation diététique</string>
+	<string name="type.shop.houseware">Magasin d\'articles ménagers</string>
 	<string name="type.shop.jewelry">Bijouterie</string>
 	<string name="type.shop.kiosk">Kiosque</string>
+	<string name="type.shop.kitchen">Magasin de cuisine</string>
 	<string name="type.shop.laundry">Laverie</string>
 	<string name="type.shop.mall">Centre commercial</string>
 	<string name="type.shop.massage">Salon de massage</string>
@@ -1436,10 +1442,12 @@
 	<string name="type.shop.newsagent">Kiosque à journaux</string>
 	<string name="type.shop.optician">Opticien</string>
 	<string name="type.shop.outdoor">Matériel de loisirs de plein air</string>
+	<string name="type.shop.pastry">Pâtisserie</string>
 	<string name="type.shop.pawnbroker">Prêteur sur gages</string>
 	<string name="type.shop.pet">Animalerie</string>
 	<string name="type.shop.photo">Matériel de photographie</string>
 	<string name="type.shop.seafood">Poissonnier</string>
+	<string name="type.shop.second_hand">Boutique d\'objets d\'occasion</string>
 	<string name="type.shop.shoes">Magasin de chaussures</string>
 	<string name="type.shop.sports">Articles de sport</string>
 	<string name="type.shop.stationery">Papeterie</string>
@@ -1454,6 +1462,29 @@
 	<string name="type.shop.video">Boutique de vidéos</string>
 	<string name="type.shop.video_games">Boutique de jeux vidéo</string>
 	<string name="type.shop.wine">Caviste</string>
+	<string name="type.shop.antiques">Antiquités</string>
+	<string name="type.shop.art">Boutique d\'art</string>
+	<string name="type.shop.baby_goods">Magasin pour enfants</string>
+	<string name="type.shop.bag">Magasin de sacs</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Magasin de charité</string>
+	<string name="type.shop.cheese">Fromagerie</string>
+	<string name="type.shop.craft">L\'artisanat</string>
+	<string name="type.shop.dairy">Les produits laitiers</string>
+	<string name="type.shop.electrical">Store électrique</string>
+	<string name="type.shop.fishing">Magasin de pêche</string>
+	<string name="type.shop.interior_decoration">Décorations intérieures</string>
+	<string name="type.shop.lottery">Tickets de loterie</string>
+	<string name="type.shop.medical_supply">Materiel médical</string>
+	<string name="type.shop.nutrition_supplements">Suppléments nutritionnels</string>
+	<string name="type.shop.paint">Des peintures</string>
+	<string name="type.shop.perfumery">Parfumerie</string>
+	<string name="type.shop.sewing">Matériel de couture</string>
+	<string name="type.shop.storage_rental">Location de stockage</string>
+	<string name="type.shop.tobacco">Le tabac</string>
+	<string name="type.shop.trade">Fournitures de métiers</string>
+	<string name="type.shop.watches">Montres</string>
+	<string name="type.shop.wholesale">Magasin de gros</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Football américain</string>
 	<string name="type.sport.archery">Tir à l\'arc</string>

android/res/values-hu/strings.xml

@@ -1246,22 +1246,28 @@
 	<string name="type.shop.convenience">Csemegebolt</string>
 	<string name="type.shop.copyshop">Fénymásoló üzlet</string>
 	<string name="type.shop.cosmetics">Kozmetikum</string>
+	<string name="type.shop.deli">Csemegebolt</string>
 	<string name="type.shop.department_store">Áruház</string>
 	<string name="type.shop.doityourself">Vaskereskedés</string>
 	<string name="type.shop.dry_cleaning">Ruhatisztító</string>
 	<string name="type.shop.electronics">Elektronika</string>
 	<string name="type.shop.erotic">Erotikus bolt</string>
 	<string name="type.shop.fabric">Bolt</string>
+	<string name="type.shop.farm">Farm Food Shop</string>
 	<string name="type.shop.florist">Virágos</string>
 	<string name="type.shop.funeral_directors">Temetkezési vállalkozó</string>
 	<string name="type.shop.furniture">Bútoráruház</string>
 	<string name="type.shop.garden_centre">Faiskola</string>
 	<string name="type.shop.gift">Ajándékbolt</string>
 	<string name="type.shop.greengrocer">Zöldséges</string>
+	<string name="type.shop.grocery">Élelmiszerbolt</string>
 	<string name="type.shop.hairdresser">Fodrász</string>
-	<string name="type.shop.hardware">Vaskereskedés</string>
+	<string name="type.shop.hardware">Hardver üzlet</string>
+	<string name="type.shop.health_food">Egészségügyi élelmiszerbolt</string>
+	<string name="type.shop.houseware">Háztartási bolt</string>
 	<string name="type.shop.jewelry">Ékszer</string>
 	<string name="type.shop.kiosk">Trafik</string>
+	<string name="type.shop.kitchen">Konyhabolt</string>
 	<string name="type.shop.laundry">Mosoda</string>
 	<string name="type.shop.mall">A pláza</string>
 	<string name="type.shop.massage">Masszázs szalon</string>
@@ -1273,10 +1279,12 @@
 	<string name="type.shop.newsagent">Újságárus</string>
 	<string name="type.shop.optician">Optika</string>
 	<string name="type.shop.outdoor">Kültéri felszerelés</string>
+	<string name="type.shop.pastry">Cukrászsütemény</string>
 	<string name="type.shop.pawnbroker">Zálogház</string>
 	<string name="type.shop.pet">Házikedvenc-üzlet</string>
 	<string name="type.shop.photo">Fénykép üzlet</string>
 	<string name="type.shop.seafood">Halüzlet</string>
+	<string name="type.shop.second_hand">Second Hand Store</string>
 	<string name="type.shop.shoes">Cipőbolt</string>
 	<string name="type.shop.sports">Sporteszközök</string>
 	<string name="type.shop.stationery">Írószer bolt</string>
@@ -1291,6 +1299,29 @@
 	<string name="type.shop.video">Videotéka</string>
 	<string name="type.shop.video_games">Videojáték bolt</string>
 	<string name="type.shop.wine">Szeszesital-üzlet</string>
+	<string name="type.shop.antiques">Régiségek</string>
+	<string name="type.shop.art">Művészeti Bolt</string>
+	<string name="type.shop.baby_goods">Gyermekbolt</string>
+	<string name="type.shop.bag">Táskák bolt</string>
+	<string name="type.shop.boutique">Butik</string>
+	<string name="type.shop.charity">Jótékonysági Bolt</string>
+	<string name="type.shop.cheese">Sajtbolt</string>
+	<string name="type.shop.craft">Művészetek és kézművesség</string>
+	<string name="type.shop.dairy">Tejtermékek</string>
+	<string name="type.shop.electrical">Elektronikai üzlet</string>
+	<string name="type.shop.fishing">Horgászbolt</string>
+	<string name="type.shop.interior_decoration">Belső dekorációk</string>
+	<string name="type.shop.lottery">Sorsjegyek</string>
+	<string name="type.shop.medical_supply">Orvosi eszközök</string>
+	<string name="type.shop.nutrition_supplements">Táplálékkiegészítők</string>
+	<string name="type.shop.paint">Festékek</string>
+	<string name="type.shop.perfumery">Illatszerek</string>
+	<string name="type.shop.sewing">Varrás kellékek</string>
+	<string name="type.shop.storage_rental">Tárhely bérlés</string>
+	<string name="type.shop.tobacco">Dohány</string>
+	<string name="type.shop.trade">Kellékekkel kereskedik</string>
+	<string name="type.shop.watches">Órák</string>
+	<string name="type.shop.wholesale">Nagykereskedelmi üzlet</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Amerikai foci</string>
 	<string name="type.sport.archery">Íjászat</string>

android/res/values-in/strings.xml

@@ -1239,22 +1239,28 @@
 	<string name="type.shop.convenience">Mini market</string>
 	<string name="type.shop.copyshop">Fotokopi</string>
 	<string name="type.shop.cosmetics">Kosmetik</string>
+	<string name="type.shop.deli">Toko Kue</string>
 	<string name="type.shop.department_store">Toko serba ada</string>
 	<string name="type.shop.doityourself">Toko perangkat keras</string>
 	<string name="type.shop.dry_cleaning">Cuci Kering</string>
 	<string name="type.shop.electronics">Elektronik</string>
 	<string name="type.shop.erotic">Toko Erotik</string>
 	<string name="type.shop.fabric">Toko</string>
+	<string name="type.shop.farm">Toko Makanan Pertanian</string>
 	<string name="type.shop.florist">Tukang bunga</string>
 	<string name="type.shop.funeral_directors">Direktur Pemakaman</string>
 	<string name="type.shop.furniture">Toko mebel</string>
 	<string name="type.shop.garden_centre">Penitipan anak</string>
 	<string name="type.shop.gift">Toko hadiah</string>
 	<string name="type.shop.greengrocer">Penjual sayuran</string>
+	<string name="type.shop.grocery">Kebutuhan sehari-hari</string>
 	<string name="type.shop.hairdresser">Penata rambut</string>
 	<string name="type.shop.hardware">Toko perangkat keras</string>
+	<string name="type.shop.health_food">Toko Makanan Kesehatan</string>
+	<string name="type.shop.houseware">Toko Peralatan Rumah Tangga</string>
 	<string name="type.shop.jewelry">Perhiasan</string>
 	<string name="type.shop.kiosk">Toko</string>
+	<string name="type.shop.kitchen">Toko Dapur</string>
 	<string name="type.shop.laundry">Londri</string>
 	<string name="type.shop.massage">Tempat Pijat</string>
 	<string name="type.shop.mobile_phone">Toko telepon</string>
@@ -1265,10 +1271,12 @@
 	<string name="type.shop.newsagent">Kios Surat Kabar</string>
 	<string name="type.shop.optician">Toko kacamata</string>
 	<string name="type.shop.outdoor">Peralatan Outdoor</string>
+	<string name="type.shop.pastry">Kue-kue</string>
 	<string name="type.shop.pawnbroker">Rumah Gadai</string>
 	<string name="type.shop.pet">Toko hewan</string>
 	<string name="type.shop.photo">Studio Foto</string>
 	<string name="type.shop.seafood">Penjual Ikan</string>
+	<string name="type.shop.second_hand">Toko Barang bekas</string>
 	<string name="type.shop.shoes">Toko sepatu</string>
 	<string name="type.shop.sports">Barang olahraga</string>
 	<string name="type.shop.stationery">Toko Alat Tulis</string>
@@ -1282,6 +1290,29 @@
 	<string name="type.shop.video">Toko video</string>
 	<string name="type.shop.video_games">Toko permainan video</string>
 	<string name="type.shop.wine">Toko anggur</string>
+	<string name="type.shop.antiques">Barang antik</string>
+	<string name="type.shop.art">Toko Seni</string>
+	<string name="type.shop.baby_goods">Toko anak-anak</string>
+	<string name="type.shop.bag">Toko Tas</string>
+	<string name="type.shop.boutique">Butik</string>
+	<string name="type.shop.charity">Toko Amal</string>
+	<string name="type.shop.cheese">Toko Keju</string>
+	<string name="type.shop.craft">Seni dan kerajinan</string>
+	<string name="type.shop.dairy">Produk susu</string>
+	<string name="type.shop.electrical">Toko elektronik</string>
+	<string name="type.shop.fishing">Toko Memancing</string>
+	<string name="type.shop.interior_decoration">Dekorasi Interior</string>
+	<string name="type.shop.lottery">Tiket Lotere</string>
+	<string name="type.shop.medical_supply">Suplai medis</string>
+	<string name="type.shop.nutrition_supplements">Suplemen Nutrisi</string>
+	<string name="type.shop.paint">Cat</string>
+	<string name="type.shop.perfumery">Wewangian</string>
+	<string name="type.shop.sewing">Perlengkapan Jahit</string>
+	<string name="type.shop.storage_rental">Sewa Penyimpanan</string>
+	<string name="type.shop.tobacco">Tembakau</string>
+	<string name="type.shop.trade">Perlengkapan Perdagangan</string>
+	<string name="type.shop.watches">Jam tangan</string>
+	<string name="type.shop.wholesale">Toko Grosir</string>
 	<string name="type.sport">Olahraga</string>
 	<string name="type.sport.american_football">Sepak Bola Amerika</string>
 	<string name="type.sport.archery">Panahan</string>

android/res/values-it/strings.xml

@@ -1282,22 +1282,28 @@
 	<string name="type.shop.convenience">Minimarket</string>
 	<string name="type.shop.copyshop">Copisteria</string>
 	<string name="type.shop.cosmetics">Cosmetici</string>
+	<string name="type.shop.deli">Negozio di specialità gastronomiche</string>
 	<string name="type.shop.department_store">Grandi magazzini</string>
 	<string name="type.shop.doityourself">Ferramenta</string>
 	<string name="type.shop.dry_cleaning">Lavaggio a secco</string>
 	<string name="type.shop.electronics">Negozio di elettronica</string>
 	<string name="type.shop.erotic">Sexy Shop</string>
 	<string name="type.shop.fabric">Negozio</string>
+	<string name="type.shop.farm">Negozio di prodotti alimentari della fattoria</string>
 	<string name="type.shop.florist">Fiorista</string>
 	<string name="type.shop.funeral_directors">Pompe funebri</string>
 	<string name="type.shop.furniture">Negozio di mobili</string>
 	<string name="type.shop.garden_centre">Vivaio</string>
 	<string name="type.shop.gift">Negozio di regali</string>
 	<string name="type.shop.greengrocer">Fruttivendolo</string>
+	<string name="type.shop.grocery">Drogheria</string>
 	<string name="type.shop.hairdresser">Parrucchiera</string>
-	<string name="type.shop.hardware">Ferramenta</string>
+	<string name="type.shop.hardware">Negozio hardware</string>
+	<string name="type.shop.health_food">Negozio di alimenti naturali</string>
+	<string name="type.shop.houseware">Negozio di casalinghi</string>
 	<string name="type.shop.jewelry">Gioielleria</string>
 	<string name="type.shop.kiosk">Chiosco</string>
+	<string name="type.shop.kitchen">Negozio di cucina</string>
 	<string name="type.shop.laundry">Lavanderia</string>
 	<string name="type.shop.mall">Il centro commerciale</string>
 	<string name="type.shop.massage">Centro massaggi</string>
@@ -1309,10 +1315,12 @@
 	<string name="type.shop.newsagent">Edicola</string>
 	<string name="type.shop.optician">Ottico</string>
 	<string name="type.shop.outdoor">Attrezzatura sportiva</string>
+	<string name="type.shop.pastry">Pasticcino</string>
 	<string name="type.shop.pawnbroker">Pegni</string>
 	<string name="type.shop.pet">Negozio di animali</string>
 	<string name="type.shop.photo">Negozio di fotografia</string>
 	<string name="type.shop.seafood">Pescivendolo</string>
+	<string name="type.shop.second_hand">Negozio di articoli usati</string>
 	<string name="type.shop.shoes">Negozio di scarpe</string>
 	<string name="type.shop.sports">Negozio sportivo</string>
 	<string name="type.shop.stationery">Cartoleria</string>
@@ -1327,6 +1335,29 @@
 	<string name="type.shop.video">Videoteca</string>
 	<string name="type.shop.video_games">Negozio di videogiochi</string>
 	<string name="type.shop.wine">Negozio di alcolici</string>
+	<string name="type.shop.antiques">Oggetti d\'antiquariato</string>
+	<string name="type.shop.art">Negozio d\'arte</string>
+	<string name="type.shop.baby_goods">Negozio per bambini</string>
+	<string name="type.shop.bag">Negozio di borse</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Negozio di beneficenza</string>
+	<string name="type.shop.cheese">Negozio di formaggi</string>
+	<string name="type.shop.craft">Arti e mestieri</string>
+	<string name="type.shop.dairy">Latticini</string>
+	<string name="type.shop.electrical">Negozio di articoli elettrici</string>
+	<string name="type.shop.fishing">Negozio di pesca</string>
+	<string name="type.shop.interior_decoration">Decorazioni per interni</string>
+	<string name="type.shop.lottery">Biglietti della lotteria</string>
+	<string name="type.shop.medical_supply">Forniture mediche</string>
+	<string name="type.shop.nutrition_supplements">Integratori Alimentari</string>
+	<string name="type.shop.paint">Vernici</string>
+	<string name="type.shop.perfumery">Profumeria</string>
+	<string name="type.shop.sewing">Forniture per il cucito</string>
+	<string name="type.shop.storage_rental">Noleggio deposito</string>
+	<string name="type.shop.tobacco">Tabacco</string>
+	<string name="type.shop.trade">Forniture commerciali</string>
+	<string name="type.shop.watches">Orologi</string>
+	<string name="type.shop.wholesale">Negozio all\'ingrosso</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Football americano</string>
 	<string name="type.sport.archery">Tiro con l\'arco</string>

android/res/values-iw/strings.xml

@@ -447,6 +447,38 @@
 	<string name="type.natural.wetland">ביצה</string>
 	<string name="type.natural.wetland.bog">ביצת כבול</string>
 	<string name="type.natural.wetland.marsh">ביצת עשב</string>
+	<string name="type.shop.deli">תוינדעמ תונח</string>
+	<string name="type.shop.farm">הווחל ןוזמ תונח</string>
+	<string name="type.shop.grocery">תלֶוֹכּמַ</string>
+	<string name="type.shop.hardware">ןיינב ירמוחל תונח</string>
+	<string name="type.shop.health_food">תואירב ןוזמ תונח</string>
+	<string name="type.shop.houseware">תיב ילכל תונח</string>
+	<string name="type.shop.kitchen">םיחבטמ תונח</string>
+	<string name="type.shop.pastry">הפאמ</string>
+	<string name="type.shop.second_hand">היינש די תונח</string>
+	<string name="type.shop.antiques">תוֹקיתִעַ</string>
+	<string name="type.shop.art">תויונמוא תונח</string>
+	<string name="type.shop.baby_goods">םידליל תונח</string>
+	<string name="type.shop.bag">םיקית תונח</string>
+	<string name="type.shop.boutique">קיטוב</string>
+	<string name="type.shop.charity">הקדצ תונח</string>
+	<string name="type.shop.cheese">תוניבג תונח</string>
+	<string name="type.shop.craft">הריציו תונמוא</string>
+	<string name="type.shop.dairy">בלח ירצומ</string>
+	<string name="type.shop.electrical">למשח תונח</string>
+	<string name="type.shop.fishing">גייד תונח</string>
+	<string name="type.shop.interior_decoration">םינפ יטושיק</string>
+	<string name="type.shop.lottery">הלרגה יסיטרכ</string>
+	<string name="type.shop.medical_supply">יאופר דויצ</string>
+	<string name="type.shop.nutrition_supplements">הנוזת יפסות</string>
+	<string name="type.shop.paint">םיעבצ</string>
+	<string name="type.shop.perfumery">תמַשְׂבָּ</string>
+	<string name="type.shop.sewing">הריפת דויצ</string>
+	<string name="type.shop.storage_rental">ןוסחא תרכשה</string>
+	<string name="type.shop.tobacco">קבָּטַ</string>
+	<string name="type.shop.trade">הקפסאב רחוס</string>
+	<string name="type.shop.watches">םינועש</string>
+	<string name="type.shop.wholesale">תיאנוטיס תונח</string>
 	<string name="type.sport">ספורט</string>
 	<string name="type.sport.american_football">כדורגל אמריקאי</string>
 	<string name="type.sport.archery">קַשׁתוּת</string>

android/res/values-ja/strings.xml

@@ -1389,22 +1389,28 @@
 	<string name="type.shop.convenience">コンビニエンスストア</string>
 	<string name="type.shop.copyshop">コピーショップ</string>
 	<string name="type.shop.cosmetics">化粧品</string>
+	<string name="type.shop.deli">デリカテッセンショップ</string>
 	<string name="type.shop.department_store">デパート</string>
 	<string name="type.shop.doityourself">工具店</string>
 	<string name="type.shop.dry_cleaning">クリーニング屋</string>
 	<string name="type.shop.electronics">電気店</string>
 	<string name="type.shop.erotic">アダルトショップ</string>
 	<string name="type.shop.fabric">生地屋</string>
+	<string name="type.shop.farm">ファームフードショップ</string>
 	<string name="type.shop.florist">フローリスト/花屋</string>
 	<string name="type.shop.funeral_directors">葬儀屋</string>
 	<string name="type.shop.furniture">家具店</string>
 	<string name="type.shop.garden_centre">ガーデンセンター</string>
 	<string name="type.shop.gift">ギフトショップ</string>
 	<string name="type.shop.greengrocer">八百屋</string>
+	<string name="type.shop.grocery">買い物</string>
 	<string name="type.shop.hairdresser">美容院/理容店</string>
-	<string name="type.shop.hardware">工具店</string>
+	<string name="type.shop.hardware">ホームセンター</string>
+	<string name="type.shop.health_food">健康食品店</string>
+	<string name="type.shop.houseware">家庭用品店</string>
 	<string name="type.shop.jewelry">宝石店</string>
 	<string name="type.shop.kiosk">キオスク</string>
+	<string name="type.shop.kitchen">キッチンストア</string>
 	<string name="type.shop.laundry">ランドリー</string>
 	<string name="type.shop.mall">モール</string>
 	<string name="type.shop.massage">マッサージ店</string>
@@ -1416,10 +1422,12 @@
 	<string name="type.shop.newsagent">新聞販売店</string>
 	<string name="type.shop.optician">眼鏡店</string>
 	<string name="type.shop.outdoor">アウトドア用品店</string>
+	<string name="type.shop.pastry">ペストリー</string>
 	<string name="type.shop.pawnbroker">質屋</string>
 	<string name="type.shop.pet">ペットショップ</string>
 	<string name="type.shop.photo">写真屋</string>
 	<string name="type.shop.seafood">魚屋</string>
+	<string name="type.shop.second_hand">古物商</string>
 	<string name="type.shop.shoes">靴屋</string>
 	<string name="type.shop.sports">スポーツ用品店</string>
 	<string name="type.shop.stationery">文房具店</string>
@@ -1434,6 +1442,29 @@
 	<string name="type.shop.video">ビデオショップ</string>
 	<string name="type.shop.video_games">ゲームショップ</string>
 	<string name="type.shop.wine">ワイン店</string>
+	<string name="type.shop.antiques">骨董品</string>
+	<string name="type.shop.art">アートショップ</string>
+	<string name="type.shop.baby_goods">キッズストア</string>
+	<string name="type.shop.bag">バッグストア</string>
+	<string name="type.shop.boutique">ブティック</string>
+	<string name="type.shop.charity">チャリティーショップ</string>
+	<string name="type.shop.cheese">チーズ店</string>
+	<string name="type.shop.craft">美術工芸</string>
+	<string name="type.shop.dairy">乳製品</string>
+	<string name="type.shop.electrical">電気店</string>
+	<string name="type.shop.fishing">フィッシングストア</string>
+	<string name="type.shop.interior_decoration">室内装飾</string>
+	<string name="type.shop.lottery">宝くじ</string>
+	<string name="type.shop.medical_supply">医療用品</string>
+	<string name="type.shop.nutrition_supplements">栄養補助食品</string>
+	<string name="type.shop.paint">塗料</string>
+	<string name="type.shop.perfumery">香水</string>
+	<string name="type.shop.sewing">ミシン用品</string>
+	<string name="type.shop.storage_rental">ストレージレンタル</string>
+	<string name="type.shop.tobacco">タバコ</string>
+	<string name="type.shop.trade">貿易用品</string>
+	<string name="type.shop.watches">時計</string>
+	<string name="type.shop.wholesale">問屋</string>
 	<string name="type.sport">スポーツ</string>
 	<string name="type.sport.american_football">アメリカンフットボール</string>
 	<string name="type.sport.archery">アーチェリー</string>

android/res/values-ko/strings.xml

@@ -1248,22 +1248,28 @@
 	<string name="type.shop.convenience">편의점</string>
 	<string name="type.shop.copyshop">복사가게</string>
 	<string name="type.shop.cosmetics">화장품</string>
+	<string name="type.shop.deli">델리카트슨 숍</string>
 	<string name="type.shop.department_store">백화점</string>
 	<string name="type.shop.doityourself">철물점</string>
 	<string name="type.shop.dry_cleaning">드라이 클리닝</string>
 	<string name="type.shop.electronics">전자제품</string>
 	<string name="type.shop.erotic">성인용품 가게</string>
 	<string name="type.shop.fabric">가게</string>
+	<string name="type.shop.farm">\"농장 식품 가게\"</string>
 	<string name="type.shop.florist">꽃가게</string>
 	<string name="type.shop.funeral_directors">장의사</string>
 	<string name="type.shop.furniture">가구 상점</string>
 	<string name="type.shop.garden_centre">식물 상점</string>
 	<string name="type.shop.gift">선물 가게</string>
 	<string name="type.shop.greengrocer">청과상</string>
+	<string name="type.shop.grocery">\"식료품점\"</string>
 	<string name="type.shop.hairdresser">이발사</string>
 	<string name="type.shop.hardware">철물점</string>
+	<string name="type.shop.health_food">\"건강식품 가게\"</string>
+	<string name="type.shop.houseware">\"가정용품 가게\"</string>
 	<string name="type.shop.jewelry">보석류</string>
 	<string name="type.shop.kiosk">정자</string>
+	<string name="type.shop.kitchen">\"주방용품점\"</string>
 	<string name="type.shop.laundry">세탁소</string>
 	<string name="type.shop.mall">몰</string>
 	<string name="type.shop.massage">마사지샵</string>
@@ -1275,10 +1281,12 @@
 	<string name="type.shop.newsagent">신문 가판대</string>
 	<string name="type.shop.optician">안경점 의</string>
 	<string name="type.shop.outdoor">아웃도어 장비</string>
+	<string name="type.shop.pastry">패스트리</string>
 	<string name="type.shop.pawnbroker">전당포</string>
 	<string name="type.shop.pet">펫샵</string>
 	<string name="type.shop.photo">사진 가게</string>
 	<string name="type.shop.seafood">생선가게</string>
+	<string name="type.shop.second_hand">중고 판매점</string>
 	<string name="type.shop.shoes">신발 가게</string>
 	<string name="type.shop.sports">스포츠 용품</string>
 	<string name="type.shop.stationery">문방구</string>
@@ -1293,6 +1301,29 @@
 	<string name="type.shop.video">비디오 가게</string>
 	<string name="type.shop.video_games">비디오 게임 가게</string>
 	<string name="type.shop.wine">와인 샵</string>
+	<string name="type.shop.antiques">고물</string>
+	<string name="type.shop.art">아트샵</string>
+	<string name="type.shop.baby_goods">어린이 가게</string>
+	<string name="type.shop.bag">가방 판매점</string>
+	<string name="type.shop.boutique">부티크</string>
+	<string name="type.shop.charity">자선 상점</string>
+	<string name="type.shop.cheese">치즈 가게</string>
+	<string name="type.shop.craft">예술과 공예</string>
+	<string name="type.shop.dairy">\"유제품\"</string>
+	<string name="type.shop.electrical">\"전기용품점\"</string>
+	<string name="type.shop.fishing">낚시점</string>
+	<string name="type.shop.interior_decoration">실내 장식</string>
+	<string name="type.shop.lottery">복권</string>
+	<string name="type.shop.medical_supply">\"의료용품\"</string>
+	<string name="type.shop.nutrition_supplements">영양 보조제</string>
+	<string name="type.shop.paint">그림 물감</string>
+	<string name="type.shop.perfumery">\"향료 제조업\"</string>
+	<string name="type.shop.sewing">\"재봉용품\"</string>
+	<string name="type.shop.storage_rental">스토리지 렌탈</string>
+	<string name="type.shop.tobacco">담배</string>
+	<string name="type.shop.trade">\"거래 용품\"</string>
+	<string name="type.shop.watches">시계</string>
+	<string name="type.shop.wholesale">도매점</string>
 	<string name="type.sport">스포츠</string>
 	<string name="type.sport.american_football">미식 축구</string>
 	<string name="type.sport.archery">양궁</string>

android/res/values-mr/strings.xml

@@ -1364,6 +1364,7 @@
 	<string name="type.shop.greengrocer">भाजीवाला</string>
 	<string name="type.shop.hairdresser">न्हावी</string>
 	<string name="type.shop.hardware">हार्डवेअर दुकान</string>
+	<string name="type.shop.houseware">हार्डवेअर दुकान</string>
 	<string name="type.shop.jewelry">दागिने</string>
 	<string name="type.shop.kiosk">टपरी</string>
 	<string name="type.shop.laundry">धुलाईघर</string>
@@ -1377,6 +1378,7 @@
 	<string name="type.shop.newsagent">वृत्तपत्र विक्री</string>
 	<string name="type.shop.optician">चष्मेविक्रेता</string>
 	<string name="type.shop.outdoor">भटकंतीचे साहित्य</string>
+	<string name="type.shop.pastry">बेकरी</string>
 	<string name="type.shop.pet">पाळीव प्राण्यांचे दुकान</string>
 	<string name="type.shop.photo">फोटोचे दुकान</string>
 	<string name="type.shop.seafood">मासळी उपहारगृह</string>

android/res/values-nb/strings.xml

@@ -1240,22 +1240,28 @@
 	<string name="type.shop.convenience">Nærbutikk</string>
 	<string name="type.shop.copyshop">Kopieringsbutikk</string>
 	<string name="type.shop.cosmetics">Kosmetikk</string>
+	<string name="type.shop.deli">Delikatessebutikk</string>
 	<string name="type.shop.department_store">Varehus</string>
 	<string name="type.shop.doityourself">Jernvareforretning</string>
 	<string name="type.shop.dry_cleaning">Renseri</string>
 	<string name="type.shop.electronics">Elektronikk forhandler</string>
 	<string name="type.shop.erotic">Erotisk butikk</string>
 	<string name="type.shop.fabric">Butikk</string>
+	<string name="type.shop.farm">Gårdsmatbutikk</string>
 	<string name="type.shop.florist">Blomsterhandler</string>
 	<string name="type.shop.funeral_directors">Begravelsebyrå</string>
 	<string name="type.shop.furniture">Møbelbutikk</string>
 	<string name="type.shop.garden_centre">Planteskole</string>
 	<string name="type.shop.gift">Gavebutikk</string>
 	<string name="type.shop.greengrocer">Frukt- og grønnsakshandler</string>
+	<string name="type.shop.grocery">Dagligvare</string>
 	<string name="type.shop.hairdresser">Frisør</string>
 	<string name="type.shop.hardware">Jernvareforretning</string>
+	<string name="type.shop.health_food">Helsekostbutikk</string>
+	<string name="type.shop.houseware">Husholdningsbutikk</string>
 	<string name="type.shop.jewelry">Gullsmed</string>
 	<string name="type.shop.kiosk">Butikk</string>
+	<string name="type.shop.kitchen">Kjøkkenbutikk</string>
 	<string name="type.shop.laundry">Vaskeri</string>
 	<string name="type.shop.mall">Kjøpesenteret</string>
 	<string name="type.shop.massage">Massasjesalong</string>
@@ -1267,10 +1273,12 @@
 	<string name="type.shop.newsagent">Aviskiosk</string>
 	<string name="type.shop.optician">Optiker</string>
 	<string name="type.shop.outdoor">Fritidsutstyr</string>
+	<string name="type.shop.pastry">Kake</string>
 	<string name="type.shop.pawnbroker">Pantelåner</string>
 	<string name="type.shop.pet">Dyrebutikk</string>
 	<string name="type.shop.photo">Fotobutikk</string>
 	<string name="type.shop.seafood">Fiskehandler</string>
+	<string name="type.shop.second_hand">Bruktbutikk</string>
 	<string name="type.shop.shoes">Skobutikk</string>
 	<string name="type.shop.sports">Sportsutstyr</string>
 	<string name="type.shop.stationery">Bokhandel</string>
@@ -1285,6 +1293,29 @@
 	<string name="type.shop.video">Videobutikken</string>
 	<string name="type.shop.video_games">Videospillbutikken</string>
 	<string name="type.shop.wine">Alkoholutsalg</string>
+	<string name="type.shop.antiques">Antikviteter</string>
+	<string name="type.shop.art">Kunstbutikk</string>
+	<string name="type.shop.baby_goods">Barnebutikk</string>
+	<string name="type.shop.bag">Veskerbutikk</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Veldedighetsbutikk</string>
+	<string name="type.shop.cheese">Ostebutikk</string>
+	<string name="type.shop.craft">Kunst og Håndverk</string>
+	<string name="type.shop.dairy">Meieriprodukter</string>
+	<string name="type.shop.electrical">Elektronisk butikk</string>
+	<string name="type.shop.fishing">Fiskebutikk</string>
+	<string name="type.shop.interior_decoration">Interiørdekorasjoner</string>
+	<string name="type.shop.lottery">Lotteribilletter</string>
+	<string name="type.shop.medical_supply">Medisinsk utstyr</string>
+	<string name="type.shop.nutrition_supplements">Kosttilskudd</string>
+	<string name="type.shop.paint">Maling</string>
+	<string name="type.shop.perfumery">Parfymeri</string>
+	<string name="type.shop.sewing">Syutstyr</string>
+	<string name="type.shop.storage_rental">Utleie av lager</string>
+	<string name="type.shop.tobacco">Tobakk</string>
+	<string name="type.shop.trade">Handler rekvisita</string>
+	<string name="type.shop.watches">Klokker</string>
+	<string name="type.shop.wholesale">Engrosbutikk</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Amerikansk fotball</string>
 	<string name="type.sport.archery">Bueskyting</string>

android/res/values-nl/strings.xml

@@ -1244,21 +1244,27 @@
 	<string name="type.shop.confectionery">Banketbakker</string>
 	<string name="type.shop.convenience">Buurtwinkel</string>
 	<string name="type.shop.cosmetics">Schoonheidsmiddelen</string>
+	<string name="type.shop.deli">Delicatessenwinkel</string>
 	<string name="type.shop.department_store">Warenhuis</string>
 	<string name="type.shop.doityourself">Ijzerhandel</string>
 	<string name="type.shop.dry_cleaning">Droogkuis</string>
 	<string name="type.shop.electronics">Elektronicazaak</string>
 	<string name="type.shop.erotic">Erotiekwinkel</string>
 	<string name="type.shop.fabric">Winkel</string>
+	<string name="type.shop.farm">Boerderijwinkel</string>
 	<string name="type.shop.florist">Bloemist</string>
 	<string name="type.shop.funeral_directors">Begrafenisondernemer</string>
 	<string name="type.shop.furniture">Meubelzaak</string>
 	<string name="type.shop.garden_centre">Tuincentrum</string>
 	<string name="type.shop.gift">Cadeauwinkel</string>
 	<string name="type.shop.greengrocer">Groentenwinkel</string>
+	<string name="type.shop.grocery">Boodschap</string>
 	<string name="type.shop.hairdresser">Kapper</string>
-	<string name="type.shop.hardware">Ijzerhandel</string>
+	<string name="type.shop.hardware">Ijzerwaren</string>
+	<string name="type.shop.health_food">Natuurvoedingswinkel</string>
+	<string name="type.shop.houseware">Huishoudelijke winkel</string>
 	<string name="type.shop.jewelry">Juwelier</string>
+	<string name="type.shop.kitchen">Keukenwinkel</string>
 	<string name="type.shop.laundry">Wasserette</string>
 	<string name="type.shop.mall">Het winkelcentrum</string>
 	<string name="type.shop.massage">Massagesalon</string>
@@ -1270,10 +1276,12 @@
 	<string name="type.shop.newsagent">Kiosk</string>
 	<string name="type.shop.optician">Opticien</string>
 	<string name="type.shop.outdoor">Outdooruitrusting</string>
+	<string name="type.shop.pastry">Gebakje</string>
 	<string name="type.shop.pawnbroker">Pandjesbaas</string>
 	<string name="type.shop.pet">Dierenwinkel</string>
 	<string name="type.shop.photo">Fotowinkel</string>
 	<string name="type.shop.seafood">Visboer</string>
+	<string name="type.shop.second_hand">Tweedehandswinkel</string>
 	<string name="type.shop.shoes">Schoenenwinkel</string>
 	<string name="type.shop.sports">Sportartikelen</string>
 	<string name="type.shop.stationery">Kantoorboekhandel</string>
@@ -1288,6 +1296,29 @@
 	<string name="type.shop.video">Videowinkel</string>
 	<string name="type.shop.video_games">Winkel voor videogames</string>
 	<string name="type.shop.wine">Wijn</string>
+	<string name="type.shop.antiques">Antiek</string>
+	<string name="type.shop.art">Kunstwinkel</string>
+	<string name="type.shop.baby_goods">Kinderwinkel</string>
+	<string name="type.shop.bag">Tassenwinkel</string>
+	<string name="type.shop.boutique">Boetiek</string>
+	<string name="type.shop.charity">Kringloopwinkel</string>
+	<string name="type.shop.cheese">Kaaswinkel</string>
+	<string name="type.shop.craft">Kunst en ambacht</string>
+	<string name="type.shop.dairy">Zuivelproducten</string>
+	<string name="type.shop.electrical">Witgoed winkel</string>
+	<string name="type.shop.fishing">Viswinkel</string>
+	<string name="type.shop.interior_decoration">Interieurdecoraties</string>
+	<string name="type.shop.lottery">Loten</string>
+	<string name="type.shop.medical_supply">Medische benodigdheden</string>
+	<string name="type.shop.nutrition_supplements">Voedingssupplementen</string>
+	<string name="type.shop.paint">Verven</string>
+	<string name="type.shop.perfumery">Parfumerie</string>
+	<string name="type.shop.sewing">Naaibenodigdheden</string>
+	<string name="type.shop.storage_rental">Opslag verhuur</string>
+	<string name="type.shop.tobacco">Tabak</string>
+	<string name="type.shop.trade">Handelsbenodigdheden</string>
+	<string name="type.shop.watches">Horloges</string>
+	<string name="type.shop.wholesale">Groothandel winkel</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Amerikaans voetbal</string>
 	<string name="type.sport.archery">Boogschieten</string>

android/res/values-pl/strings.xml

@@ -1369,21 +1369,27 @@
 	<string name="type.shop.convenience">Sklep spożywczy</string>
 	<string name="type.shop.copyshop">Punkt ksero</string>
 	<string name="type.shop.cosmetics">Kosmetyki</string>
+	<string name="type.shop.deli">Sklep delikatesowy</string>
 	<string name="type.shop.department_store">Dom towarowy</string>
 	<string name="type.shop.doityourself">Sklep narzędziowy</string>
 	<string name="type.shop.dry_cleaning">Pralnia chemiczna</string>
 	<string name="type.shop.electronics">Sklep ze sprzętem elektronicznym</string>
 	<string name="type.shop.erotic">Sex shop</string>
 	<string name="type.shop.fabric">Sklep</string>
+	<string name="type.shop.farm">Sklep spożywczy dla gospodarstw rolnych</string>
 	<string name="type.shop.florist">Kwiaciarnia</string>
 	<string name="type.shop.funeral_directors">Celebranci pogrzebowi</string>
 	<string name="type.shop.furniture">Sklep meblowy</string>
 	<string name="type.shop.garden_centre">Sklep ogrodniczy</string>
 	<string name="type.shop.gift">Sklep z pamiątkami</string>
 	<string name="type.shop.greengrocer">Warzywniak</string>
+	<string name="type.shop.grocery">Sklep spożywczy</string>
 	<string name="type.shop.hairdresser">Fryzjer</string>
-	<string name="type.shop.hardware">Sklep narzędziowy</string>
+	<string name="type.shop.hardware">Sklep z narzędziami</string>
+	<string name="type.shop.health_food">Sklep ze zdrową żywnością</string>
+	<string name="type.shop.houseware">Sklep AGD</string>
 	<string name="type.shop.jewelry">Jubiler</string>
+	<string name="type.shop.kitchen">Sklep kuchenny</string>
 	<string name="type.shop.laundry">Pralnia samoobsługowa</string>
 	<string name="type.shop.mall">Centrum handlowe</string>
 	<string name="type.shop.massage">Salon masażu</string>
@@ -1395,10 +1401,12 @@
 	<string name="type.shop.newsagent">Stoisko z prasą</string>
 	<string name="type.shop.optician">Sklep optyczny</string>
 	<string name="type.shop.outdoor">Sprzęt turystyczny</string>
+	<string name="type.shop.pastry">Ciasto</string>
 	<string name="type.shop.pawnbroker">Lombard</string>
 	<string name="type.shop.pet">Sklep zoologiczny</string>
 	<string name="type.shop.photo">Fotograf</string>
 	<string name="type.shop.seafood">Sklep rybny</string>
+	<string name="type.shop.second_hand">Sklep z używaną ręką</string>
 	<string name="type.shop.shoes">Sklep obuwniczy</string>
 	<string name="type.shop.sports">Sklep sportowy</string>
 	<string name="type.shop.stationery">Artykuły papiernicze</string>
@@ -1412,6 +1420,29 @@
 	<string name="type.shop.video">Wypożyczalnia wideo</string>
 	<string name="type.shop.video_games">Sklep z grami wideo</string>
 	<string name="type.shop.wine">Sklep monopolowy</string>
+	<string name="type.shop.antiques">Antyki</string>
+	<string name="type.shop.art">Sklep artystyczny</string>
+	<string name="type.shop.baby_goods">Sklep dla dzieci</string>
+	<string name="type.shop.bag">Sklep z torbami</string>
+	<string name="type.shop.boutique">Butik</string>
+	<string name="type.shop.charity">Sklep charytatywny</string>
+	<string name="type.shop.cheese">Sklep z serami</string>
+	<string name="type.shop.craft">Sztuka i rzemiosło</string>
+	<string name="type.shop.dairy">Nabiał</string>
+	<string name="type.shop.electrical">Sklep elektryczny</string>
+	<string name="type.shop.fishing">Sklep wędkarski</string>
+	<string name="type.shop.interior_decoration">Dekoracje wnętrz</string>
+	<string name="type.shop.lottery">Bilety na loterię</string>
+	<string name="type.shop.medical_supply">Produkty medyczne</string>
+	<string name="type.shop.nutrition_supplements">Suplementy diety</string>
+	<string name="type.shop.paint">Malatura</string>
+	<string name="type.shop.perfumery">Perfumeria</string>
+	<string name="type.shop.sewing">Przybory do szycia</string>
+	<string name="type.shop.storage_rental">Wynajem magazynu</string>
+	<string name="type.shop.tobacco">Tytoń</string>
+	<string name="type.shop.trade">Zaopatrzenie handlowe</string>
+	<string name="type.shop.watches">Zegarki</string>
+	<string name="type.shop.wholesale">Hurtownia</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Futbol amerykański</string>
 	<string name="type.sport.archery">Łucznictwo</string>

android/res/values-pt-rBR/strings.xml

@@ -1412,22 +1412,28 @@
 	<string name="type.shop.convenience">Loja de conveniência</string>
 	<string name="type.shop.copyshop">Copiadora</string>
 	<string name="type.shop.cosmetics">Loja de cosméticos</string>
+	<string name="type.shop.deli">Loja Delicatessen</string>
 	<string name="type.shop.department_store">Loja de departamentos</string>
 	<string name="type.shop.doityourself">Loja de ferramentas e materiais de bricolage</string>
 	<string name="type.shop.dry_cleaning">Lavagem a seco</string>
 	<string name="type.shop.electronics">Loja de eletrônicos</string>
 	<string name="type.shop.erotic">Loja de artigos eróticos</string>
 	<string name="type.shop.fabric">Loja de aviamentos</string>
+	<string name="type.shop.farm">Loja de alimentos agrícolas</string>
 	<string name="type.shop.florist">Florista</string>
 	<string name="type.shop.funeral_directors">Funerária</string>
 	<string name="type.shop.furniture">Loja de móveis</string>
 	<string name="type.shop.garden_centre">Loja de jardinagem ou viveiro</string>
 	<string name="type.shop.gift">Loja de presentes</string>
 	<string name="type.shop.greengrocer">Quitanda</string>
+	<string name="type.shop.grocery">Mercearia</string>
 	<string name="type.shop.hairdresser">Cabeleireiro(a)</string>
 	<string name="type.shop.hardware">Loja de ferragens</string>
+	<string name="type.shop.health_food">Loja de alimentos saudáveis</string>
+	<string name="type.shop.houseware">Loja de utilidades domésticas</string>
 	<string name="type.shop.jewelry">Joalheria</string>
 	<string name="type.shop.kiosk">Quiosque</string>
+	<string name="type.shop.kitchen">Loja de cozinha</string>
 	<string name="type.shop.laundry">Lavanderia</string>
 	<string name="type.shop.mall">Shopping center</string>
 	<string name="type.shop.massage">Salão de massagens</string>
@@ -1439,10 +1445,12 @@
 	<string name="type.shop.newsagent">Banca de jornais</string>
 	<string name="type.shop.optician">Ótica</string>
 	<string name="type.shop.outdoor">Artigos de atividades ao ar livre</string>
+	<string name="type.shop.pastry">Pastelaria</string>
 	<string name="type.shop.pawnbroker">Casa de penhores</string>
 	<string name="type.shop.pet">Loja de animais de estimação</string>
 	<string name="type.shop.photo">Loja de fotografia</string>
 	<string name="type.shop.seafood">Peixaria</string>
+	<string name="type.shop.second_hand">Loja de segunda mão</string>
 	<string name="type.shop.shoes">Sapataria</string>
 	<string name="type.shop.sports">Loga de artigos esportivos</string>
 	<string name="type.shop.stationery">Papelaria</string>
@@ -1457,6 +1465,29 @@
 	<string name="type.shop.video">Video locadora</string>
 	<string name="type.shop.video_games">Loja de jogos eletrônicos</string>
 	<string name="type.shop.wine">Loja de vinhos</string>
+	<string name="type.shop.antiques">Antiguidades</string>
+	<string name="type.shop.art">Loja de artes</string>
+	<string name="type.shop.baby_goods">Loja infantil</string>
+	<string name="type.shop.bag">Loja de bolsas</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Loja de caridade</string>
+	<string name="type.shop.cheese">Loja de queijos</string>
+	<string name="type.shop.craft">Artes e Ofícios</string>
+	<string name="type.shop.dairy">Lacticínios</string>
+	<string name="type.shop.electrical">Loja de materiais elétricos</string>
+	<string name="type.shop.fishing">Loja de pesca</string>
+	<string name="type.shop.interior_decoration">Decorações de Interiores</string>
+	<string name="type.shop.lottery">Bilhete de loteria</string>
+	<string name="type.shop.medical_supply">Suprimentos médicos</string>
+	<string name="type.shop.nutrition_supplements">Suplementos nutricionais</string>
+	<string name="type.shop.paint">Tintas</string>
+	<string name="type.shop.perfumery">Perfumaria</string>
+	<string name="type.shop.sewing">Materiais de costura</string>
+	<string name="type.shop.storage_rental">Aluguel de Armazenamento</string>
+	<string name="type.shop.tobacco">Tabaco</string>
+	<string name="type.shop.trade">Comércio de suprimentos</string>
+	<string name="type.shop.watches">Relógios</string>
+	<string name="type.shop.wholesale">Loja de atacado</string>
 	<string name="type.sport">Esporte</string>
 	<string name="type.sport.american_football">Futebol americano</string>
 	<string name="type.sport.archery">Tiro com arco</string>

android/res/values-pt/strings.xml

@@ -1426,22 +1426,28 @@
 	<string name="type.shop.convenience">Loja de conveniência</string>
 	<string name="type.shop.copyshop">Loja de cópias e impressão</string>
 	<string name="type.shop.cosmetics">Loja de cosméticos</string>
+	<string name="type.shop.deli">Loja Delicatessen</string>
 	<string name="type.shop.department_store">Grande armazém</string>
 	<string name="type.shop.doityourself">Loja de ferramentas e materiais de bricolage</string>
 	<string name="type.shop.dry_cleaning">Lavagem a seco</string>
 	<string name="type.shop.electronics">Loja de eletrónica de consumo</string>
 	<string name="type.shop.erotic">Loja de artigos eróticos</string>
 	<string name="type.shop.fabric">Loja de tecidos</string>
+	<string name="type.shop.farm">Loja de comida agrícola</string>
 	<string name="type.shop.florist">Florista</string>
 	<string name="type.shop.funeral_directors">Funerária</string>
 	<string name="type.shop.furniture">Loja de móveis</string>
 	<string name="type.shop.garden_centre">Loja de jardinagem ou viveiro</string>
 	<string name="type.shop.gift">Loja de lembranças</string>
 	<string name="type.shop.greengrocer">Loja de frutas e verduras</string>
+	<string name="type.shop.grocery">Mercearia</string>
 	<string name="type.shop.hairdresser">Cabeleireiro(a)</string>
 	<string name="type.shop.hardware">Loja de ferragens</string>
+	<string name="type.shop.health_food">Loja de alimentos saudáveis</string>
+	<string name="type.shop.houseware">Loja de utilidades domésticas</string>
 	<string name="type.shop.jewelry">Joalharia</string>
 	<string name="type.shop.kiosk">Quiosque</string>
+	<string name="type.shop.kitchen">Loja de cozinha</string>
 	<string name="type.shop.laundry">Lavandaria</string>
 	<string name="type.shop.mall">Centro comercial</string>
 	<string name="type.shop.massage">Salão de massagens</string>
@@ -1453,10 +1459,12 @@
 	<string name="type.shop.newsagent">Banca de jornais</string>
 	<string name="type.shop.optician">Ótica</string>
 	<string name="type.shop.outdoor">Artigos de atividades ao ar livre</string>
+	<string name="type.shop.pastry">Pastelaria</string>
 	<string name="type.shop.pawnbroker">Casa de penhores</string>
 	<string name="type.shop.pet">Loja de animais de estimação</string>
 	<string name="type.shop.photo">Loja de fotografia</string>
 	<string name="type.shop.seafood">Peixaria</string>
+	<string name="type.shop.second_hand">Loja de segunda mão</string>
 	<string name="type.shop.shoes">Sapataria</string>
 	<string name="type.shop.sports">Loga de artigos desportivos</string>
 	<string name="type.shop.stationery">Papelaria</string>
@@ -1471,6 +1479,29 @@
 	<string name="type.shop.video">Vídeoclube</string>
 	<string name="type.shop.video_games">Loja de jogos de vídeo</string>
 	<string name="type.shop.wine">Loja de vinhos</string>
+	<string name="type.shop.antiques">Antiguidades</string>
+	<string name="type.shop.art">Loja de artes</string>
+	<string name="type.shop.baby_goods">Loja infantil</string>
+	<string name="type.shop.bag">Loja de bolsas</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Loja de caridade</string>
+	<string name="type.shop.cheese">Loja de queijos</string>
+	<string name="type.shop.craft">Artes e Ofícios</string>
+	<string name="type.shop.dairy">Lacticínios</string>
+	<string name="type.shop.electrical">Loja de materiais elétricos</string>
+	<string name="type.shop.fishing">Loja de pesca</string>
+	<string name="type.shop.interior_decoration">Decorações de Interiores</string>
+	<string name="type.shop.lottery">Bilhete de loteria</string>
+	<string name="type.shop.medical_supply">Suprimentos médicos</string>
+	<string name="type.shop.nutrition_supplements">Suplementos nutricionais</string>
+	<string name="type.shop.paint">Tintas</string>
+	<string name="type.shop.perfumery">Perfumaria</string>
+	<string name="type.shop.sewing">Materiais de costura</string>
+	<string name="type.shop.storage_rental">Aluguel de Armazenamento</string>
+	<string name="type.shop.tobacco">Tabaco</string>
+	<string name="type.shop.trade">Comércio de suprimentos</string>
+	<string name="type.shop.watches">Relógios</string>
+	<string name="type.shop.wholesale">Loja de atacado</string>
 	<string name="type.sport">Desporto</string>
 	<string name="type.sport.american_football">Futebol Americano</string>
 	<string name="type.sport.archery">Tiro com arco</string>

android/res/values-ro/strings.xml

@@ -1263,22 +1263,28 @@
 	<string name="type.shop.convenience">Magazin mixt</string>
 	<string name="type.shop.copyshop">Centru copiere</string>
 	<string name="type.shop.cosmetics">Cosmetică</string>
+	<string name="type.shop.deli">Magazin de delicatese</string>
 	<string name="type.shop.department_store">Magazin universal</string>
 	<string name="type.shop.doityourself">Magazin de bricolaj</string>
 	<string name="type.shop.dry_cleaning">Curățătorie chimică</string>
 	<string name="type.shop.electronics">Electronice</string>
 	<string name="type.shop.erotic">Magazin erotic</string>
 	<string name="type.shop.fabric">Magazin</string>
+	<string name="type.shop.farm">Magazin alimentar la fermă</string>
 	<string name="type.shop.florist">Florărie</string>
 	<string name="type.shop.funeral_directors">Pompe funebre</string>
 	<string name="type.shop.furniture">Magazin de mobilă</string>
 	<string name="type.shop.garden_centre">Pepinieră</string>
 	<string name="type.shop.gift">Magazin de suveniruri</string>
 	<string name="type.shop.greengrocer">Băcănie</string>
+	<string name="type.shop.grocery">Băcănie</string>
 	<string name="type.shop.hairdresser">Coafor</string>
-	<string name="type.shop.hardware">Magazin de bricolaj</string>
+	<string name="type.shop.hardware">Magazin de hardware</string>
+	<string name="type.shop.health_food">Magazin de alimente naturiste</string>
+	<string name="type.shop.houseware">Magazin de articole de uz casnic</string>
 	<string name="type.shop.jewelry">Bijutier</string>
 	<string name="type.shop.kiosk">Magazin</string>
+	<string name="type.shop.kitchen">Magazin de bucatarie</string>
 	<string name="type.shop.laundry">Spălătorie</string>
 	<string name="type.shop.mall">Mall</string>
 	<string name="type.shop.massage">Salon de masaj</string>
@@ -1290,10 +1296,12 @@
 	<string name="type.shop.newsagent">Chioșc cu ziare</string>
 	<string name="type.shop.optician">Optică</string>
 	<string name="type.shop.outdoor">Echipament de exterior</string>
+	<string name="type.shop.pastry">Patiserie</string>
 	<string name="type.shop.pawnbroker">Amanet</string>
 	<string name="type.shop.pet">Pet shop</string>
 	<string name="type.shop.photo">Centru fotografii</string>
 	<string name="type.shop.seafood">Pescărie</string>
+	<string name="type.shop.second_hand">Magazin second-hand</string>
 	<string name="type.shop.shoes">Magazin de încălțăminte</string>
 	<string name="type.shop.sports">Articole sportive</string>
 	<string name="type.shop.stationery">Magazin de papetărie</string>
@@ -1307,6 +1315,29 @@
 	<string name="type.shop.video">Magazin video</string>
 	<string name="type.shop.video_games">Magazin de jocuri video</string>
 	<string name="type.shop.wine">Vinărie</string>
+	<string name="type.shop.antiques">Antichități</string>
+	<string name="type.shop.art">Magazin de arte</string>
+	<string name="type.shop.baby_goods">Magazin pentru copii</string>
+	<string name="type.shop.bag">Magazin de genti</string>
+	<string name="type.shop.boutique">Butic</string>
+	<string name="type.shop.charity">Magazin de caritate</string>
+	<string name="type.shop.cheese">Magazin de branzeturi</string>
+	<string name="type.shop.craft">Arte și Meserii</string>
+	<string name="type.shop.dairy">Lactate</string>
+	<string name="type.shop.electrical">Magazin de electronice</string>
+	<string name="type.shop.fishing">Magazin de pescuit</string>
+	<string name="type.shop.interior_decoration">Decoratiuni interioare</string>
+	<string name="type.shop.lottery">Bilete la loterie</string>
+	<string name="type.shop.medical_supply">Consumabile medicale</string>
+	<string name="type.shop.nutrition_supplements">Suplimente nutritive</string>
+	<string name="type.shop.paint">Vopsele</string>
+	<string name="type.shop.perfumery">Parfumerie</string>
+	<string name="type.shop.sewing">Rechizite de cusut</string>
+	<string name="type.shop.storage_rental">Închiriere depozitare</string>
+	<string name="type.shop.tobacco">Tutun</string>
+	<string name="type.shop.trade">Comerțuri Rechizite</string>
+	<string name="type.shop.watches">Priveste</string>
+	<string name="type.shop.wholesale">Magazin cu ridicata</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Fotbal american</string>
 	<string name="type.sport.archery">TIR cu arcul</string>

android/res/values-ru/strings.xml

@@ -1508,22 +1508,28 @@
 	<string name="type.shop.convenience">Продуктовый магазин</string>
 	<string name="type.shop.copyshop">Копировальный центр</string>
 	<string name="type.shop.cosmetics">Косметика</string>
+	<string name="type.shop.deli">Магазин деликатесов</string>
 	<string name="type.shop.department_store">Универмаг</string>
 	<string name="type.shop.doityourself">Хозяйственный</string>
 	<string name="type.shop.dry_cleaning">Химчистка</string>
 	<string name="type.shop.electronics">Электротехника</string>
 	<string name="type.shop.erotic">Секс-шоп</string>
 	<string name="type.shop.fabric">Магазин</string>
+	<string name="type.shop.farm">Фермерский магазин</string>
 	<string name="type.shop.florist">Цветочный магазин</string>
 	<string name="type.shop.funeral_directors">Ритуальные услуги</string>
 	<string name="type.shop.furniture">Магазин мебели</string>
 	<string name="type.shop.garden_centre">Садовые товары</string>
 	<string name="type.shop.gift">Магазин сувениров</string>
 	<string name="type.shop.greengrocer">Овощи и фрукты</string>
+	<string name="type.shop.grocery">Бакалея</string>
 	<string name="type.shop.hairdresser">Парикмахерская</string>
-	<string name="type.shop.hardware">Хозяйственный</string>
+	<string name="type.shop.hardware">Хозяйственный магазин</string>
+	<string name="type.shop.health_food">Магазин здоровой еды</string>
+	<string name="type.shop.houseware">Магазин посуды</string>
 	<string name="type.shop.jewelry">Ювелирный магазин</string>
 	<string name="type.shop.kiosk">Киоск</string>
+	<string name="type.shop.kitchen">Кухонный магазин</string>
 	<string name="type.shop.laundry">Прачечная</string>
 	<string name="type.shop.mall">Торговый центр</string>
 	<string name="type.shop.massage">Массажный салон</string>
@@ -1535,10 +1541,12 @@
 	<string name="type.shop.newsagent">Газетный киоск</string>
 	<string name="type.shop.optician">Оптика</string>
 	<string name="type.shop.outdoor">Магазин снаряжения</string>
+	<string name="type.shop.pastry">Выпечка</string>
 	<string name="type.shop.pawnbroker">Ломбард</string>
 	<string name="type.shop.pet">Зоотовары</string>
 	<string name="type.shop.photo">Фототовары</string>
 	<string name="type.shop.seafood">Рыбный магазин</string>
+	<string name="type.shop.second_hand">Секонд-хенд магазин</string>
 	<string name="type.shop.shoes">Магазин обуви</string>
 	<string name="type.shop.sports">Магазин спорттоваров</string>
 	<string name="type.shop.stationery">Канцелярский магазин</string>
@@ -1553,6 +1561,29 @@
 	<string name="type.shop.video">Магазин видео</string>
 	<string name="type.shop.video_games">Магазин видеоигр</string>
 	<string name="type.shop.wine">Винный магазин</string>
+	<string name="type.shop.antiques">Антиквариат</string>
+	<string name="type.shop.art">Художественный магазин</string>
+	<string name="type.shop.baby_goods">Детский магазин</string>
+	<string name="type.shop.bag">Магазин сумок</string>
+	<string name="type.shop.boutique">Бутик</string>
+	<string name="type.shop.charity">Благотворительный магазин</string>
+	<string name="type.shop.cheese">Магазин сыра</string>
+	<string name="type.shop.craft">Искусства и ремесла</string>
+	<string name="type.shop.dairy">Молочные продукты</string>
+	<string name="type.shop.electrical">Магазин электротоваров</string>
+	<string name="type.shop.fishing">Рыболовный магазин</string>
+	<string name="type.shop.interior_decoration">Украшения для интерьера</string>
+	<string name="type.shop.lottery">Лотерейные билеты</string>
+	<string name="type.shop.medical_supply">Медикаменты</string>
+	<string name="type.shop.nutrition_supplements">Пищевые добавки</string>
+	<string name="type.shop.paint">Краски</string>
+	<string name="type.shop.perfumery">Парфюмерия</string>
+	<string name="type.shop.sewing">Швейные принадлежности</string>
+	<string name="type.shop.storage_rental">Аренда склада</string>
+	<string name="type.shop.tobacco">Табак</string>
+	<string name="type.shop.trade">Торговые поставки</string>
+	<string name="type.shop.watches">Часы</string>
+	<string name="type.shop.wholesale">Оптовый магазин</string>
 	<string name="type.sport">Спорт</string>
 	<string name="type.sport.american_football">Американский футбол</string>
 	<string name="type.sport.archery">Стрельба из лука</string>

android/res/values-sk/strings.xml

@@ -1244,21 +1244,27 @@
 	<string name="type.shop.convenience">Príležitostné potreby</string>
 	<string name="type.shop.copyshop">Kopírovacie služby</string>
 	<string name="type.shop.cosmetics">Kozmetika</string>
+	<string name="type.shop.deli">Predajňa lahôdok</string>
 	<string name="type.shop.department_store">Obchodný dom</string>
 	<string name="type.shop.doityourself">Železiarstvo</string>
 	<string name="type.shop.dry_cleaning">Čistiareň</string>
 	<string name="type.shop.electronics">Elektronika</string>
 	<string name="type.shop.erotic">Erotický obchod</string>
 	<string name="type.shop.fabric">Obchod</string>
+	<string name="type.shop.farm">Obchod s farmárskymi potravinami</string>
 	<string name="type.shop.florist">Kvety</string>
 	<string name="type.shop.funeral_directors">Pohrebníctvo</string>
 	<string name="type.shop.furniture">Nábytok</string>
 	<string name="type.shop.garden_centre">Škôlka</string>
 	<string name="type.shop.gift">Darčeky</string>
 	<string name="type.shop.greengrocer">Zelovoc</string>
+	<string name="type.shop.grocery">Potraviny</string>
 	<string name="type.shop.hairdresser">Kaderníctvo</string>
 	<string name="type.shop.hardware">Železiarstvo</string>
+	<string name="type.shop.health_food">Obchod so zdravou výživou</string>
+	<string name="type.shop.houseware">Obchod s domácimi potrebami</string>
 	<string name="type.shop.jewelry">Klenotníctvo</string>
+	<string name="type.shop.kitchen">Kuchynský obchod</string>
 	<string name="type.shop.laundry">Práčovňa</string>
 	<string name="type.shop.mall">The Mall</string>
 	<string name="type.shop.massage">Masážny salón</string>
@@ -1270,10 +1276,12 @@
 	<string name="type.shop.newsagent">Novinový stánok</string>
 	<string name="type.shop.optician">Optika</string>
 	<string name="type.shop.outdoor">Outdoorové vybavenie</string>
+	<string name="type.shop.pastry">Pečivo</string>
 	<string name="type.shop.pawnbroker">Záložňa</string>
 	<string name="type.shop.pet">Obchod zo zvieratami</string>
 	<string name="type.shop.photo">Fotografické služby</string>
 	<string name="type.shop.seafood">Obchodník s rybami</string>
+	<string name="type.shop.second_hand">Obchod z druhej ruky</string>
 	<string name="type.shop.shoes">Obuvníctvo</string>
 	<string name="type.shop.sports">Športové potreby</string>
 	<string name="type.shop.stationery">Papiernictvo</string>
@@ -1287,6 +1295,29 @@
 	<string name="type.shop.video">Predajňa s videami</string>
 	<string name="type.shop.video_games">Predajňa s videohrami</string>
 	<string name="type.shop.wine">Vinotéka</string>
+	<string name="type.shop.antiques">Starožitnosti</string>
+	<string name="type.shop.art">Obchod s umením</string>
+	<string name="type.shop.baby_goods">Obchod pre deti</string>
+	<string name="type.shop.bag">Obchod s taškami</string>
+	<string name="type.shop.boutique">Butik</string>
+	<string name="type.shop.charity">Charitatívny obchod</string>
+	<string name="type.shop.cheese">Predajňa syrov</string>
+	<string name="type.shop.craft">Umenie a remeslá</string>
+	<string name="type.shop.dairy">Mliečne výrobky</string>
+	<string name="type.shop.electrical">Predajňa elektro</string>
+	<string name="type.shop.fishing">Rybársky obchod</string>
+	<string name="type.shop.interior_decoration">Interiérové dekorácie</string>
+	<string name="type.shop.lottery">Lístky do lotérie</string>
+	<string name="type.shop.medical_supply">Zdravotnícky materiál</string>
+	<string name="type.shop.nutrition_supplements">Výživové doplnky</string>
+	<string name="type.shop.paint">Farby</string>
+	<string name="type.shop.perfumery">Parfuméria</string>
+	<string name="type.shop.sewing">Šijacie potreby</string>
+	<string name="type.shop.storage_rental">Prenájom skladu</string>
+	<string name="type.shop.tobacco">Tabak</string>
+	<string name="type.shop.trade">Živnostenské potreby</string>
+	<string name="type.shop.watches">Hodinky</string>
+	<string name="type.shop.wholesale">Veľkoobchod</string>
 	<string name="type.sport">Šport</string>
 	<string name="type.sport.american_football">Americký futbal</string>
 	<string name="type.sport.archery">Lukostreľba</string>

android/res/values-sv/strings.xml

@@ -1236,21 +1236,27 @@
 	<string name="type.shop.convenience">Närbutik</string>
 	<string name="type.shop.copyshop">Kopieringsbutik</string>
 	<string name="type.shop.cosmetics">Kosmetika</string>
+	<string name="type.shop.deli">Delikatessbutik</string>
 	<string name="type.shop.department_store">Varuhus</string>
 	<string name="type.shop.doityourself">Järnhandel</string>
 	<string name="type.shop.dry_cleaning">Kemtvätt</string>
 	<string name="type.shop.electronics">Elektronik</string>
 	<string name="type.shop.erotic">Erotisk butik</string>
 	<string name="type.shop.fabric">Butik</string>
+	<string name="type.shop.farm">Gårdsmataffär</string>
 	<string name="type.shop.florist">Blomsteraffär</string>
 	<string name="type.shop.funeral_directors">Begravningsentreprenörer</string>
 	<string name="type.shop.furniture">Möbelaffär</string>
 	<string name="type.shop.garden_centre">Plantskola</string>
 	<string name="type.shop.gift">Presentaffär</string>
 	<string name="type.shop.greengrocer">Grönsakshandlare</string>
+	<string name="type.shop.grocery">Livsmedel</string>
 	<string name="type.shop.hairdresser">Frisör</string>
-	<string name="type.shop.hardware">Järnhandel</string>
+	<string name="type.shop.hardware">Järnaffär</string>
+	<string name="type.shop.health_food">Hälsokostbutik</string>
+	<string name="type.shop.houseware">Husgerådsbutik</string>
 	<string name="type.shop.jewelry">Smycken</string>
+	<string name="type.shop.kitchen">Köksbutik</string>
 	<string name="type.shop.laundry">Tvättstuga</string>
 	<string name="type.shop.mall">Galleria</string>
 	<string name="type.shop.massage">Massagesalong</string>
@@ -1262,10 +1268,12 @@
 	<string name="type.shop.newsagent">Tidningsstånd</string>
 	<string name="type.shop.optician">Optiker</string>
 	<string name="type.shop.outdoor">Fritidsutrustning</string>
+	<string name="type.shop.pastry">Bakverk</string>
 	<string name="type.shop.pawnbroker">Pantbank</string>
 	<string name="type.shop.pet">Djuraffär</string>
 	<string name="type.shop.photo">Fotoaffär</string>
 	<string name="type.shop.seafood">Fiskhandlare</string>
+	<string name="type.shop.second_hand">Andrahandsaffär</string>
 	<string name="type.shop.shoes">Skobutik</string>
 	<string name="type.shop.sports">Sportaffär</string>
 	<string name="type.shop.stationery">Pappershandel</string>
@@ -1280,6 +1288,29 @@
 	<string name="type.shop.video">Video butik</string>
 	<string name="type.shop.video_games">Videospel butik</string>
 	<string name="type.shop.wine">Vinhandel</string>
+	<string name="type.shop.antiques">Antikviteter</string>
+	<string name="type.shop.art">Konstaffär</string>
+	<string name="type.shop.baby_goods">Barnbutik</string>
+	<string name="type.shop.bag">Väskor butik</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Välgörenhetsbutik</string>
+	<string name="type.shop.cheese">Ostaffär</string>
+	<string name="type.shop.craft">Konst och hantverk</string>
+	<string name="type.shop.dairy">Mejeriprodukter</string>
+	<string name="type.shop.electrical">Elektronik affär</string>
+	<string name="type.shop.fishing">Fiskeaffär</string>
+	<string name="type.shop.interior_decoration">Inredningsdekorationer</string>
+	<string name="type.shop.lottery">Lotter</string>
+	<string name="type.shop.medical_supply">Medicinska förnödenheter</string>
+	<string name="type.shop.nutrition_supplements">Kosttillskott</string>
+	<string name="type.shop.paint">Färger</string>
+	<string name="type.shop.perfumery">Parfymer</string>
+	<string name="type.shop.sewing">Sytillbehör</string>
+	<string name="type.shop.storage_rental">Uthyrning av förråd</string>
+	<string name="type.shop.tobacco">Tobak</string>
+	<string name="type.shop.trade">Handlar förnödenheter</string>
+	<string name="type.shop.watches">Klockor</string>
+	<string name="type.shop.wholesale">Grossistbutik</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">Amerikansk fotboll</string>
 	<string name="type.sport.archery">Bågskytte</string>

android/res/values-sw/strings.xml

@@ -388,8 +388,40 @@
 	<string name="type.railway.monorail">Mfumo wa reli moja</string>
 	<string name="type.railway.rail">Njia ya Reli</string>
 	<string name="type.railway.subway_entrance">Lango la kuingilia stesheni ya reli</string>
+	<string name="type.shop.deli">Duka la Delicatessen</string>
+	<string name="type.shop.farm">Duka la Chakula cha shambani</string>
+	<string name="type.shop.grocery">Chakula cha mboga</string>
+	<string name="type.shop.hardware">Duka la vifaa</string>
+	<string name="type.shop.health_food">Duka la Chakula cha Afya</string>
+	<string name="type.shop.houseware">Duka la Vifaa vya Nyumbani</string>
+	<string name="type.shop.kitchen">Duka la Jikoni</string>
+	<string name="type.shop.pastry">Keki</string>
+	<string name="type.shop.second_hand">Duka la Mitumba</string>
 	<string name="type.shop.video">Duka la Video</string>
 	<string name="type.shop.video_games">Duka la Video za Michezo</string>
+	<string name="type.shop.antiques">Mambo ya kale</string>
+	<string name="type.shop.art">Duka la Sanaa</string>
+	<string name="type.shop.baby_goods">Duka la watoto</string>
+	<string name="type.shop.bag">Hifadhi ya Mifuko</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Duka la msaada</string>
+	<string name="type.shop.cheese">Duka la Jibini</string>
+	<string name="type.shop.craft">Sanaa na Ufundi</string>
+	<string name="type.shop.dairy">Bidhaa za Maziwa</string>
+	<string name="type.shop.electrical">Duka la Umeme</string>
+	<string name="type.shop.fishing">Duka la Uvuvi</string>
+	<string name="type.shop.interior_decoration">Mapambo ya Ndani</string>
+	<string name="type.shop.lottery">Tikiti za Bahati nasibu</string>
+	<string name="type.shop.medical_supply">Vifaa vya Matibabu</string>
+	<string name="type.shop.nutrition_supplements">Virutubisho vya Lishe</string>
+	<string name="type.shop.paint">Rangi</string>
+	<string name="type.shop.perfumery">Perfumery</string>
+	<string name="type.shop.sewing">Vifaa vya kushona</string>
+	<string name="type.shop.storage_rental">Kukodisha Hifadhi</string>
+	<string name="type.shop.tobacco">Tumbaku</string>
+	<string name="type.shop.trade">Ugavi wa Biashara</string>
+	<string name="type.shop.watches">Saa</string>
+	<string name="type.shop.wholesale">Duka la Jumla</string>
 	<string name="type.sport">Michezo</string>
 	<string name="type.sport.american_football">Soka ya Marekani</string>
 	<string name="type.sport.archery">Upigaji mishale</string>

android/res/values-th/strings.xml

@@ -1252,22 +1252,28 @@
 	<string name="type.shop.convenience">ร้านสะดวกซื้อ</string>
 	<string name="type.shop.copyshop">ร้านถ่ายเอกสาร</string>
 	<string name="type.shop.cosmetics">เครื่องสำอาง</string>
+	<string name="type.shop.deli">ร้านขายอาหารสำเร็จรูป</string>
 	<string name="type.shop.department_store">ห้างสรรพสินค้า</string>
 	<string name="type.shop.doityourself">ร้านขายฮาร์ดแวร์</string>
 	<string name="type.shop.dry_cleaning">ซักแห้ง</string>
 	<string name="type.shop.electronics">ร้านขายอุปกรณ์อิเล็กทรอนิกส์</string>
 	<string name="type.shop.erotic">ร้านเฉพาะผู้ใหญ่</string>
 	<string name="type.shop.fabric">ร้านค้า</string>
+	<string name="type.shop.farm">ฟาร์มฟู้ดช็อป</string>
 	<string name="type.shop.florist">ร้านดอกไม้</string>
 	<string name="type.shop.funeral_directors">สัปเหร่อ</string>
 	<string name="type.shop.furniture">ร้านเฟอร์นิเจอร์</string>
 	<string name="type.shop.garden_centre">สถานรับเลี้ยงเด็ก</string>
 	<string name="type.shop.gift">ร้านของขวัญ</string>
 	<string name="type.shop.greengrocer">ร้านขายผัด</string>
+	<string name="type.shop.grocery">ร้านขายของชำ</string>
 	<string name="type.shop.hairdresser">ช่างทำผม</string>
-	<string name="type.shop.hardware">ร้านขายฮาร์ดแวร์</string>
+	<string name="type.shop.hardware">ร้านฮาร์ดแวร์</string>
+	<string name="type.shop.health_food">ร้านอาหารเพื่อสุขภาพ</string>
+	<string name="type.shop.houseware">ร้านของใช้ในบ้าน</string>
 	<string name="type.shop.jewelry">ร้านขายเครื่องประดับ</string>
 	<string name="type.shop.kiosk">ร้าน</string>
+	<string name="type.shop.kitchen">ร้านครัว</string>
 	<string name="type.shop.laundry">ร้านซักรีด</string>
 	<string name="type.shop.mall">เดอะมอลล์</string>
 	<string name="type.shop.massage">สถานอาบอบนวด</string>
@@ -1279,10 +1285,12 @@
 	<string name="type.shop.newsagent">แผงขายหนังสือพิมพ์</string>
 	<string name="type.shop.optician">ร้านแว่น</string>
 	<string name="type.shop.outdoor">อุปกรณ์กลางแจ้ง</string>
+	<string name="type.shop.pastry">ขนมอบ</string>
 	<string name="type.shop.pawnbroker">ผู้รับจำนำ</string>
 	<string name="type.shop.pet">เพ็ทชอป</string>
 	<string name="type.shop.photo">ร้านถ่ายภาพ</string>
 	<string name="type.shop.seafood">ร้านขายปลา</string>
+	<string name="type.shop.second_hand">ร้านขายของมือสอง</string>
 	<string name="type.shop.shoes">ร้านขายรองเท้า</string>
 	<string name="type.shop.sports">สินค้ากีฬา</string>
 	<string name="type.shop.stationery">ร้านขายเครื่องเขียน</string>
@@ -1297,6 +1305,29 @@
 	<string name="type.shop.video">ร้านขายดีวีดี</string>
 	<string name="type.shop.video_games">ร้านขายวิดีโอเกม</string>
 	<string name="type.shop.wine">ร้านขายไวน์</string>
+	<string name="type.shop.antiques">ของเก่า</string>
+	<string name="type.shop.art">ร้านศิลปะ</string>
+	<string name="type.shop.baby_goods">ร้านขายของสำหรับเด็ก</string>
+	<string name="type.shop.bag">ร้านกระเป๋า</string>
+	<string name="type.shop.boutique">บูติก</string>
+	<string name="type.shop.charity">ร้านการกุศล</string>
+	<string name="type.shop.cheese">ร้านชีส</string>
+	<string name="type.shop.craft">ศิลปะและงานฝีมือ</string>
+	<string name="type.shop.dairy">ผลิตภัณฑ์นม</string>
+	<string name="type.shop.electrical">ร้านขายเครื่องใช้ไฟฟ้า</string>
+	<string name="type.shop.fishing">ร้านตกปลา</string>
+	<string name="type.shop.interior_decoration">ตกแต่งภายใน</string>
+	<string name="type.shop.lottery">สลากกินแบ่ง</string>
+	<string name="type.shop.medical_supply">เวชภัณฑ์</string>
+	<string name="type.shop.nutrition_supplements">อาหารเสริม</string>
+	<string name="type.shop.paint">สี</string>
+	<string name="type.shop.perfumery">น้ำหอม</string>
+	<string name="type.shop.sewing">อุปกรณ์เย็บผ้า</string>
+	<string name="type.shop.storage_rental">ค่าเช่าห้องเก็บของ</string>
+	<string name="type.shop.tobacco">ยาสูบ</string>
+	<string name="type.shop.trade">อุปกรณ์การค้า</string>
+	<string name="type.shop.watches">นาฬิกา</string>
+	<string name="type.shop.wholesale">ร้านขายส่ง</string>
 	<string name="type.sport">กีฬา</string>
 	<string name="type.sport.american_football">อเมริกันฟุตบอล</string>
 	<string name="type.sport.archery">ยิงธนู</string>

android/res/values-tr/strings.xml

@@ -1469,22 +1469,28 @@
 	<string name="type.shop.convenience">Bakkal</string>
 	<string name="type.shop.copyshop">Kopyalama Merkezi</string>
 	<string name="type.shop.cosmetics">Bakım ürünleri</string>
+	<string name="type.shop.deli">Şarküteri Dükkanı</string>
 	<string name="type.shop.department_store">Büyük Mağaza</string>
 	<string name="type.shop.doityourself">Hırdavatçı</string>
 	<string name="type.shop.dry_cleaning">Kuru Temizleme</string>
 	<string name="type.shop.electronics">Elektronik Mağazası</string>
 	<string name="type.shop.erotic">Erotik Ürünler Mağazası</string>
 	<string name="type.shop.fabric">Mağaza</string>
+	<string name="type.shop.farm">Çiftlik Gıda Dükkanı</string>
 	<string name="type.shop.florist">Çiçekçi</string>
 	<string name="type.shop.funeral_directors">Cenaze Levazımcısı</string>
 	<string name="type.shop.furniture">Mobilya Mağazası</string>
 	<string name="type.shop.garden_centre">Bahçe Mağazası</string>
 	<string name="type.shop.gift">Hediyelik Eşya Mağazası</string>
 	<string name="type.shop.greengrocer">Manav</string>
+	<string name="type.shop.grocery">Bakkal</string>
 	<string name="type.shop.hairdresser">Kuaför</string>
-	<string name="type.shop.hardware">Hırdavatçı</string>
+	<string name="type.shop.hardware">Donanım mağazası</string>
+	<string name="type.shop.health_food">Sağlık Gıda Mağazası</string>
+	<string name="type.shop.houseware">Ev Eşyaları Dükkanı</string>
 	<string name="type.shop.jewelry">Kuyumcu</string>
 	<string name="type.shop.kiosk">Büfe</string>
+	<string name="type.shop.kitchen">Mutfak Mağazası</string>
 	<string name="type.shop.laundry">Çamaşırhane</string>
 	<string name="type.shop.mall">Alışveriş Merkezi</string>
 	<string name="type.shop.massage">Masaj Salonu</string>
@@ -1496,10 +1502,12 @@
 	<string name="type.shop.newsagent">Gazete Standı</string>
 	<string name="type.shop.optician">Gözlükçü</string>
 	<string name="type.shop.outdoor">Dış Mekan Ekipmanları</string>
+	<string name="type.shop.pastry">Hamur işi</string>
 	<string name="type.shop.pawnbroker">Tefeci</string>
 	<string name="type.shop.pet">Evcil Hayvan Mağazası</string>
 	<string name="type.shop.photo">Fotoğrafçı</string>
 	<string name="type.shop.seafood">Deniz Ürünleri Mağazası</string>
+	<string name="type.shop.second_hand">İkinci El Mağazası</string>
 	<string name="type.shop.shoes">Ayakkabı Mağazası</string>
 	<string name="type.shop.sports">Spor Ürünleri</string>
 	<string name="type.shop.stationery">Kırtasiye</string>
@@ -1514,6 +1522,29 @@
 	<string name="type.shop.video">Video Mağazası</string>
 	<string name="type.shop.video_games">Video Oyunları Mağazası</string>
 	<string name="type.shop.wine">Şarap Mağazası</string>
+	<string name="type.shop.antiques">Antikalar</string>
+	<string name="type.shop.art">Sanat Mağazası</string>
+	<string name="type.shop.baby_goods">Çocuk mağazası</string>
+	<string name="type.shop.bag">Çanta Mağazası</string>
+	<string name="type.shop.boutique">Butik</string>
+	<string name="type.shop.charity">Hayır Dükkanı</string>
+	<string name="type.shop.cheese">Peynir Dükkanı</string>
+	<string name="type.shop.craft">Sanat ve El işi</string>
+	<string name="type.shop.dairy">Süt Ürünleri</string>
+	<string name="type.shop.electrical">Elektirikli eşya dükkanı</string>
+	<string name="type.shop.fishing">Balıkçı Dükkanı</string>
+	<string name="type.shop.interior_decoration">İç Dekorasyon</string>
+	<string name="type.shop.lottery">Piyango bileti</string>
+	<string name="type.shop.medical_supply">Tıbbi malzemeler</string>
+	<string name="type.shop.nutrition_supplements">Besin Takviyeleri</string>
+	<string name="type.shop.paint">Boyalar</string>
+	<string name="type.shop.perfumery">Parfümeri</string>
+	<string name="type.shop.sewing">Dikiş malzemeleri</string>
+	<string name="type.shop.storage_rental">Depolama Kiralama</string>
+	<string name="type.shop.tobacco">Tütün</string>
+	<string name="type.shop.trade">Esnaf Malzemeleri</string>
+	<string name="type.shop.watches">Saatler</string>
+	<string name="type.shop.wholesale">Toptan satış mağazası</string>
 	<string name="type.sport">Spor</string>
 	<string name="type.sport.american_football">Amerikan Futbolu</string>
 	<string name="type.sport.archery">Okçuluk</string>

android/res/values-uk/strings.xml

@@ -1464,22 +1464,28 @@
 	<string name="type.shop.convenience">Міні-маркет</string>
 	<string name="type.shop.copyshop">Копіювальний центр</string>
 	<string name="type.shop.cosmetics">Косметика</string>
+	<string name="type.shop.deli">Делікатесний магазин</string>
 	<string name="type.shop.department_store">Універмаг</string>
 	<string name="type.shop.doityourself">Господарськi товари</string>
 	<string name="type.shop.dry_cleaning">Хімчистка</string>
 	<string name="type.shop.electronics">Електротехнiка</string>
 	<string name="type.shop.erotic">Секс-шоп</string>
 	<string name="type.shop.fabric">Крамниця</string>
+	<string name="type.shop.farm">Магазин фермерських продуктів</string>
 	<string name="type.shop.florist">Магазин квітів</string>
 	<string name="type.shop.funeral_directors">Ритуальні послуги</string>
 	<string name="type.shop.furniture">Магазин меблів</string>
 	<string name="type.shop.garden_centre">Товари для саду</string>
 	<string name="type.shop.gift">Магазин сувенірів</string>
 	<string name="type.shop.greengrocer">Овочі та фрукти</string>
+	<string name="type.shop.grocery">Бакалія</string>
 	<string name="type.shop.hairdresser">Перукарня</string>
-	<string name="type.shop.hardware">Будматеріали</string>
+	<string name="type.shop.hardware">Магазин побутової техніки</string>
+	<string name="type.shop.health_food">Магазин здорового харчування</string>
+	<string name="type.shop.houseware">Магазин посуду</string>
 	<string name="type.shop.jewelry">Ювелірний магазин</string>
 	<string name="type.shop.kiosk">Кіоск</string>
+	<string name="type.shop.kitchen">Магазин кухні</string>
 	<string name="type.shop.laundry">Пральня</string>
 	<string name="type.shop.mall">Торговий центр</string>
 	<string name="type.shop.massage">Масажний кабінет</string>
@@ -1491,10 +1497,12 @@
 	<string name="type.shop.newsagent">Газетний кіоск</string>
 	<string name="type.shop.optician">Оптика</string>
 	<string name="type.shop.outdoor">Спорядження</string>
+	<string name="type.shop.pastry">Тістечка</string>
 	<string name="type.shop.pawnbroker">Ломбард</string>
 	<string name="type.shop.pet">Зоотовари</string>
 	<string name="type.shop.photo">Фототовари</string>
 	<string name="type.shop.seafood">Рибна лавка</string>
+	<string name="type.shop.second_hand">Магазин секонд-хенду</string>
 	<string name="type.shop.shoes">Магазин взуття</string>
 	<string name="type.shop.sports">Спортивні товари</string>
 	<string name="type.shop.stationery">Канцелярськi товари</string>
@@ -1509,6 +1517,29 @@
 	<string name="type.shop.video">Магазин відео</string>
 	<string name="type.shop.video_games">Магазин відеоігор</string>
 	<string name="type.shop.wine">Винна крамниця</string>
+	<string name="type.shop.antiques">Антикваріат</string>
+	<string name="type.shop.art">Магазин мистецтв</string>
+	<string name="type.shop.baby_goods">Дитячий магазин</string>
+	<string name="type.shop.bag">Магазин сумок</string>
+	<string name="type.shop.boutique">Бутік</string>
+	<string name="type.shop.charity">Магазин благодійності</string>
+	<string name="type.shop.cheese">Магазин сиру</string>
+	<string name="type.shop.craft">Мистецтво і ремесла</string>
+	<string name="type.shop.dairy">Молочні продукти</string>
+	<string name="type.shop.electrical">Магазин електротехніки</string>
+	<string name="type.shop.fishing">Рибальський магазин</string>
+	<string name="type.shop.interior_decoration">Внутрішнє оздоблення</string>
+	<string name="type.shop.lottery">Лотерейні квитки</string>
+	<string name="type.shop.medical_supply">Медичні товари</string>
+	<string name="type.shop.nutrition_supplements">Харчові добавки</string>
+	<string name="type.shop.paint">Фарби</string>
+	<string name="type.shop.perfumery">Парфумерія</string>
+	<string name="type.shop.sewing">Швейні приладдя</string>
+	<string name="type.shop.storage_rental">Оренда сховища</string>
+	<string name="type.shop.tobacco">Тютюн</string>
+	<string name="type.shop.trade">Торгівля припасами</string>
+	<string name="type.shop.watches">Годинники</string>
+	<string name="type.shop.wholesale">Оптовий магазин</string>
 	<string name="type.sport">Спорт</string>
 	<string name="type.sport.american_football">Американський футбол</string>
 	<string name="type.sport.archery">Стрільба з лука</string>

android/res/values-vi/strings.xml

@@ -1247,22 +1247,28 @@
 	<string name="type.shop.convenience">Cửa hàng tạp hóa</string>
 	<string name="type.shop.copyshop">Cửa hàng Copy</string>
 	<string name="type.shop.cosmetics">Mỹ phẩm</string>
+	<string name="type.shop.deli">Cửa hàng đồ ăn ngon</string>
 	<string name="type.shop.department_store">Cửa hàng bách hóa</string>
 	<string name="type.shop.doityourself">Cửa hàng phần cứng</string>
 	<string name="type.shop.dry_cleaning">Giặt Sấy</string>
 	<string name="type.shop.electronics">Cửa hàng điện</string>
 	<string name="type.shop.erotic">Cửa hàng người lớn</string>
 	<string name="type.shop.fabric">Cửa hàng</string>
+	<string name="type.shop.farm">Cửa hàng thực phẩm nông trại</string>
 	<string name="type.shop.florist">Cửa hàng hoa</string>
 	<string name="type.shop.funeral_directors">Tổ chức tang lễ</string>
 	<string name="type.shop.furniture">Cửa hàng nội thất</string>
 	<string name="type.shop.garden_centre">Nhà trẻ</string>
 	<string name="type.shop.gift">Cửa hàng quà tặng</string>
 	<string name="type.shop.greengrocer">Cửa hàng rau củ</string>
+	<string name="type.shop.grocery">Cửa hàng tạp hóa</string>
 	<string name="type.shop.hairdresser">Tiệm làm tóc</string>
 	<string name="type.shop.hardware">Cửa hàng phần cứng</string>
+	<string name="type.shop.health_food">Cửa hàng thực phẩm sức khỏe</string>
+	<string name="type.shop.houseware">Cửa hàng đồ gia dụng</string>
 	<string name="type.shop.jewelry">Đồ trang sức</string>
 	<string name="type.shop.kiosk">Cửa hàng</string>
+	<string name="type.shop.kitchen">Cửa hàng nhà bếp</string>
 	<string name="type.shop.laundry">Giặt là</string>
 	<string name="type.shop.mall">Khu mua sắm</string>
 	<string name="type.shop.massage">Quán massage</string>
@@ -1274,10 +1280,12 @@
 	<string name="type.shop.newsagent">Quầy báo</string>
 	<string name="type.shop.optician">Cửa hàng mắt kính</string>
 	<string name="type.shop.outdoor">Thiết bị Ngoài trời</string>
+	<string name="type.shop.pastry">Bánh ngọt</string>
 	<string name="type.shop.pawnbroker">Cầm đồ</string>
 	<string name="type.shop.pet">Cửa Hàng Vật Nuôi</string>
 	<string name="type.shop.photo">Hiệu Ảnh</string>
 	<string name="type.shop.seafood">Người bán cá</string>
+	<string name="type.shop.second_hand">Cửa hàng bán đồ đã qua sử dụng</string>
 	<string name="type.shop.shoes">Cửa hàng giày</string>
 	<string name="type.shop.sports">Đồ dùng thể thao</string>
 	<string name="type.shop.stationery">Cửa hàng văn phòng phẩm</string>
@@ -1292,6 +1300,29 @@
 	<string name="type.shop.video">Cửa hàng bán/cho thuê bằng đĩa</string>
 	<string name="type.shop.video_games">Cửa hàng bán trò chơi điện tử</string>
 	<string name="type.shop.wine">Rượu</string>
+	<string name="type.shop.antiques">Đồ cổ</string>
+	<string name="type.shop.art">Cửa hàng nghệ thuật</string>
+	<string name="type.shop.baby_goods">Cửa hàng trẻ em</string>
+	<string name="type.shop.bag">Cửa hàng túi xách</string>
+	<string name="type.shop.boutique">Cửa hàng</string>
+	<string name="type.shop.charity">Cửa hàng từ thiện</string>
+	<string name="type.shop.cheese">Cửa hàng pho mát</string>
+	<string name="type.shop.craft">Nghệ thuật và thủ công</string>
+	<string name="type.shop.dairy">Sản phẩm từ sữa</string>
+	<string name="type.shop.electrical">Cửa hàng điện tử</string>
+	<string name="type.shop.fishing">Cửa hàng câu cá</string>
+	<string name="type.shop.interior_decoration">Đồ trang trí nội thất</string>
+	<string name="type.shop.lottery">Vé xổ số kiến thiết</string>
+	<string name="type.shop.medical_supply">Vật tư y tế</string>
+	<string name="type.shop.nutrition_supplements">Bổ sung dinh dưỡng</string>
+	<string name="type.shop.paint">Sơn</string>
+	<string name="type.shop.perfumery">Nước hoa</string>
+	<string name="type.shop.sewing">Nguồn cung cấp may</string>
+	<string name="type.shop.storage_rental">Cho thuê kho lưu trữ</string>
+	<string name="type.shop.tobacco">Thuốc lá</string>
+	<string name="type.shop.trade">Nguồn cung cấp Giao dịch</string>
+	<string name="type.shop.watches">Xem</string>
+	<string name="type.shop.wholesale">Cửa hàng bán buôn</string>
 	<string name="type.sport">Thể thao</string>
 	<string name="type.sport.american_football">Bóng bầu dục Mỹ</string>
 	<string name="type.sport.archery">Bắn cung</string>

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

@@ -1300,22 +1300,28 @@
 	<string name="type.shop.convenience">便利商店</string>
 	<string name="type.shop.copyshop">復印店</string>
 	<string name="type.shop.cosmetics">化妆品</string>
+	<string name="type.shop.deli">熟食店</string>
 	<string name="type.shop.department_store">百貨公司</string>
 	<string name="type.shop.doityourself">五金行</string>
 	<string name="type.shop.dry_cleaning">乾洗</string>
 	<string name="type.shop.electronics">電子產品</string>
 	<string name="type.shop.erotic">情趣用品店</string>
 	<string name="type.shop.fabric">購物</string>
+	<string name="type.shop.farm">農場食品店</string>
 	<string name="type.shop.florist">花店</string>
 	<string name="type.shop.funeral_directors">葬儀社</string>
 	<string name="type.shop.furniture">家具店</string>
 	<string name="type.shop.garden_centre">園藝店</string>
 	<string name="type.shop.gift">禮品店</string>
 	<string name="type.shop.greengrocer">蔬果零售店</string>
+	<string name="type.shop.grocery">雜貨店</string>
 	<string name="type.shop.hairdresser">理髮師</string>
-	<string name="type.shop.hardware">五金行</string>
+	<string name="type.shop.hardware">五金店</string>
+	<string name="type.shop.health_food">保健食品店</string>
+	<string name="type.shop.houseware">家居用品店</string>
 	<string name="type.shop.jewelry">珠寶店</string>
 	<string name="type.shop.kiosk">小舖</string>
+	<string name="type.shop.kitchen">廚房用品店</string>
 	<string name="type.shop.laundry">洗衣店</string>
 	<string name="type.shop.mall">商场</string>
 	<string name="type.shop.massage">按摩館</string>
@@ -1327,10 +1333,12 @@
 	<string name="type.shop.newsagent">報攤</string>
 	<string name="type.shop.optician">眼鏡店</string>
 	<string name="type.shop.outdoor">室外設備</string>
+	<string name="type.shop.pastry">糕點</string>
 	<string name="type.shop.pawnbroker">當舖</string>
 	<string name="type.shop.pet">寵物店</string>
 	<string name="type.shop.photo">照片店</string>
 	<string name="type.shop.seafood">魚販</string>
+	<string name="type.shop.second_hand">二手店</string>
 	<string name="type.shop.shoes">鞋店</string>
 	<string name="type.shop.sports">運動商品店</string>
 	<string name="type.shop.stationery">文具用品店</string>
@@ -1345,6 +1353,29 @@
 	<string name="type.shop.video">視頻商城</string>
 	<string name="type.shop.video_games">電子遊戲商城</string>
 	<string name="type.shop.wine">販酒處</string>
+	<string name="type.shop.antiques">古董</string>
+	<string name="type.shop.art">藝術商店</string>
+	<string name="type.shop.baby_goods">兒童商店</string>
+	<string name="type.shop.bag">箱包店</string>
+	<string name="type.shop.boutique">精品店</string>
+	<string name="type.shop.charity">慈善商店</string>
+	<string name="type.shop.cheese">奶酪店c</string>
+	<string name="type.shop.craft">美術和工藝</string>
+	<string name="type.shop.dairy">乳製品</string>
+	<string name="type.shop.electrical">電器商城</string>
+	<string name="type.shop.fishing">釣魚店</string>
+	<string name="type.shop.interior_decoration">室內裝飾</string>
+	<string name="type.shop.lottery">彩票</string>
+	<string name="type.shop.medical_supply">醫療用品</string>
+	<string name="type.shop.nutrition_supplements">營養補充劑</string>
+	<string name="type.shop.paint">油漆</string>
+	<string name="type.shop.perfumery">香水</string>
+	<string name="type.shop.sewing">縫紉用品</string>
+	<string name="type.shop.storage_rental">存儲租賃</string>
+	<string name="type.shop.tobacco">煙草</string>
+	<string name="type.shop.trade">貿易用品</string>
+	<string name="type.shop.watches">手錶</string>
+	<string name="type.shop.wholesale">批髮店</string>
 	<string name="type.sport">體育運動</string>
 	<string name="type.sport.american_football">美式足球</string>
 	<string name="type.sport.archery">射箭</string>

android/res/values-zh/strings.xml

@@ -1394,22 +1394,28 @@
 	<string name="type.shop.convenience">便利店</string>
 	<string name="type.shop.copyshop">复印店</string>
 	<string name="type.shop.cosmetics">化妝品店</string>
+	<string name="type.shop.deli">熟食店</string>
 	<string name="type.shop.department_store">百货商场</string>
 	<string name="type.shop.doityourself">家居用品店</string>
 	<string name="type.shop.dry_cleaning">干洗店</string>
 	<string name="type.shop.electronics">电子产品商店</string>
 	<string name="type.shop.erotic">成人用品店</string>
 	<string name="type.shop.fabric">商店</string>
+	<string name="type.shop.farm">农场食品店</string>
 	<string name="type.shop.florist">花店</string>
 	<string name="type.shop.funeral_directors">殡仪馆</string>
 	<string name="type.shop.furniture">家具店</string>
 	<string name="type.shop.garden_centre">幼儿园</string>
 	<string name="type.shop.gift">礼品店</string>
 	<string name="type.shop.greengrocer">蔬果零售店</string>
+	<string name="type.shop.grocery">杂货店</string>
 	<string name="type.shop.hairdresser">理发师</string>
-	<string name="type.shop.hardware">硬件店</string>
+	<string name="type.shop.hardware">五金店</string>
+	<string name="type.shop.health_food">保健食品店</string>
+	<string name="type.shop.houseware">家居用品店</string>
 	<string name="type.shop.jewelry">珠宝店</string>
 	<string name="type.shop.kiosk">商店</string>
+	<string name="type.shop.kitchen">厨房用品店</string>
 	<string name="type.shop.laundry">洗衣店</string>
 	<string name="type.shop.mall">商场</string>
 	<string name="type.shop.massage">按摩院</string>
@@ -1421,10 +1427,12 @@
 	<string name="type.shop.newsagent">报刊亭</string>
 	<string name="type.shop.optician">眼镜店</string>
 	<string name="type.shop.outdoor">室外设备</string>
+	<string name="type.shop.pastry">糕点</string>
 	<string name="type.shop.pawnbroker">典当商铺</string>
 	<string name="type.shop.pet">宠物店</string>
 	<string name="type.shop.photo">照片店</string>
 	<string name="type.shop.seafood">鱼商</string>
+	<string name="type.shop.second_hand">二手店</string>
 	<string name="type.shop.shoes">鞋店</string>
 	<string name="type.shop.sports">体育用品店</string>
 	<string name="type.shop.stationery">文具店</string>
@@ -1439,6 +1447,29 @@
 	<string name="type.shop.video">影像店</string>
 	<string name="type.shop.video_games">电子游戏店</string>
 	<string name="type.shop.wine">酒品商店</string>
+	<string name="type.shop.antiques">古董</string>
+	<string name="type.shop.art">艺术商店</string>
+	<string name="type.shop.baby_goods">儿童商店</string>
+	<string name="type.shop.bag">箱包店</string>
+	<string name="type.shop.boutique">精品店</string>
+	<string name="type.shop.charity">慈善商店</string>
+	<string name="type.shop.cheese">奶酪店</string>
+	<string name="type.shop.craft">美术和工艺</string>
+	<string name="type.shop.dairy">乳制品</string>
+	<string name="type.shop.electrical">电器商城</string>
+	<string name="type.shop.fishing">钓鱼店</string>
+	<string name="type.shop.interior_decoration">室内装饰</string>
+	<string name="type.shop.lottery">彩票</string>
+	<string name="type.shop.medical_supply">医疗用品</string>
+	<string name="type.shop.nutrition_supplements">营养补充剂</string>
+	<string name="type.shop.paint">油漆</string>
+	<string name="type.shop.perfumery">香水</string>
+	<string name="type.shop.sewing">缝纫用品</string>
+	<string name="type.shop.storage_rental">存储租赁</string>
+	<string name="type.shop.tobacco">烟草</string>
+	<string name="type.shop.trade">贸易用品</string>
+	<string name="type.shop.watches">手表</string>
+	<string name="type.shop.wholesale">批发店</string>
 	<string name="type.sport">体育运动</string>
 	<string name="type.sport.american_football">美式足球</string>
 	<string name="type.sport.archery">射箭</string>

android/res/values/strings.xml

@@ -1539,22 +1539,28 @@
 	<string name="type.shop.convenience">Convenience Store</string>
 	<string name="type.shop.copyshop">Copy Shop</string>
 	<string name="type.shop.cosmetics">Cosmetics</string>
+	<string name="type.shop.deli">Delicatessen Shop</string>
 	<string name="type.shop.department_store">Department Store</string>
 	<string name="type.shop.doityourself">Hardware Store</string>
 	<string name="type.shop.dry_cleaning">Dry Cleaning</string>
 	<string name="type.shop.electronics">Electronics</string>
 	<string name="type.shop.erotic">Erotic Shop</string>
 	<string name="type.shop.fabric">Shop</string>
+	<string name="type.shop.farm">Farm Food Shop</string>
 	<string name="type.shop.florist">Florist’s</string>
 	<string name="type.shop.funeral_directors">Funeral Directors</string>
 	<string name="type.shop.furniture">Furniture Store</string>
 	<string name="type.shop.garden_centre">Garden Store</string>
 	<string name="type.shop.gift">Gift Shop</string>
 	<string name="type.shop.greengrocer">Greengrocer\'s</string>
+	<string name="type.shop.grocery">Grocery</string>
 	<string name="type.shop.hairdresser">Hairdresser</string>
 	<string name="type.shop.hardware">Hardware Store</string>
+	<string name="type.shop.health_food">Health Food Shop</string>
+	<string name="type.shop.houseware">Houseware</string>
 	<string name="type.shop.jewelry">Jewelry</string>
 	<string name="type.shop.kiosk">Kiosk</string>
+	<string name="type.shop.kitchen">Kitchen Store</string>
 	<string name="type.shop.laundry">Laundry</string>
 	<string name="type.shop.mall">Mall</string>
 	<string name="type.shop.massage">Massage Salon</string>
@@ -1566,10 +1572,12 @@
 	<string name="type.shop.newsagent">Newspaper Stand</string>
 	<string name="type.shop.optician">Optician’s</string>
 	<string name="type.shop.outdoor">Outdoor Equipment</string>
+	<string name="type.shop.pastry">Pastry</string>
 	<string name="type.shop.pawnbroker">Pawnbroker</string>
 	<string name="type.shop.pet">Petshop</string>
 	<string name="type.shop.photo">Photo Shop</string>
 	<string name="type.shop.seafood">Seafood Shop</string>
+	<string name="type.shop.second_hand">Second Hand</string>
 	<string name="type.shop.shoes">Shoe Store</string>
 	<string name="type.shop.sports">Sports Goods</string>
 	<string name="type.shop.stationery">Stationery Shop</string>
@@ -1584,6 +1592,29 @@
 	<string name="type.shop.video">Video Shop</string>
 	<string name="type.shop.video_games">Video Games Shop</string>
 	<string name="type.shop.wine">Wine Shop</string>
+	<string name="type.shop.antiques">Antiques</string>
+	<string name="type.shop.art">Arts Shop</string>
+	<string name="type.shop.baby_goods">Baby Goods</string>
+	<string name="type.shop.bag">Bags Store</string>
+	<string name="type.shop.boutique">Boutique</string>
+	<string name="type.shop.charity">Charity Shop</string>
+	<string name="type.shop.cheese">Cheese Store</string>
+	<string name="type.shop.craft">Arts and Crafts</string>
+	<string name="type.shop.dairy">Dairy Products</string>
+	<string name="type.shop.electrical">Electrical Store</string>
+	<string name="type.shop.fishing">Fishing Store</string>
+	<string name="type.shop.interior_decoration">Interior Decorations</string>
+	<string name="type.shop.lottery">Lottery Tickets</string>
+	<string name="type.shop.medical_supply">Medical Supplies</string>
+	<string name="type.shop.nutrition_supplements">Nutrition Supplements</string>
+	<string name="type.shop.paint">Paints</string>
+	<string name="type.shop.perfumery">Perfumery</string>
+	<string name="type.shop.sewing">Sewing Supplies</string>
+	<string name="type.shop.storage_rental">Storage Rental</string>
+	<string name="type.shop.tobacco">Tobacco</string>
+	<string name="type.shop.trade">Trades Supplies</string>
+	<string name="type.shop.watches">Watches</string>
+	<string name="type.shop.wholesale">Wholesale Store</string>
 	<string name="type.sport">Sport</string>
 	<string name="type.sport.american_football">American Football</string>
 	<string name="type.sport.archery">Archery</string>

data/categories.txt

@@ -875,7 +875,7 @@ sk:3Benzínová pumpa
 sw:mafuta
 fa:جایگاه سوخت
 
-shop-bakery|@eat
+shop-bakery|shop-pastry|@eat
 en:3Bakery|U+1F35E
 ru:3Булочная|3пекарня
 bg:3Пекарна
@@ -1021,6 +1021,14 @@ sk:Príležitostné potreby
 sw:Duka
 fa:بقالی
 
+shop-deli|@food
+en:4Delicatessen
+ru:4Деликатесы
+
+shop-farm|@food
+en:Farm food
+ru:Фермерская еда
+
 shop-garden_centre
 en:4Garden Centre|U+1F3EC|U+1F3EA|U+1F3E1
 en-US:4Garden Center
@@ -1056,6 +1064,14 @@ el:Κατάστημα ειδών κήπου|κατάστημα
 sk:Škôlka|materská škôlka
 fa:فروشگاه تجهیزات باغبانی
 
+shop-grocery|@food
+en:Grocery
+ru:Бакалея
+
+shop-health_food|@food
+en:Health food
+ru:Здоровая еда
+
 shop-mobile_phone
 en:4Cell Phones|4Mobile Phones|6smartphones|electronics store|U+1F3EC|U+1F3EA|U+1F4F1|U+1F4F2
 ru:4Сотовые телефоны|4Мобильные телефоны|5телефоны|5смартфоны|электроника|салон связи
@@ -1162,7 +1178,7 @@ el:Κρεοπωλείο|κατάστημα
 sk:Mäsiar
 fa:قصابی
 
-shop-furniture
+shop-furniture|shop-kitchen
 en:4Furniture Store
 ru:Магазин мебели|4мебель
 bg:Магазин за мебели
@@ -1340,7 +1356,7 @@ el:Ηλεκτρονικά|κατάστημα
 sk:4Elektronika
 fa:فروشگاه تجهیزات الکترونیکی
 
-shop-hardware|shop-doityourself
+shop-hardware|shop-houseware|shop-doityourself
 en:4Hardware Store|DIY|do it yourself|U+1F3EC|U+1F3EA|U+1F50B|U+1F50C|U+1F4A1|U+1F526|U+1F529|U+1F528|U+2614
 ru:3Хозяйственный|Стройтовары|хозтовары|сделай сам
 bg:НСС|направи си сам|строителни материали
@@ -9533,6 +9549,10 @@ sk:Obchodník s rybami
 fa:فروشگاه غذای دریایی
 mr:सीफूड शॉप
 
+shop-second_hand
+en:4Second Hand
+ru:4Подержанные товары
+
 shop-ticket
 en:4Ticket Shop|tickets|ticket hub|ticket office|ticket center|booking office|box office|ticket agency|ticket booth|pay box
 ru:4Билетная касса|билет|театральная касса|билетный центр|городская касса|продажа билетов|бронирование билетов

data/classificator.txt

@@ -853,12 +853,17 @@ world  +
         {}
     shop  +
         alcohol  -
+        antiques  -
+        art  -
+        baby_goods  -
+        bag  -
         bakery  -
         beauty  -
         beverages  -
         bicycle  -
         bookmaker  -
         books  -
+        boutique  -
         butcher  -
         car  -
         car_parts  -
@@ -866,6 +871,8 @@ world  +
             tyres  -
             {}
         caravan  -
+        charity  -
+        cheese  -
         chemist  -
         chocolate  -
         clothes  -
@@ -875,50 +882,74 @@ world  +
         convenience  -
         copyshop  -
         cosmetics  -
+        craft  -
+        dairy  -
+        deli  -
         department_store  -
         doityourself  -
         dry_cleaning  -
+        electrical  -
         electronics  -
         erotic  -
         fabric  -
+        farm  -
+        fishing  -
         florist  -
         funeral_directors  -
         furniture  -
         garden_centre  -
         gift  -
         greengrocer  -
+        grocery  -
         hairdresser  -
         hardware  -
+        health_food  -
+        houseware  -
+        interior_decoration  -
         jewelry  -
         kiosk  -
+        kitchen  -
         laundry  -
+        lottery  -
         mall  -
         massage  -
+        medical_supply  -
         mobile_phone  -
         money_lender  -
         motorcycle  -
         music  -
         musical_instrument  -
         newsagent  -
+        nutrition_supplements  -
         optician  -
         outdoor  -
+        paint  -
+        pastry  -
         pawnbroker  -
+        perfumery  -
         pet  -
         photo  -
         seafood  -
+        second_hand  -
+        sewing  -
         shoes  -
         sports  -
         stationery  -
+        storage_rental  -
         supermarket  -
         tattoo  -
         tea  -
         ticket  -
+        tobacco  -
         toys  -
+        trade  -
         travel_agency  -
         tyres  -
         variety_store  -
         video  -
         video_games  -
+        watches  -
+        wholesale  -
         wine  -
         {}
     sport  +

data/editor.config

@@ -557,6 +557,14 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-antiques" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-bag" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-bakery" group="shop">
         <include group="poi" />
         <include field="internet" />
@@ -593,8 +601,11 @@
         <include group="poi" />
         <include field="internet" />
       </type>
-      <!-- Add translations before setting can_add=yes. It's hard to translate though.-->
-      <type id="shop-chemist" group="shop" can_add="no">
+      <type id="shop-cheese" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-chemist" group="shop">
         <include group="poi" />
         <include field="internet" />
       </type>
@@ -618,6 +629,18 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-copyshop" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-dairy" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-deli" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-department_store" group="big_shop">
         <include group="poi" />
         <include field="internet" />
@@ -626,10 +649,22 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-dry_cleaning">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-electronics" group="shop">
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-farm" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-fishing" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-florist" group="shop">
         <include group="poi" />
         <include field="internet" />
@@ -650,6 +685,10 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-grocery" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-hairdresser">
         <include group="poi" />
         <include field="internet" />
@@ -658,6 +697,10 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-health_food" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-jewelry" group="shop">
         <include group="poi" />
         <include field="internet" />
@@ -666,6 +709,10 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-kitchen" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-laundry" group="shop">
         <include group="poi" />
         <include field="internet" />
@@ -678,10 +725,26 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-nutrition_supplements" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-optician" group="shop">
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-outdoor" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-perfumery" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
+      <type id="shop-second_hand" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-shoes" group="shop">
         <include group="poi" />
         <include field="internet" />
@@ -694,11 +757,11 @@
         <include group="poi" />
         <include field="internet" />
       </type>
-      <type id="shop-toys" group="shop">
+      <type id="shop-tobacco" group="shop">
         <include group="poi" />
         <include field="internet" />
       </type>
-      <type id="shop-copyshop" group="shop">
+      <type id="shop-toys" group="shop">
         <include group="poi" />
         <include field="internet" />
       </type>
@@ -709,17 +772,13 @@
       <type id="shop-travel_agency" group="shop">
         <include group="poi" />
       </type>
-      <type id="shop-outdoor" group="shop">
-        <include group="poi" />
-        <include field="internet" />
-      </type>
-      <type id="shop-dry_cleaning">
-        <include group="poi" />
-        <include field="internet" />
-      </type>
       <type id="shop-tyres" group="shop">
         <include group="poi" />
       </type>
+      <type id="shop-watches" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="tourism-alpine_hut" group="accomodation">
         <include group="poi" />
         <include field="ele" />

data/mapcss-mapping.csv

@@ -909,11 +909,11 @@ deprecated|deprecated;909;x
 railway|subway|grey;[railway=subway][colour=grey];x;name;int_name;910;railway|subway|tunnel
 deprecated|deprecated;911;x
 historic|ship;912;
-deprecated|deprecated;913;x
-deprecated|deprecated;914;x
-deprecated|deprecated;915;x
-deprecated|deprecated;916;x
-deprecated|deprecated;917;x
+shop|tobacco;913;
+shop|farm;914;
+shop|storage_rental;915;
+shop|trade;916;
+shop|deli;917;
 shop|mall;918;
 shop|doityourself;919;
 place|sea;920;
@@ -1073,7 +1073,7 @@ amenity|vending_machine|cigarettes;[amenity=vending_machine][vending=cigarettes]
 amenity|vending_machine|drinks;[amenity=vending_machine][vending=drinks];;name;int_name;1075;
 amenity|waste_basket;1076;
 building|garage;[building=garage],[building=yes][garage],[building=garages],[amenity=garage],[amenity=garages];;addr:housenumber;name;1077;
-deprecated|deprecated;1078;x
+shop|pastry;1078;
 emergency|phone;1079;
 highway|rest_area;1080;
 highway|traffic_signals;1081;
@@ -1096,7 +1096,7 @@ shop|wine;1097;
 tourism|chalet;1098;
 tourism|information|board;[tourism=information][information=board];;name;int_name;1099;
 tourism|information|map;[tourism=information][information=map];;name;int_name;1100;
-deprecated|deprecated;1101;x
+shop|paint;1101;
 traffic_calming|bump;1102;
 traffic_calming|hump;1103;
 shop|car_parts;1104;
@@ -1107,8 +1107,8 @@ leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];;name;int_name;11
 amenity|public_bookcase;1109;
 tourism|apartment;1110;
 tourism|resort;[tourism=resort],[leisure=resort],[leisure=summer_camp];;name;int_name;1111;
-deprecated|deprecated;1112;x
-deprecated|deprecated;1113;x
+shop|interior_decoration;1112;
+shop|houseware;1113;
 hwtag|nobicycle;1114;
 hwtag|yesbicycle;1115;
 hwtag|bidir_bicycle;1116;
@@ -1151,8 +1151,8 @@ tourism|gallery;1152;
 historic|fort;1153;
 shop|coffee;1154;
 shop|tea;1155;
-deprecated|deprecated;1156;x
-deprecated|deprecated;1157;x
+shop|art;1156;
+shop|charity;1157;
 hwtag|toll;1158;
 amenity|arts_centre;1159;
 amenity|biergarten;1160;
@@ -1172,7 +1172,7 @@ highway|services;1173;
 leisure|fitness_station;1174;
 leisure|ice_rink;1175;
 leisure|marina;1176;
-deprecated|deprecated;1177;x
+shop|medical_supply;1177;
 man_made|surveillance;1178;
 man_made|water_tap;1179;
 man_made|works;1180;
@@ -1180,7 +1180,7 @@ office|insurance;1181;
 office|ngo;1182;
 shop|chocolate;1183;
 shop|erotic;1184;
-deprecated|deprecated;1185;x
+shop|kitchen;1185;
 shop|fabric;1186;
 shop|funeral_directors;1187;
 shop|massage;1188;
@@ -1195,25 +1195,25 @@ shop|variety_store;1196;
 shop|video;1197;
 tourism|theme_park;1198;
 tourism|wilderness_hut;1199;
-deprecated|deprecated;1200;x
-deprecated|deprecated;1201;x
-deprecated|deprecated;1202;x
-deprecated|deprecated;1203;x
-deprecated|deprecated;1204;x
-deprecated|deprecated;1205;x
-deprecated|deprecated;1206;x
-deprecated|deprecated;1207;x
-deprecated|deprecated;1208;x
-deprecated|deprecated;1209;x
+shop|boutique;1200;
+shop|lottery;1201;
+shop|antiques;1202;
+shop|wholesale;1203;
+shop|perfumery;1204;
+shop|baby_goods;1205;
+shop|bag;1206;
+shop|dairy;1207;
+shop|electrical;1208;
+shop|cheese;1209;
 shop|money_lender;1210;
-deprecated|deprecated;1211;x
-deprecated|deprecated;1212;x
-deprecated|deprecated;1213;x
-deprecated|deprecated;1214;x
-deprecated|deprecated;1215;x
-deprecated|deprecated;1216;x
-deprecated|deprecated;1217;x
-deprecated|deprecated;1218;x
+shop|health_food;1211;
+shop|fishing;1212;
+shop|grocery;1213;
+shop|nutrition_supplements;1214;
+shop|watches;1215;
+shop|second_hand;1216;
+shop|craft;1217;
+shop|sewing;1218;
 deprecated|deprecated;1219;x
 deprecated|deprecated;1220;x
 deprecated|deprecated;1221;x

data/replaced_tags.txt

@@ -30,9 +30,14 @@ bench=yes : amenity=bench
 shelter=yes : amenity=shelter
 toilets=yes : amenity=toilets
 restaurant=yes : amenity=restaurant
-shop=ice_cream : amenity=ice_cream
+
 ice_cream=yes : amenity=ice_cream
 
+shop=ice_cream : amenity=ice_cream
+shop=e-cigarette : shop=tobacco
+shop=food : shop=convenience
+shop=haberdashery : shop=sewing
+
 ford=boat : highway=ford
 ford=intermittent : highway=ford
 ford=seasonal : highway=ford

data/styles/clear/include/Icons.mapcss

@@ -2153,7 +2153,9 @@ node|z16[shop=bookmaker],
 area|z16[shop=bookmaker]
 {icon-image: bookmaker-m.svg;}
 node|z16[shop=bakery],
-area|z16[shop=bakery]
+area|z16[shop=bakery],
+node|z16[shop=pastry],
+area|z16[shop=pastry],
 {icon-image: bakery-m.svg;}
 node|z16[shop=beauty],
 area|z16[shop=beauty]
@@ -2217,7 +2219,15 @@ node|z16[amenity=ice_cream],
 area|z16[amenity=ice_cream]
 {icon-image: ice_cream-m.svg;}
 node|z16[shop=convenience],
-area|z16[shop=convenience]
+area|z16[shop=convenience],
+node|z16[shop=deli],
+area|z16[shop=deli],
+node|z16[shop=farm],
+area|z16[shop=farm],
+node|z16[shop=grocery],
+area|z16[shop=grocery],
+node|z16[shop=health_food],
+area|z16[shop=health_food],
 {icon-image: grocery-m.svg;}
 node|z16[shop=copyshop],
 area|z16[shop=copyshop]
@@ -2241,7 +2251,9 @@ node|z16[shop=florist],
 area|z16[shop=florist]
 {icon-image: florist-m.svg;}
 node|z16[shop=furniture],
-area|z16[shop=furniture]
+area|z16[shop=furniture],
+node|z16[shop=kitchen],
+area|z16[shop=kitchen],
 {icon-image: furniture-m.svg;}
 node|z16[shop=garden_centre],
 area|z16[shop=garden_centre]
@@ -2264,7 +2276,9 @@ node|z16[shop=hairdresser],
 area|z16[shop=hairdresser]
 {icon-image: hairdresser-m.svg;}
 node|z16[shop=hardware],
-area|z16[shop=hardware]
+area|z16[shop=hardware],
+node|z16[shop=houseware],
+area|z16[shop=houseware],
 {icon-image: doityourself-m.svg;}
 node|z16[shop=jewelry],
 area|z16[shop=jewelry]
@@ -2319,7 +2333,9 @@ node|z17-[shop=bookmaker],
 area|z17-[shop=bookmaker]
 {icon-image: bookmaker-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=bakery],
-area|z17-[shop=bakery]
+area|z17-[shop=bakery],
+node|z17-[shop=pastry],
+area|z17-[shop=pastry],
 {icon-image: bakery-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=beauty],
 area|z17-[shop=beauty]
@@ -2383,7 +2399,15 @@ node|z17-[amenity=ice_cream],
 area|z17-[amenity=ice_cream]
 {icon-image: ice_cream-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=convenience],
-area|z17-[shop=convenience]
+area|z17-[shop=convenience],
+node|z17-[shop=deli],
+area|z17-[shop=deli],
+node|z17-[shop=farm],
+area|z17-[shop=farm],
+node|z17-[shop=grocery],
+area|z17-[shop=grocery],
+node|z17-[shop=health_food],
+area|z17-[shop=health_food],
 {icon-image: grocery-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=copyshop],
 area|z17-[shop=copyshop]
@@ -2407,7 +2431,9 @@ node|z17-[shop=florist],
 area|z17-[shop=florist]
 {icon-image: florist-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=furniture],
-area|z17-[shop=furniture]
+area|z17-[shop=furniture],
+node|z17-[shop=kitchen],
+area|z17-[shop=kitchen],
 {icon-image: furniture-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=garden_centre],
 area|z17-[shop=garden_centre]
@@ -2430,7 +2456,9 @@ node|z17-[shop=hairdresser],
 area|z17-[shop=hairdresser]
 {icon-image: hairdresser-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=hardware],
-area|z17-[shop=hardware]
+area|z17-[shop=hardware],
+node|z17-[shop=houseware],
+area|z17-[shop=houseware],
 {icon-image: doityourself-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=jewelry],
 area|z17-[shop=jewelry]

data/types.txt

@@ -910,11 +910,11 @@ mapswithme
 railway|subway|tunnel
 mapswithme
 *historic|ship
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*shop|tobacco
+*shop|farm
+*shop|storage_rental
+*shop|trade
+*shop|deli
 *shop|mall
 *shop|doityourself
 *place|sea
@@ -1075,7 +1075,7 @@ route|ferry
 *amenity|vending_machine|drinks
 *amenity|waste_basket
 *building|garage
-mapswithme
+*shop|pastry
 *emergency|phone
 *highway|rest_area
 *highway|traffic_signals
@@ -1098,7 +1098,7 @@ mapswithme
 *tourism|chalet
 *tourism|information|board
 *tourism|information|map
-mapswithme
+*shop|paint
 *traffic_calming|bump
 *traffic_calming|hump
 *shop|car_parts
@@ -1109,8 +1109,8 @@ mapswithme
 *amenity|public_bookcase
 *tourism|apartment
 *tourism|resort
-mapswithme
-mapswithme
+*shop|interior_decoration
+*shop|houseware
 *hwtag|nobicycle
 *hwtag|yesbicycle
 *hwtag|bidir_bicycle
@@ -1153,8 +1153,8 @@ mapswithme
 *historic|fort
 *shop|coffee
 *shop|tea
-mapswithme
-mapswithme
+*shop|art
+*shop|charity
 *hwtag|toll
 *amenity|arts_centre
 *amenity|biergarten
@@ -1174,7 +1174,7 @@ mapswithme
 *leisure|fitness_station
 *leisure|ice_rink
 *leisure|marina
-mapswithme
+*shop|medical_supply
 *man_made|surveillance
 *man_made|water_tap
 *man_made|works
@@ -1182,7 +1182,7 @@ mapswithme
 *office|ngo
 *shop|chocolate
 *shop|erotic
-mapswithme
+*shop|kitchen
 *shop|fabric
 *shop|funeral_directors
 *shop|massage
@@ -1197,25 +1197,25 @@ mapswithme
 *shop|video
 *tourism|theme_park
 *tourism|wilderness_hut
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*shop|boutique
+*shop|lottery
+*shop|antiques
+*shop|wholesale
+*shop|perfumery
+*shop|baby_goods
+*shop|bag
+*shop|dairy
+*shop|electrical
+*shop|cheese
 *shop|money_lender
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*shop|health_food
+*shop|fishing
+*shop|grocery
+*shop|nutrition_supplements
+*shop|watches
+*shop|second_hand
+*shop|craft
+*shop|sewing
 mapswithme
 mapswithme
 mapswithme

data/visibility.txt

@@ -853,12 +853,17 @@ world  00000000000000000000  +
         {}
     shop  00000000000000000000  +
         alcohol  00000000000000000000  -
+        antiques  00000000000000000000  -
+        art  00000000000000000000  -
+        baby_goods  00000000000000000000  -
+        bag  00000000000000000000  -
         bakery  00000000000000000000  -
         beauty  00000000000000000000  -
         beverages  00000000000000000000  -
         bicycle  00000000000000000000  -
         bookmaker  00000000000000000000  -
         books  00000000000000000000  -
+        boutique  00000000000000000000  -
         butcher  00000000000000000000  -
         car  00000000000000000111  -
         car_parts  00000000000000000111  -
@@ -866,6 +871,8 @@ world  00000000000000000000  +
             tyres  00000000000000011111  -
             {}
         caravan  00000000000000000111  -
+        charity  00000000000000000000  -
+        cheese  00000000000000000000  -
         chemist  00000000000000000000  -
         chocolate  00000000000000000000  -
         clothes  00000000000000000000  -
@@ -875,50 +882,74 @@ world  00000000000000000000  +
         convenience  00000000000000000000  -
         copyshop  00000000000000000000  -
         cosmetics  00000000000000000000  -
+        craft  00000000000000000000  -
+        dairy  00000000000000000000  -
+        deli  00000000000000000000  -
         department_store  00000000000000000000  -
         doityourself  00000000000000000000  -
         dry_cleaning  00000000000000000000  -
+        electrical  00000000000000000000  -
         electronics  00000000000000000000  -
         erotic  00000000000000000000  -
         fabric  00000000000000000000  -
+        farm  00000000000000000000  -
+        fishing  00000000000000000000  -
         florist  00000000000000000000  -
         funeral_directors  00000000000000000000  -
         furniture  00000000000000000000  -
         garden_centre  00000000000000000000  -
         gift  00000000000000000000  -
         greengrocer  00000000000000000000  -
+        grocery  00000000000000000000  -
         hairdresser  00000000000000000000  -
         hardware  00000000000000000000  -
+        health_food  00000000000000000000  -
+        houseware  00000000000000000000  -
+        interior_decoration  00000000000000000000  -
         jewelry  00000000000000000000  -
         kiosk  00000000000000000000  -
+        kitchen  00000000000000000000  -
         laundry  00000000000000000000  -
+        lottery  00000000000000000000  -
         mall  00000000000000111111  -
         massage  00000000000000000000  -
+        medical_supply  00000000000000000000  -
         mobile_phone  00000000000000000000  -
         money_lender  00000000000000000000  -
         motorcycle  00000000000000000111  -
         music  00000000000000000000  -
         musical_instrument  00000000000000000000  -
         newsagent  00000000000000000000  -
+        nutrition_supplements  00000000000000000000  -
         optician  00000000000000000000  -
         outdoor  00000000000000000000  -
+        paint  00000000000000000000  -
+        pastry  00000000000000000000  -
         pawnbroker  00000000000000000000  -
+        perfumery  00000000000000000000  -
         pet  00000000000000000000  -
         photo  00000000000000000000  -
         seafood  00000000000000000000  -
+        second_hand  00000000000000000000  -
+        sewing  00000000000000000000  -
         shoes  00000000000000000000  -
         sports  00000000000000000000  -
         stationery  00000000000000000000  -
+        storage_rental  00000000000000000000  -
         supermarket  00000000000000111111  -
         tattoo  00000000000000000000  -
         tea  00000000000000000000  -
         ticket  00000000000000000000  -
+        tobacco  00000000000000000000  -
         toys  00000000000000000000  -
+        trade  00000000000000000000  -
         travel_agency  00000000000000000000  -
         tyres  00000000000000000000  -
         variety_store  00000000000000000000  -
         video  00000000000000000000  -
         video_games  00000000000000000000  -
+        watches  00000000000000000000  -
+        wholesale  00000000000000000000  -
         wine  00000000000000000000  -
         {}
     sport  00000000000000000000  +

docs/SUBWAY_GENERATION.md

@@ -3,7 +3,7 @@
 For the subway layer to be available in Organic Maps a `SUBWAY_URL`
 parameter ought to be provided to the
 [map generator](https://github.com/organicmaps/organicmaps/tree/master/tools/python/maps_generator).
-Normally you can specify the link http://osm-subway.maps.me/mapsme/latest.json
+Normally you can specify the link https://cdn.organicmaps.app/subway.json
 to a regularily updatable file.
 This instruction describes how to manually build subway layer file.
 

drape/stipple_pen_resource.cpp

@@ -2,6 +2,7 @@
 
 #include "drape/texture.hpp"
 
+#include "base/logging.hpp"
 #include "base/shared_buffer_manager.hpp"
 
 #include <cstring>
@@ -185,6 +186,12 @@ void StipplePenIndex::UploadResources(ref_ptr<dp::GraphicsContext> context, ref_
     m_pendingNodes.swap(pendingNodes);
   }
 
+  // Assume that all patterns are initialized when creating texture (ReserveResource) and uploaded once.
+  // Should provide additional logic like in ColorPalette::UploadResources, if we want multiple uploads.
+  if (m_uploadCalled)
+    LOG(LERROR, ("Multiple stipple pen texture uploads are not supported"));
+  m_uploadCalled = true;
+
   uint32_t height = 0;
   for (auto const & n : pendingNodes)
     height += n.second.GetSize().y;

drape/stipple_pen_resource.hpp

@@ -123,6 +123,8 @@ private:
 
   std::mutex m_lock;
   std::mutex m_mappingLock;
+
+  bool m_uploadCalled = false;
 };
 
 class StipplePenTexture : public DynamicTexture<StipplePenIndex, StipplePenKey,

drape/support_manager.cpp

@@ -118,10 +118,14 @@ bool SupportManager::IsVulkanForbidden(std::string const & deviceName,
   };
 
   // On these configurations we've detected fatal driver-specific Vulkan errors.
-  static std::array<Configuration, 3> const kBannedConfigurations = {
+  static Configuration const kBannedConfigurations[] = {
       Configuration{"Adreno (TM) 506", {1, 0, 31}, {42, 264, 975}},
       Configuration{"Adreno (TM) 506", {1, 1, 66}, {512, 313, 0}},
-      Configuration{"Adreno (TM) 530", {1, 1, 66}, {512, 313, 0}}
+      Configuration{"Adreno (TM) 530", {1, 1, 66}, {512, 313, 0}},
+
+      /// @todo Dashed lines stopped drawing after updating LineShape::Construct<DashedLineBuilder>.
+      /// Should obtain a device (Huawei P20) for better investigation.
+      Configuration{"Mali-G72", {1, 1, 97}, {18, 0, 0}},
   };
 
   for (auto const & d : kBannedDevices)
@@ -141,13 +145,15 @@ bool SupportManager::IsVulkanForbidden(std::string const & deviceName,
   return false;
 }
 
+// Finally, the result of this function is used in GraphicsContext::HasPartialTextureUpdates.
 bool SupportManager::IsVulkanTexturePartialUpdateBuggy(int sdkVersion,
                                                        std::string const & deviceName,
                                                        Version apiVersion,
                                                        Version driverVersion) const
 {
-  int constexpr kMinSdkVersionForVulkan10 = 29;
-  if (sdkVersion >= kMinSdkVersionForVulkan10)
+  /// @todo Assume that all Android 10+ (API 29) doesn't support Vulkan partial texture updates.
+  /// Can't say for sure is it right or not ..
+  if (sdkVersion >= 29)
     return true;
 
   // For these configurations partial updates of texture clears whole texture except part updated

drape/texture_of_colors.cpp

@@ -5,7 +5,7 @@
 
 #include <cstring>
 
-namespace  dp
+namespace dp
 {
 
 namespace
@@ -73,25 +73,28 @@ ref_ptr<Texture::ResourceInfo> ColorPalette::MapResource(ColorKey const & key, b
 void ColorPalette::UploadResources(ref_ptr<dp::GraphicsContext> context, ref_ptr<Texture> texture)
 {
   ASSERT(texture->GetFormat() == dp::TextureFormat::RGBA8, ());
-  buffer_vector<PendingColor, 16> pendingNodes;
+  bool const hasPartialTextureUpdate = context->HasPartialTextureUpdates();
+
+  std::vector<PendingColor> pendingNodes;
   {
     std::lock_guard<std::mutex> g(m_lock);
     if (m_pendingNodes.empty())
       return;
 
-    if (context->HasPartialTextureUpdates())
+    if (hasPartialTextureUpdate)
     {
       pendingNodes.swap(m_pendingNodes);
     }
     else
     {
+      // Store all colors in m_nodes, because we should update *whole* texture, if partial update is not available.
       m_nodes.insert(m_nodes.end(), m_pendingNodes.begin(), m_pendingNodes.end());
       m_pendingNodes.clear();
       pendingNodes = m_nodes;
     }
   }
 
-  if (!context->HasPartialTextureUpdates())
+  if (!hasPartialTextureUpdate)
   {
     PendingColor lastPendingColor = pendingNodes.back();
     lastPendingColor.m_color = Color::Transparent();
@@ -102,7 +105,7 @@ void ColorPalette::UploadResources(ref_ptr<dp::GraphicsContext> context, ref_ptr
     }
   }
 
-  buffer_vector<size_t, 3> ranges;
+  buffer_vector<size_t, 4> ranges;
   ranges.push_back(0);
 
   uint32_t minX = pendingNodes[0].m_rect.minX();
@@ -116,10 +119,9 @@ void ColorPalette::UploadResources(ref_ptr<dp::GraphicsContext> context, ref_ptr
     }
   }
 
-  ASSERT(context->HasPartialTextureUpdates() || ranges.size() == 1, ());
+  ASSERT(hasPartialTextureUpdate || ranges.size() == 1, ());
 
   ranges.push_back(pendingNodes.size());
-
   for (size_t i = 1; i < ranges.size(); ++i)
   {
     size_t startRange = ranges[i - 1];

drape/texture_of_colors.hpp

@@ -49,8 +49,9 @@ private:
 
   TPalette m_palette;
   TPalette m_predefinedPalette;
-  buffer_vector<PendingColor, 16> m_nodes;
-  buffer_vector<PendingColor, 16> m_pendingNodes;
+  // We have > 400 colors, no need to use buffer_vector here.
+  std::vector<PendingColor> m_nodes;
+  std::vector<PendingColor> m_pendingNodes;
   m2::PointU m_textureSize;
   m2::PointU m_cursor;
   bool m_isDebug = false;

generator/generator_tests/collector_building_parts_tests.cpp

@@ -30,7 +30,7 @@ public:
   }
 
   // OSMElementCacheReaderInterface overrides:
-  bool Read(generator::cache::Key /* id */, WayElement & /* value */) override {
+  [[noreturn]] bool Read(generator::cache::Key /* id */, WayElement & /* value */) override {
     CHECK(false, ("Should not be called"));
   }
 

generator/generator_tests/osm_type_test.cpp

@@ -557,6 +557,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Surface)
 
   TestSurfaceTypes("fine_gravel", "", "", "paved_bad");
   TestSurfaceTypes("fine_gravel", "intermediate", "", "paved_bad");
+  TestSurfaceTypes("cobblestone", "", "", "paved_bad");
 
   // We definitely should store more than 4 surface options.
   // Gravel (widely used tag) always goes to unpaved_bad which is strange sometimes.
@@ -1986,22 +1987,28 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"shop", "convenience"},
     {"shop", "copyshop"},
     {"shop", "cosmetics"},
+    {"shop", "deli"},
     {"shop", "department_store"},
     {"shop", "doityourself"},
     {"shop", "dry_cleaning"},
     {"shop", "electronics"},
     {"shop", "erotic"},
     {"shop", "fabric"},
+    {"shop", "farm"},
     {"shop", "florist"},
     {"shop", "funeral_directors"},
     {"shop", "furniture"},
     {"shop", "garden_centre"},
     {"shop", "gift"},
     {"shop", "greengrocer"},
+    {"shop", "grocery"},
     {"shop", "hairdresser"},
     {"shop", "hardware"},
+    {"shop", "houseware"},
+    {"shop", "health_food"},
     {"shop", "jewelry"},
     {"shop", "kiosk"},
+    {"shop", "kitchen"},
     {"shop", "laundry"},
     {"shop", "mall"},
     {"shop", "massage"},
@@ -2013,10 +2020,12 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"shop", "newsagent"},
     {"shop", "optician"},
     {"shop", "outdoor"},
+    {"shop", "pastry"},
     {"shop", "pawnbroker"},
     {"shop", "pet"},
     {"shop", "photo"},
     {"shop", "seafood"},
+    {"shop", "second_hand"},
     {"shop", "shoes"},
     {"shop", "sports"},
     {"shop", "stationery"},

generator/generator_tests/relation_tags_tests.cpp

@@ -22,7 +22,7 @@ public:
   }
 
   // OSMElementCacheReaderInterface overrides:
-  bool Read(Key /* id */, WayElement & /* value */) override {
+  [[noreturn]] bool Read(Key /* id */, WayElement & /* value */) override {
     CHECK(false, ("Should not be called"));
   }
 

geometry/clipping.cpp

@@ -207,6 +207,8 @@ vector<m2::SharedSpline> ClipSplineByRect(m2::RectD const & rect, m2::SharedSpli
   case RectCase::Outside: return {};
   case RectCase::Intersect: return ClipPathByRectImpl(rect, spline->GetPath());
   }
+  CHECK(false, ("Unreachable"));
+  return {};
 }
 
 std::vector<m2::SharedSpline> ClipPathByRect(m2::RectD const & rect,
@@ -218,6 +220,8 @@ std::vector<m2::SharedSpline> ClipPathByRect(m2::RectD const & rect,
   case RectCase::Outside: return {};
   case RectCase::Intersect: return ClipPathByRectImpl(rect, path);
   }
+  CHECK(false, ("Unreachable"));
+  return {};
 }
 
 void ClipPathByRectBeforeSmooth(m2::RectD const & rect, std::vector<m2::PointD> const & path,

indexer/ftypes_matcher.cpp

@@ -683,6 +683,7 @@ IsWifiChecker::IsWifiChecker()
 IsEatChecker::IsEatChecker()
 {
   // The order should be the same as in "enum class Type" declaration.
+  /// @todo Should we include shops like: confectionery and pastry, because bakery is already present?
   base::StringIL const types[] = {{"amenity", "cafe"},
                                   {"shop", "bakery"},
                                   {"amenity", "fast_food"},

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h

@@ -10,6 +10,7 @@
 @property(copy, nonatomic, readonly) NSString * targetDistance;
 @property(copy, nonatomic, readonly) NSString * targetUnits;
 @property(copy, nonatomic, readonly) NSString * turnUnits;
+@property(copy, nonatomic, readonly) NSString * speedLimit;
 @property(nonatomic, readonly) BOOL isValid;
 @property(nonatomic, readonly) CGFloat progress;
 @property(nonatomic, readonly) CLLocation * pedestrianDirectionPosition;

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm

@@ -21,6 +21,7 @@
 @property(copy, nonatomic, readwrite) NSString * targetDistance;
 @property(copy, nonatomic, readwrite) NSString * targetUnits;
 @property(copy, nonatomic, readwrite) NSString * turnUnits;
+@property(copy, nonatomic, readwrite) NSString * speedLimit;
 @property(nonatomic, readwrite) BOOL isValid;
 @property(nonatomic, readwrite) CGFloat progress;
 @property(nonatomic, readwrite) CLLocation * pedestrianDirectionPosition;

iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm

@@ -106,6 +106,7 @@ NSAttributedString *estimate(NSTimeInterval time, NSAttributedString *dot, NSStr
 @property(copy, nonatomic, readwrite) NSString *targetDistance;
 @property(copy, nonatomic, readwrite) NSString *targetUnits;
 @property(copy, nonatomic, readwrite) NSString *turnUnits;
+@property(copy, nonatomic, readwrite) NSString *speedLimit;
 @property(nonatomic, readwrite) BOOL isValid;
 @property(nonatomic, readwrite) CGFloat progress;
 @property(nonatomic, readwrite) CLLocation *pedestrianDirectionPosition;
@@ -150,6 +151,7 @@ NSAttributedString *estimate(NSTimeInterval time, NSAttributedString *dot, NSStr
     entity.distanceToTurn = @(info.m_distToTurn.c_str());
     entity.turnUnits = [self localizedUnitLength:@(info.m_turnUnitsSuffix.c_str())];
     entity.streetName = @(info.m_displayedStreetName.c_str());
+    entity.speedLimit = @(info.m_speedLimit.c_str());
 
     entity.estimate = estimate(entity.timeToTarget, entity.estimateDot, entity.targetDistance, entity.targetUnits,
                                self.etaAttributes, self.etaSecondaryAttributes, NO);

iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift

@@ -155,7 +155,11 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO
       }
     }
 
-    let speed = info.speed ?? "0"
+    var speed = info.speed ?? "0"
+    if (info.speedLimit != "") {
+      speed += " / " + info.speedLimit;
+    }
+    
     speedLabel.text = speed
     speedLegendLabel.text = info.speedUnits
     let speedWithLegend = NSMutableAttributedString(string: speed, attributes: routingNumberAttributes)

iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "مستحضرات تجميل";
 
+"type.shop.deli" = "ﺔﺒﻠﻌﻤﻟﺍ ﺔﻤﻌﻃﻷﺍ ﻊﻴﺒﻟ ﻞﺤﻣ";
+
 "type.shop.department_store" = "متجر شامل";
 
 "type.shop.doityourself" = "متجر عدد وأدوات";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "متجر";
 
+"type.shop.farm" = "ﺔﻋﺭﺰﻤﻟﺍ ﺔﻳﺬﻏﺃ ﺮﺠﺘﻣ";
+
 "type.shop.florist" = "متجر زهور";
 
 "type.shop.funeral_directors" = "منظموا الجنازات";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "متجر خضروات وفواكه";
 
+"type.shop.grocery" = "ﺕﺍﻭﺮﻀﺧ";
+
 "type.shop.hairdresser" = "مصفف شعر";
 
-"type.shop.hardware" = "متجر عدد وأدوات";
+"type.shop.hardware" = "ﺕﺍﺪﻌﻣ ﻞﺤﻣ";
+
+"type.shop.health_food" = "ﺔﻴﺤﺼﻟﺍ ﺔﻳﺬﻏﻼﻟ ﺮﺠﺘﻣ";
+
+"type.shop.houseware" = "ﺔﻴﻟﺰﻨﻣ ﺕﺍﻭﺩﺃ ﻞﺤﻣ";
 
 "type.shop.jewelry" = "مجوهرات";
 
 "type.shop.kiosk" = "كشك";
 
+"type.shop.kitchen" = "ﺦﺒﻄﻤﻟﺍ ﺮﺠﺘﻣ";
+
 "type.shop.laundry" = "مغسلة ملابس";
 
 "type.shop.mall" = "مركز تسوق";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "معدات خارجية";
 
+"type.shop.pastry" = "ﺕﺎﻨﺠﻌﻣ";
+
 "type.shop.pawnbroker" = "سمسار تسليف";
 
 "type.shop.pet" = "متجر للحيوانات الأليفة";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "سماك";
 
+"type.shop.second_hand" = "ﺔﻠﻤﻌﺘﺴﻣ ﺕﺍﻭﺩﺍ ﺮﺠﺘﻣ";
+
 "type.shop.shoes" = "متجر أحذية";
 
 "type.shop.sports" = "أدوات رياضية";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "متجر مشروبات روحية";
 
+"type.shop.antiques" = "ﻒﺤﺘﻟﺍ";
+
+"type.shop.art" = "ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ";
+
+"type.shop.baby_goods" = "ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ";
+
+"type.shop.bag" = "ﺐﺋﺎﻘﺤﻟﺍ ﺮﺠﺘﻣ";
+
+"type.shop.boutique" = "ﺮﺠﺘﻣ";
+
+"type.shop.charity" = "ﻱﺮﻴﺧ ﺮﺠﺘﻣ";
+
+"type.shop.cheese" = "ﻦﺒﺠﻟﺍ ﺮﺠﺘﻣ";
+
+"type.shop.craft" = "ﺔﻳﻭﺪﻴﻟﺍ ﻑﺮﺤﻟﺍﻭ ﻥﻮﻨﻔﻟﺍ";
+
+"type.shop.dairy" = "ﻥﺎﺒﻟﻷﺍ ﺕﺎﺠﺘﻨﻣ";
+
+"type.shop.electrical" = "ﺔﻴﺋﺎﺑﺮﻬﻜﻟﺍ ﺕﺍﻭﺩﻷﺍ ﺮﺠﺘﻣ";
+
+"type.shop.fishing" = "ﺪﻴﺻ ﺮﺠﺘﻣ";
+
+"type.shop.interior_decoration" = "ﺔﻴﻠﺧﺍﺩ ﺕﺍﺭﻮﻜﻳﺩ";
+
+"type.shop.lottery" = "ﺐﻴﺼﻧﺎﻴﻟﺍ ﺮﻛﺍﺬﺗ";
+
+"type.shop.medical_supply" = "ﺔﻴﺒﻄﻟﺍ ﺕﺍﺩﺍﺪﻣﻹﺍ";
+
+"type.shop.nutrition_supplements" = "ﺔﻴﺋﺍﺬﻏ ﺕﻼﻤﻜﻣ";
+
+"type.shop.paint" = "ﺕﺎﻧﺎﻫﺪﻟﺍ";
+
+"type.shop.perfumery" = "ﺭﻮﻄﻌﻟﺍ";
+
+"type.shop.sewing" = "ﺔﻃﺎﻴﺨﻟﺍ ﺕﺍﺪﻌﻣ";
+
+"type.shop.storage_rental" = "ﻦﻳﺰﺨﺘﻟﺍ ﺕﺍﺪﺣﻭ ﺮﻴﺟﺄﺗ";
+
+"type.shop.tobacco" = "ﻎﺒﺗ";
+
+"type.shop.trade" = "ﺔﻳﺭﺎﺠﺘﻟﺍ ﺕﺍﺪﻳﺭﻮﺘﻟﺍ";
+
+"type.shop.watches" = "ﺕﺎﻋﺎﺳ";
+
+"type.shop.wholesale" = "ﺔﻠﻤﺠﻟﺎﺑ ﺔﻴﺋﺍﺬﻐﻟﺍ ﺩﺍﻮﻤﻟﺍ ﺓﺭﺎﺠﺗ";
+
 "type.sport" = "رياضة";
 
 "type.sport.american_football" = "كرة القدم الأمريكية";

iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Касметыка";
 
+"type.shop.deli" = "Дэлікатэсная крама";
+
 "type.shop.department_store" = "Department Store";
 
 "type.shop.doityourself" = "Hardware Store";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Shop";
 
+"type.shop.farm" = "Сельскагаспадарчыя прадукты";
+
 "type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Рытуальныя паслугі";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Greengrocer's";
 
+"type.shop.grocery" = "Бакалея";
+
 "type.shop.hairdresser" = "Hairdresser";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Будаўнічы магазін";
+
+"type.shop.health_food" = "Крама здаровай ежы";
+
+"type.shop.houseware" = "Крама посуду";
 
 "type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
+"type.shop.kitchen" = "Крама для кухні";
+
 "type.shop.laundry" = "Laundry";
 
 "type.shop.mall" = "Mall";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Outdoor Equipment";
 
+"type.shop.pastry" = "Кандытарскія вырабы";
+
 "type.shop.pawnbroker" = "Pawnbroker";
 
 "type.shop.pet" = "Petshop";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Seafood Shop";
 
+"type.shop.second_hand" = "Крама сэканд-хэнд";
+
 "type.shop.shoes" = "Shoe Store";
 
 "type.shop.sports" = "Sports Goods";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Wine Shop";
 
+"type.shop.antiques" = "Антыкварыят";
+
+"type.shop.art" = "Крама мастацтваў";
+
+"type.shop.baby_goods" = "Дзіцячая крама";
+
+"type.shop.bag" = "Крама сумак";
+
+"type.shop.boutique" = "Буцік";
+
+"type.shop.charity" = "Дабрачынная крама";
+
+"type.shop.cheese" = "Сырны магазін";
+
+"type.shop.craft" = "Мастацтва і рамёствы";
+
+"type.shop.dairy" = "Малочныя прадукты";
+
+"type.shop.electrical" = "Крама электратэхнікі";
+
+"type.shop.fishing" = "Рыбалоўны магазін";
+
+"type.shop.interior_decoration" = "Ўпрыгажэнні інтэр'еру";
+
+"type.shop.lottery" = "Латарэйныя білеты";
+
+"type.shop.medical_supply" = "Медыцынскія прыналежнасці";
+
+"type.shop.nutrition_supplements" = "Харчовыя дабаўкі";
+
+"type.shop.paint" = "Фарбы";
+
+"type.shop.perfumery" = "Парфумерыя";
+
+"type.shop.sewing" = "Швейныя прыналежнасці";
+
+"type.shop.storage_rental" = "Арэнда сховішчаў";
+
+"type.shop.tobacco" = "Тытунь";
+
+"type.shop.trade" = "Гандлёвая прыналежнасць";
+
+"type.shop.watches" = "Гадзіннік";
+
+"type.shop.wholesale" = "Аптовая крама";
+
 "type.sport" = "Спорт";
 
 "type.sport.american_football" = "Амерыканскі футбол";

iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Cosmetics";
 
+"type.shop.deli" = "Магазин за деликатеси";
+
 "type.shop.department_store" = "Department Store";
 
 "type.shop.doityourself" = "Hardware Store";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Shop";
 
+"type.shop.farm" = "Магазин за селскостопански храни";
+
 "type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Greengrocer's";
 
+"type.shop.grocery" = "Хранителни стоки";
+
 "type.shop.hairdresser" = "Hairdresser";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "Магазин за хардуер";
+
+"type.shop.health_food" = "Магазин за здравословни храни";
+
+"type.shop.houseware" = "Магазин за домакински принадлежности";
 
 "type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
+"type.shop.kitchen" = "Магазин за кухня";
+
 "type.shop.laundry" = "Laundry";
 
 "type.shop.mall" = "Mall";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Outdoor Equipment";
 
+"type.shop.pastry" = "Тестени изделия";
+
 "type.shop.pawnbroker" = "Pawnbroker";
 
 "type.shop.pet" = "Petshop";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Seafood Shop";
 
+"type.shop.second_hand" = "Магазин втора употреба";
+
 "type.shop.shoes" = "Shoe Store";
 
 "type.shop.sports" = "Sports Goods";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Wine Shop";
 
+"type.shop.antiques" = "Антики";
+
+"type.shop.art" = "Магазин за изкуства";
+
+"type.shop.baby_goods" = "Детски магазин";
+
+"type.shop.bag" = "Магазин за чанти";
+
+"type.shop.boutique" = "Бутик";
+
+"type.shop.charity" = "Благотворителен магазин";
+
+"type.shop.cheese" = "Магазин за сирене";
+
+"type.shop.craft" = "Изкуства и занаяти";
+
+"type.shop.dairy" = "Млечни продукти";
+
+"type.shop.electrical" = "Електрически магазин";
+
+"type.shop.fishing" = "Риболовен магазин";
+
+"type.shop.interior_decoration" = "Вътрешни декорации";
+
+"type.shop.lottery" = "Лотарийни билети";
+
+"type.shop.medical_supply" = "Медицински изделия";
+
+"type.shop.nutrition_supplements" = "Хранителни добавки";
+
+"type.shop.paint" = "Бои";
+
+"type.shop.perfumery" = "Парфюмерия";
+
+"type.shop.sewing" = "Шивашки консумативи";
+
+"type.shop.storage_rental" = "Склад под наем";
+
+"type.shop.tobacco" = "Тютюн";
+
+"type.shop.trade" = "Търговия с консумативи";
+
+"type.shop.watches" = "Часовници";
+
+"type.shop.wholesale" = "Магазин на едро";
+
 "type.sport" = "Спорт";
 
 "type.sport.american_football" = "Американски футбол";

iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Kosmetika";
 
+"type.shop.deli" = "Prodejna lahůdek";
+
 "type.shop.department_store" = "Obchodní dům";
 
 "type.shop.doityourself" = "Železářství";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Obchod";
 
+"type.shop.farm" = "Prodejna farmářských potravin";
+
 "type.shop.florist" = "Květinářství";
 
 "type.shop.funeral_directors" = "Pohřební služba";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Ovoce a zelenina";
 
+"type.shop.grocery" = "Potraviny";
+
 "type.shop.hairdresser" = "Kadeřnictví";
 
 "type.shop.hardware" = "Železářství";
 
+"type.shop.health_food" = "Prodejna zdravé výživy";
+
+"type.shop.houseware" = "Obchod s domácími potřebami";
+
 "type.shop.jewelry" = "Klenotnictví";
 
 "type.shop.kiosk" = "Kiosk";
 
+"type.shop.kitchen" = "Prodejna kuchyní";
+
 "type.shop.laundry" = "Prádelna";
 
 "type.shop.mall" = "Obchoďák";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Venkovní vybavení";
 
+"type.shop.pastry" = "Pečivo";
+
 "type.shop.pawnbroker" = "Zastavárna";
 
 "type.shop.pet" = "Zverimex";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Prodej ryb";
 
+"type.shop.second_hand" = "Obchod z druhé ruky";
+
 "type.shop.shoes" = "Obuv";
 
 "type.shop.sports" = "Sportovní zboží";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Vinařství";
 
+"type.shop.antiques" = "Starožitnosti";
+
+"type.shop.art" = "Obchod s uměním";
+
+"type.shop.baby_goods" = "Dětský obchod";
+
+"type.shop.bag" = "Obchod s taškami";
+
+"type.shop.boutique" = "Butik";
+
+"type.shop.charity" = "Charitativní obchod";
+
+"type.shop.cheese" = "Prodejna sýrů";
+
+"type.shop.craft" = "Umění a řemesla";
+
+"type.shop.dairy" = "Mléčné výrobky";
+
+"type.shop.electrical" = "Elektro obchod";
+
+"type.shop.fishing" = "Rybářský obchod";
+
+"type.shop.interior_decoration" = "Interiérové dekorace";
+
+"type.shop.lottery" = "Loterijní lístky";
+
+"type.shop.medical_supply" = "Zdravotní zásoby";
+
+"type.shop.nutrition_supplements" = "Doplňky výživy";
+
+"type.shop.paint" = "Barvy";
+
+"type.shop.perfumery" = "Parfumerie";
+
+"type.shop.sewing" = "Šicí potřeby";
+
+"type.shop.storage_rental" = "Pronájem skladu";
+
+"type.shop.tobacco" = "Tabák";
+
+"type.shop.trade" = "Obchod se zásobami";
+
+"type.shop.watches" = "Hodinky";
+
+"type.shop.wholesale" = "Velkoobchodní prodejna";
+
 "type.sport" = "Sport";
 
 "type.sport.american_football" = "Americký fotbal";

iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Kosmetik";
 
+"type.shop.deli" = "Delikatessebutik";
+
 "type.shop.department_store" = "Stormagasin";
 
 "type.shop.doityourself" = "Isenkræmmer";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Butik";
 
+"type.shop.farm" = "Farm Food Shop";
+
 "type.shop.florist" = "Blomsterbutik";
 
 "type.shop.funeral_directors" = "Bedemand";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Grønthandler";
 
+"type.shop.grocery" = "Købmand";
+
 "type.shop.hairdresser" = "Frisør";
 
 "type.shop.hardware" = "Isenkræmmer";
 
+"type.shop.health_food" = "Helsekostbutik";
+
+"type.shop.houseware" = "Husholdningsartikler butik";
+
 "type.shop.jewelry" = "Smykkebutik";
 
 "type.shop.kiosk" = "Kiosk";
 
+"type.shop.kitchen" = "Køkkenforretning";
+
 "type.shop.laundry" = "Vaskeri";
 
 "type.shop.mall" = "Indkøbscenter";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Fritidsudstyr";
 
+"type.shop.pastry" = "Bagværk";
+
 "type.shop.pawnbroker" = "Pantelåner";
 
 "type.shop.pet" = "Dyrehandel";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Fiskehandler";
 
+"type.shop.second_hand" = "Genbrugsbutik";
+
 "type.shop.shoes" = "Skobutik";
 
 "type.shop.sports" = "Sportsudstyr";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Vinhandel";
 
+"type.shop.antiques" = "Antikviteter";
+
+"type.shop.art" = "Kunstbutik";
+
+"type.shop.baby_goods" = "Børnebutik";
+
+"type.shop.bag" = "Tasker butik";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Velgørenhedsbutik";
+
+"type.shop.cheese" = "Ostebutik";
+
+"type.shop.craft" = "Kunst og kunsthåndværk";
+
+"type.shop.dairy" = "Mejeriprodukter";
+
+"type.shop.electrical" = "El-butik";
+
+"type.shop.fishing" = "Fiskeri butik";
+
+"type.shop.interior_decoration" = "Indvendige dekorationer";
+
+"type.shop.lottery" = "Lotterikuponer";
+
+"type.shop.medical_supply" = "Medicinske forsyninger";
+
+"type.shop.nutrition_supplements" = "Kosttilskud";
+
+"type.shop.paint" = "Maling";
+
+"type.shop.perfumery" = "Parfumeri";
+
+"type.shop.sewing" = "Syudstyr";
+
+"type.shop.storage_rental" = "Lagerudlejning";
+
+"type.shop.tobacco" = "Tobak";
+
+"type.shop.trade" = "Handler forsyninger";
+
+"type.shop.watches" = "Ure";
+
+"type.shop.wholesale" = "Engros butik";
+
 "type.sport" = "Sport";
 
 "type.sport.american_football" = "Amerikansk fodbold";

iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Kosmetikgeschäft";
 
+"type.shop.deli" = "Feinkostgeschäft";
+
 "type.shop.department_store" = "Kaufhaus";
 
 "type.shop.doityourself" = "Baumarkt";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Textilgeschäft";
 
+"type.shop.farm" = "Hoflebensmittelladen";
+
 "type.shop.florist" = "Florist";
 
 "type.shop.funeral_directors" = "Bestattungsinstitut";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Gemüseladen";
 
+"type.shop.grocery" = "Lebensmittelgeschäft";
+
 "type.shop.hairdresser" = "Friseur";
 
-"type.shop.hardware" = "Eisenwarengeschäft";
+"type.shop.hardware" = "Baumarkt";
+
+"type.shop.health_food" = "Reformhaus";
+
+"type.shop.houseware" = "Haushaltswarengeschäft";
 
 "type.shop.jewelry" = "Juweliergeschäft";
 
 "type.shop.kiosk" = "Kiosk";
 
+"type.shop.kitchen" = "Küchengeschäft";
+
 "type.shop.laundry" = "Wäscherei";
 
 "type.shop.mall" = "Einkaufszentrum";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Outdoor-Ausrüstung";
 
+"type.shop.pastry" = "Gebäck";
+
 "type.shop.pawnbroker" = "Pfandleihe";
 
 "type.shop.pet" = "Tierhandlung";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Fischhändler";
 
+"type.shop.second_hand" = "Second-Hand-Laden";
+
 "type.shop.shoes" = "Schuhgeschäft";
 
 "type.shop.sports" = "Sportartikel";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Wein- und Spirituosengeschäft";
 
+"type.shop.antiques" = "Antiquitäten";
+
+"type.shop.art" = "Kunstgeschäft";
+
+"type.shop.baby_goods" = "Kinderladen";
+
+"type.shop.bag" = "Taschen Shop";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Wohltätigkeitsladen";
+
+"type.shop.cheese" = "Käseladen";
+
+"type.shop.craft" = "Kunst und Handwerk";
+
+"type.shop.dairy" = "Milchprodukte";
+
+"type.shop.electrical" = "Elektrogeschäft";
+
+"type.shop.fishing" = "Angelgeschäft";
+
+"type.shop.interior_decoration" = "Innendekorationen";
+
+"type.shop.lottery" = "Lotteriescheine";
+
+"type.shop.medical_supply" = "Medizinische Versorgung";
+
+"type.shop.nutrition_supplements" = "Nahrungsergänzungsmittel";
+
+"type.shop.paint" = "Farben";
+
+"type.shop.perfumery" = "Parfümerie";
+
+"type.shop.sewing" = "Nähzubehör";
+
+"type.shop.storage_rental" = "Speichermiete";
+
+"type.shop.tobacco" = "Tabak";
+
+"type.shop.trade" = "Handelsbedarf";
+
+"type.shop.watches" = "Uhren";
+
+"type.shop.wholesale" = "Großhandelsgeschäft";
+
 "type.sport" = "Sport";
 
 "type.sport.american_football" = "American Football";

iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Καλλυντικά";
 
+"type.shop.deli" = "Κατάστημα Delicatessen";
+
 "type.shop.department_store" = "Πολυκατάστημα";
 
 "type.shop.doityourself" = "Είδη κιγκαλερίας";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Κατάστημα";
 
+"type.shop.farm" = "Κατάστημα Αγροτικών Τροφίμων";
+
 "type.shop.florist" = "Ανθοπωλείο";
 
 "type.shop.funeral_directors" = "Γραφεία τελετών";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Μανάβικο";
 
+"type.shop.grocery" = "Παντοπωλείο";
+
 "type.shop.hairdresser" = "Κομμωτής";
 
-"type.shop.hardware" = "Είδη κιγκαλερίας";
+"type.shop.hardware" = "Κατάστημα υλικού";
+
+"type.shop.health_food" = "Κατάστημα υγιεινής διατροφής";
+
+"type.shop.houseware" = "Κατάστημα οικιακών ειδών";
 
 "type.shop.jewelry" = "Κοσμηματοπωλείο";
 
 "type.shop.kiosk" = "Περίπτερο";
 
+"type.shop.kitchen" = "Κατάστημα κουζίνας";
+
 "type.shop.laundry" = "Άπλυτα";
 
 "type.shop.mall" = "Εμπορικό κέντρο";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Εξοπλισμός υπαίθρου";
 
+"type.shop.pastry" = "Ζύμη";
+
 "type.shop.pawnbroker" = "Ενεχυροδανειστήριο";
 
 "type.shop.pet" = "Κατάστημα για κατοικίδια";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Κατάστημα με θαλασσινά";
 
+"type.shop.second_hand" = "Κατάστημα μεταχειρισμένων";
+
 "type.shop.shoes" = "Υποδηματοπωλείο";
 
 "type.shop.sports" = "Αθλητικά είδη";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Οινοπωλείο";
 
+"type.shop.antiques" = "Αντίκες";
+
+"type.shop.art" = "Κατάστημα Τεχνών";
+
+"type.shop.baby_goods" = "Παιδικό κατάστημα";
+
+"type.shop.bag" = "Κατάστημα τσαντών";
+
+"type.shop.boutique" = "Μπουτίκ";
+
+"type.shop.charity" = "Φιλανθρωπικό κατάστημα";
+
+"type.shop.cheese" = "Τυροκομείο";
+
+"type.shop.craft" = "Τέχνες και χειροτεχνήματα";
+
+"type.shop.dairy" = "Γαλακτοκομικά προϊόντα";
+
+"type.shop.electrical" = "Μαγαζί ηλεκτρικών ειδών";
+
+"type.shop.fishing" = "Κατάστημα ψαρέματος";
+
+"type.shop.interior_decoration" = "Διακοσμήσεις εσωτερικών χώρων";
+
+"type.shop.lottery" = "Λαχεία";
+
+"type.shop.medical_supply" = "Ιατρικά Είδη";
+
+"type.shop.nutrition_supplements" = "Συμπληρώματα Διατροφής";
+
+"type.shop.paint" = "Βαφές";
+
+"type.shop.perfumery" = "Αρωματοποιία";
+
+"type.shop.sewing" = "Είδη Ραπτικής";
+
+"type.shop.storage_rental" = "Ενοικίαση αποθηκευτικού χώρου";
+
+"type.shop.tobacco" = "Καπνός";
+
+"type.shop.trade" = "Εμπόριο Προμήθειες";
+
+"type.shop.watches" = "Ρολόγια";
+
+"type.shop.wholesale" = "Κατάστημα χονδρικής";
+
 "type.sport" = "Αθλητισμός";
 
 "type.sport.american_football" = "αμερικάνικο ποδόσφαιρο";

iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Cosmetics";
 
+"type.shop.deli" = "Delicatessen Shop";
+
 "type.shop.department_store" = "Department Store";
 
 "type.shop.doityourself" = "Hardware Store";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Shop";
 
+"type.shop.farm" = "Farm Food Shop";
+
 "type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Greengrocer's";
 
+"type.shop.grocery" = "Grocery";
+
 "type.shop.hairdresser" = "Hairdresser";
 
 "type.shop.hardware" = "Hardware Store";
 
+"type.shop.health_food" = "Health Food Shop";
+
+"type.shop.houseware" = "Hardware Store";
+
 "type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
+"type.shop.kitchen" = "Kitchen Store";
+
 "type.shop.laundry" = "Laundry";
 
 "type.shop.mall" = "Mall";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Outdoor Equipment";
 
+"type.shop.pastry" = "Bakery";
+
 "type.shop.pawnbroker" = "Pawnbroker";
 
 "type.shop.pet" = "Petshop";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Seafood Shop";
 
+"type.shop.second_hand" = "Second Hand";
+
 "type.shop.shoes" = "Shoe Store";
 
 "type.shop.sports" = "Sports Goods";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Wine Shop";
 
+"type.shop.antiques" = "Antiques";
+
+"type.shop.art" = "Arts Shop";
+
+"type.shop.baby_goods" = "Baby Goods";
+
+"type.shop.bag" = "Bags Store";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Charity Shop";
+
+"type.shop.cheese" = "Cheese Store";
+
+"type.shop.craft" = "Arts and Crafts";
+
+"type.shop.dairy" = "Dairy Products";
+
+"type.shop.electrical" = "Electrical Store";
+
+"type.shop.fishing" = "Fishing Store";
+
+"type.shop.interior_decoration" = "Interior Decorations";
+
+"type.shop.lottery" = "Lottery Tickets";
+
+"type.shop.medical_supply" = "Medical Supplies";
+
+"type.shop.nutrition_supplements" = "Nutrition Supplements";
+
+"type.shop.paint" = "Paints";
+
+"type.shop.perfumery" = "Perfumery";
+
+"type.shop.sewing" = "Sewing Supplies";
+
+"type.shop.storage_rental" = "Storage Rental";
+
+"type.shop.tobacco" = "Tobacco";
+
+"type.shop.trade" = "Trades Supplies";
+
+"type.shop.watches" = "Watches";
+
+"type.shop.wholesale" = "Wholesale Store";
+
 "type.sport" = "Sport";
 
 "type.sport.american_football" = "American Football";

iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Cosmetics";
 
+"type.shop.deli" = "Delicatessen Shop";
+
 "type.shop.department_store" = "Department Store";
 
 "type.shop.doityourself" = "Hardware Store";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Shop";
 
+"type.shop.farm" = "Farm Food Shop";
+
 "type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Greengrocer's";
 
+"type.shop.grocery" = "Grocery";
+
 "type.shop.hairdresser" = "Hairdresser";
 
 "type.shop.hardware" = "Hardware Store";
 
+"type.shop.health_food" = "Health Food Shop";
+
+"type.shop.houseware" = "Houseware";
+
 "type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
+"type.shop.kitchen" = "Kitchen Store";
+
 "type.shop.laundry" = "Laundry";
 
 "type.shop.mall" = "Mall";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Outdoor Equipment";
 
+"type.shop.pastry" = "Pastry";
+
 "type.shop.pawnbroker" = "Pawnbroker";
 
 "type.shop.pet" = "Petshop";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Seafood Shop";
 
+"type.shop.second_hand" = "Second Hand";
+
 "type.shop.shoes" = "Shoe Store";
 
 "type.shop.sports" = "Sports Goods";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Wine Shop";
 
+"type.shop.antiques" = "Antiques";
+
+"type.shop.art" = "Arts Shop";
+
+"type.shop.baby_goods" = "Baby Goods";
+
+"type.shop.bag" = "Bags Store";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Charity Shop";
+
+"type.shop.cheese" = "Cheese Store";
+
+"type.shop.craft" = "Arts and Crafts";
+
+"type.shop.dairy" = "Dairy Products";
+
+"type.shop.electrical" = "Electrical Store";
+
+"type.shop.fishing" = "Fishing Store";
+
+"type.shop.interior_decoration" = "Interior Decorations";
+
+"type.shop.lottery" = "Lottery Tickets";
+
+"type.shop.medical_supply" = "Medical Supplies";
+
+"type.shop.nutrition_supplements" = "Nutrition Supplements";
+
+"type.shop.paint" = "Paints";
+
+"type.shop.perfumery" = "Perfumery";
+
+"type.shop.sewing" = "Sewing Supplies";
+
+"type.shop.storage_rental" = "Storage Rental";
+
+"type.shop.tobacco" = "Tobacco";
+
+"type.shop.trade" = "Trades Supplies";
+
+"type.shop.watches" = "Watches";
+
+"type.shop.wholesale" = "Wholesale Store";
+
 "type.sport" = "Sport";
 
 "type.sport.american_football" = "American Football";

iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Productos cosméticos";
 
+"type.shop.deli" = "Tienda de delicatessen";
+
 "type.shop.department_store" = "Grandes almacenes";
 
 "type.shop.doityourself" = "Ferretería";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Tienda";
 
+"type.shop.farm" = "Tienda de alimentos de granja";
+
 "type.shop.florist" = "Floristería";
 
 "type.shop.funeral_directors" = "Funeraria";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Frutería";
 
+"type.shop.grocery" = "Tienda de comestibles";
+
 "type.shop.hairdresser" = "Peluquería";
 
 "type.shop.hardware" = "Ferretería";
 
+"type.shop.health_food" = "Tienda de comida saludable";
+
+"type.shop.houseware" = "Ferretería";
+
 "type.shop.jewelry" = "Joyería";
 
 "type.shop.kiosk" = "Quiosco";
 
+"type.shop.kitchen" = "Tienda de cocina";
+
 "type.shop.laundry" = "Lavandería";
 
 "type.shop.mall" = "Centro comercial";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Equipamiento";
 
+"type.shop.pastry" = "Panadería";
+
 "type.shop.pawnbroker" = "Casa de empeños";
 
 "type.shop.pet" = "Tienda de mascotas";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Pescadería";
 
+"type.shop.second_hand" = "Tienda de segunda mano";
+
 "type.shop.shoes" = "Zapatería";
 
 "type.shop.sports" = "Artículos de deporte";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Tienda de vinos";
 
+"type.shop.antiques" = "Antigüedades";
+
+"type.shop.art" = "Tienda de artes";
+
+"type.shop.baby_goods" = "Tienda de niños";
+
+"type.shop.bag" = "Tienda de bolsos";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Tienda de caridad";
+
+"type.shop.cheese" = "Tienda de queso";
+
+"type.shop.craft" = "Artes y manualidades";
+
+"type.shop.dairy" = "Productos lácteos";
+
+"type.shop.electrical" = "Tienda de electricidad";
+
+"type.shop.fishing" = "Tienda de pesca";
+
+"type.shop.interior_decoration" = "Decoraciones interiores";
+
+"type.shop.lottery" = "Boletos de lotería";
+
+"type.shop.medical_supply" = "Suministros médicos";
+
+"type.shop.nutrition_supplements" = "Suplementos Nutricionales";
+
+"type.shop.paint" = "Pinturas";
+
+"type.shop.perfumery" = "Perfumería";
+
+"type.shop.sewing" = "Materiales de costura";
+
+"type.shop.storage_rental" = "Alquiler de almacenamiento";
+
+"type.shop.tobacco" = "Tabaco";
+
+"type.shop.trade" = "Suministros comerciales";
+
+"type.shop.watches" = "Relojes";
+
+"type.shop.wholesale" = "Almacén al por mayor";
+
 "type.sport" = "Deporte";
 
 "type.sport.american_football" = "Fútbol americano";

iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Productos cosméticos";
 
+"type.shop.deli" = "Tienda de delicatessen";
+
 "type.shop.department_store" = "Grandes almacenes";
 
 "type.shop.doityourself" = "Ferretería";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Tienda";
 
+"type.shop.farm" = "Tienda de alimentos de granja";
+
 "type.shop.florist" = "Floristería";
 
 "type.shop.funeral_directors" = "Funeraria";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Frutería";
 
+"type.shop.grocery" = "Tienda de comestibles";
+
 "type.shop.hairdresser" = "Peluquería";
 
 "type.shop.hardware" = "Ferretería";
 
+"type.shop.health_food" = "Tienda de comida saludable";
+
+"type.shop.houseware" = "Tienda de artículos para el hogar";
+
 "type.shop.jewelry" = "Joyería";
 
 "type.shop.kiosk" = "Quiosco";
 
+"type.shop.kitchen" = "Tienda de cocina";
+
 "type.shop.laundry" = "Lavandería";
 
 "type.shop.mall" = "Centro comercial";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Equipamiento";
 
+"type.shop.pastry" = "Pastelería";
+
 "type.shop.pawnbroker" = "Casa de empeños";
 
 "type.shop.pet" = "Tienda de mascotas";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Pescadería";
 
+"type.shop.second_hand" = "Tienda de segunda mano";
+
 "type.shop.shoes" = "Zapatería";
 
 "type.shop.sports" = "Artículos de deporte";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Tienda de vinos";
 
+"type.shop.antiques" = "Antigüedades";
+
+"type.shop.art" = "Tienda de artes";
+
+"type.shop.baby_goods" = "Tienda de niños";
+
+"type.shop.bag" = "Tienda de bolsos";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Tienda de caridad";
+
+"type.shop.cheese" = "Tienda de queso";
+
+"type.shop.craft" = "Artes y manualidades";
+
+"type.shop.dairy" = "Productos lácteos";
+
+"type.shop.electrical" = "Tienda de electricidad";
+
+"type.shop.fishing" = "Tienda de pesca";
+
+"type.shop.interior_decoration" = "Decoraciones interiores";
+
+"type.shop.lottery" = "Boletos de lotería";
+
+"type.shop.medical_supply" = "Suministros médicos";
+
+"type.shop.nutrition_supplements" = "Suplementos Nutricionales";
+
+"type.shop.paint" = "Pinturas";
+
+"type.shop.perfumery" = "Perfumería";
+
+"type.shop.sewing" = "Materiales de costura";
+
+"type.shop.storage_rental" = "Alquiler de almacenamiento";
+
+"type.shop.tobacco" = "Tabaco";
+
+"type.shop.trade" = "Suministros comerciales";
+
+"type.shop.watches" = "Relojes";
+
+"type.shop.wholesale" = "Almacén al por mayor";
+
 "type.sport" = "Deporte";
 
 "type.sport.american_football" = "Fútbol americano";

iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Produktu kosmetikoak";
 
+"type.shop.deli" = "Delicatesen Denda";
+
 "type.shop.department_store" = "Denda handiak";
 
 "type.shop.doityourself" = "Burdindegia";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Denda";
 
+"type.shop.farm" = "Baserriko Janari Denda";
+
 "type.shop.florist" = "Loradenda";
 
 "type.shop.funeral_directors" = "Tanatorioa";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Fruta denda";
 
+"type.shop.grocery" = "Janariak";
+
 "type.shop.hairdresser" = "Barber-denda";
 
-"type.shop.hardware" = "Burdindegia";
+"type.shop.hardware" = "Hardware denda";
+
+"type.shop.health_food" = "Osasuneko Elikagaien Denda";
+
+"type.shop.houseware" = "Etxeko tresneria denda";
 
 "type.shop.jewelry" = "Bitxiak";
 
 "type.shop.kiosk" = "Kioskoa";
 
+"type.shop.kitchen" = "Sukalde-denda";
+
 "type.shop.laundry" = "Garbitegia";
 
 "type.shop.mall" = "Merkataritza-gune";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Ekipamendua";
 
+"type.shop.pastry" = "Gozogintza";
+
 "type.shop.pawnbroker" = "Peoia";
 
 "type.shop.pet" = "Animali denda";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Arrain-denda";
 
+"type.shop.second_hand" = "Bigarren eskuko denda";
+
 "type.shop.shoes" = "Zapata-denda";
 
 "type.shop.sports" = "Kirol artikuluak";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Ardo-denda";
 
+"type.shop.antiques" = "Antigoalekoak";
+
+"type.shop.art" = "Arte Denda";
+
+"type.shop.baby_goods" = "Haurrentzako denda";
+
+"type.shop.bag" = "Poltsen Denda";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Ongintzazko Denda";
+
+"type.shop.cheese" = "Gazta Denda";
+
+"type.shop.craft" = "Arteak eta Eskulanak";
+
+"type.shop.dairy" = "Esnekiak";
+
+"type.shop.electrical" = "Elektrizitate Denda";
+
+"type.shop.fishing" = "Arrantza Denda";
+
+"type.shop.interior_decoration" = "Barruko Apaingarriak";
+
+"type.shop.lottery" = "Loteria Sarrerak";
+
+"type.shop.medical_supply" = "Medikuntza-hornidura";
+
+"type.shop.nutrition_supplements" = "Nutrizio osagarriak";
+
+"type.shop.paint" = "Margoak";
+
+"type.shop.perfumery" = "Lurringintza";
+
+"type.shop.sewing" = "Josteko hornigaiak";
+
+"type.shop.storage_rental" = "Biltegiratzeko alokairua";
+
+"type.shop.tobacco" = "Tabakoa";
+
+"type.shop.trade" = "Lanbideen hornidurak";
+
+"type.shop.watches" = "Erlojuak";
+
+"type.shop.wholesale" = "Handizkako denda";
+
 "type.sport" = "Kirola";
 
 "type.sport.american_football" = "Futbola";

iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "فروشگاه";
 
+"type.shop.deli" = "ﯽﺷﻭﺮﻓ ﻪﯾﺬﻏﺍ ﻩﺎﮕﺷﻭﺮﻓ";
+
 "type.shop.department_store" = "مرکز خرید";
 
 "type.shop.doityourself" = "فروشگاه";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "فروشگاه";
 
+"type.shop.farm" = "ﻪﻋﺭﺰﻣ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ";
+
 "type.shop.florist" = "فروشگاه";
 
 "type.shop.funeral_directors" = "مسئول تشییع جنازه";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "فروشگاه";
 
+"type.shop.grocery" = "ﺭﺎﺑﺭﺍﻮﺧ";
+
 "type.shop.hairdresser" = "ارایشگاه";
 
-"type.shop.hardware" = "فروشگاه";
+"type.shop.hardware" = "ﺭﺍﺰﻓﺍ ﺖﺨﺳ ﻩﺎﮕﺷﻭﺮﻓ";
+
+"type.shop.health_food" = "ﯽﺘﺷﺍﺪﻬﺑ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ";
+
+"type.shop.houseware" = "ﯽﮕﻧﺎﺧ ﻡﺯﺍﻮﻟ ﻩﺎﮕﺷﻭﺮﻓ";
 
 "type.shop.jewelry" = "طلا فروشی";
 
 "type.shop.kiosk" = "دَکهِ";
 
+"type.shop.kitchen" = "ﻪﻧﺎﺧﺰﭙﺷﺁ ﻩﺎﮕﺷﻭﺮﻓ";
+
 "type.shop.laundry" = "لباس شویی";
 
 "type.shop.mall" = "فروشگاه";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "فروشگاه";
 
+"type.shop.pastry" = "ﯽﻨﯾﺮﯿﺷ";
+
 "type.shop.pawnbroker" = "عتیقه فروشی";
 
 "type.shop.pet" = "فروشگاه";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "فروشگاه";
 
+"type.shop.second_hand" = "ﻡﻭﺩ ﺖﺳﺩ ﻩﺎﮕﺷﻭﺮﻓ";
+
 "type.shop.shoes" = "فروشگاه";
 
 "type.shop.sports" = "فروشگاه";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "فروشگاه";
 
+"type.shop.antiques" = "ﺕﺎﺟ ﻪﻘﯿﺘﻋ";
+
+"type.shop.art" = "ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ";
+
+"type.shop.baby_goods" = "ﻥﺎﮐﺩﻮﮐ ﻩﺎﮕﺷﻭﺮﻓ";
+
+"type.shop.bag" = "ﻒﯿﮐ ﻩﺎﮕﺷﻭﺮﻓ";
+
+"type.shop.boutique" = "ﮏﯿﺗﻮﺑ";
+
+"type.shop.charity" = "ﻪﯾﺮﯿﺧ ﻩﺎﮕﺷﻭﺮﻓ";
+
+"type.shop.cheese" = "ﺮﯿﻨﭘ ﻩﺎﮕﺷﻭﺮﻓ";
+
+"type.shop.craft" = "ﯽﺘﺳﺩ ﻊﯾﺎﻨﺻ ﻭ ﺮﻨﻫ";
+
+"type.shop.dairy" = "ﯽﻨﺒﻟ ﺕﻻﻮﺼﺤﻣ";
+
+"type.shop.electrical" = "ﯽﮑﯾﺮﺘﮑﻟﺍ ﻡﺯﺍﻮﻟ ﻩﺯﺎﻐﻣ";
+
+"type.shop.fishing" = "ﯼﺮﯿﮕﯿﻫﺎﻣ ﻩﺎﮕﺷﻭﺮﻓ";
+
+"type.shop.interior_decoration" = "ﯽﻠﺧﺍﺩ ﻥﻮﯿﺳﺍﺭﻮﮐﺩ";
+
+"type.shop.lottery" = "ﯽﯾﺎﻣﺯﺁ ﺖﺨﺑ ﻂﯿﻠﺑ";
+
+"type.shop.medical_supply" = "ﯽﮑﺷﺰﭘ ﻡﺯﺍﻮﻟ";
+
+"type.shop.nutrition_supplements" = "ﯽﯾﺍﺬﻏ ﯼﺎﻫ ﻞﻤﮑﻣ";
+
+"type.shop.paint" = "ﺪﻨﮐ ﯽﻣ ﮓﻧﺭ";
+
+"type.shop.perfumery" = "ﯼﺯﺎﺳﺮﻄﻋ";
+
+"type.shop.sewing" = "ﯽﻃﺎﯿﺧ ﻡﺯﺍﻮﻟ";
+
+"type.shop.storage_rental" = "ﺭﺎﺒﻧﺍ ﻩﺭﺎﺟﺍ";
+
+"type.shop.tobacco" = "ﻮﮐﺎﺒﻨﺗ";
+
+"type.shop.trade" = "ﻡﺯﺍﻮﻟ ﺕﺭﺎﺠﺗ";
+
+"type.shop.watches" = "ﺖﻋﺎﺳ";
+
+"type.shop.wholesale" = "ﯽﺷﻭﺮﻓ ﻩﺪﻤﻋ ﻩﺎﮕﺷﻭﺮﻓ";
+
 "type.sport" = "ورزش";
 
 "type.sport.american_football" = "فوتبال آمریکایی";

iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Kosmetiikka";
 
+"type.shop.deli" = "Herkkukauppa";
+
 "type.shop.department_store" = "Tavaratalo";
 
 "type.shop.doityourself" = "Rautakauppa";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Kauppa";
 
+"type.shop.farm" = "Maatilaruokakauppa";
+
 "type.shop.florist" = "Floristi";
 
 "type.shop.funeral_directors" = "Hautaustoimisto";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Vihanneskauppias";
 
+"type.shop.grocery" = "Päivittäistavarakauppa";
+
 "type.shop.hairdresser" = "Kampaamo";
 
 "type.shop.hardware" = "Rautakauppa";
 
+"type.shop.health_food" = "Terveysruokakauppa";
+
+"type.shop.houseware" = "Taloustavarakauppa";
+
 "type.shop.jewelry" = "Korukauppa";
 
 "type.shop.kiosk" = "Kioski";
 
+"type.shop.kitchen" = "Keittiökauppa";
+
 "type.shop.laundry" = "Pesula";
 
 "type.shop.mall" = "Ostoskeskus";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Ulkoiluvarusteet";
 
+"type.shop.pastry" = "Leivonnainen";
+
 "type.shop.pawnbroker" = "Panttilainaamo";
 
 "type.shop.pet" = "Eläinkauppa";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Kalakauppias";
 
+"type.shop.second_hand" = "Second Hand Store";
+
 "type.shop.shoes" = "Kenkäkauppa";
 
 "type.shop.sports" = "Urheilukauppa";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Alkoholimyymälä";
 
+"type.shop.antiques" = "Antiikkia";
+
+"type.shop.art" = "Taidekauppa";
+
+"type.shop.baby_goods" = "Lasten kauppa";
+
+"type.shop.bag" = "Laukkukauppa";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Hyväntekeväisyysmyymälä";
+
+"type.shop.cheese" = "Juustokauppa";
+
+"type.shop.craft" = "Käsityöt";
+
+"type.shop.dairy" = "Maitotuotteet";
+
+"type.shop.electrical" = "Sähköliike";
+
+"type.shop.fishing" = "Kalastuskauppa";
+
+"type.shop.interior_decoration" = "Sisustuskoristeet";
+
+"type.shop.lottery" = "Lottoliput";
+
+"type.shop.medical_supply" = "Lääketieteellisiä tarvikkeita";
+
+"type.shop.nutrition_supplements" = "Ravintolisät";
+
+"type.shop.paint" = "Maalit";
+
+"type.shop.perfumery" = "Hajuvedet";
+
+"type.shop.sewing" = "Ompelutarvikkeet";
+
+"type.shop.storage_rental" = "Varastoinnin vuokraus";
+
+"type.shop.tobacco" = "Tupakka";
+
+"type.shop.trade" = "Kauppa tarvikkeita";
+
+"type.shop.watches" = "Kellot";
+
+"type.shop.wholesale" = "Tukkukauppa";
+
 "type.sport" = "Urheilu";
 
 "type.sport.american_football" = "Amerikkalainen jalkapallo";

iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Produits de beauté";
 
+"type.shop.deli" = "Épicerie fine";
+
 "type.shop.department_store" = "Grand magasin";
 
 "type.shop.doityourself" = "Magasin de bricolage";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Magasin de tissus";
 
+"type.shop.farm" = "Magasin d'alimentation à la ferme";
+
 "type.shop.florist" = "Fleuriste";
 
 "type.shop.funeral_directors" = "Pompes funèbres";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Primeur";
 
+"type.shop.grocery" = "Épicerie";
+
 "type.shop.hairdresser" = "Coiffeur";
 
 "type.shop.hardware" = "Quincaillerie";
 
+"type.shop.health_food" = "Magasin d'alimentation diététique";
+
+"type.shop.houseware" = "Magasin d'articles ménagers";
+
 "type.shop.jewelry" = "Bijouterie";
 
 "type.shop.kiosk" = "Kiosque";
 
+"type.shop.kitchen" = "Magasin de cuisine";
+
 "type.shop.laundry" = "Laverie";
 
 "type.shop.mall" = "Centre commercial";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Matériel de loisirs de plein air";
 
+"type.shop.pastry" = "Pâtisserie";
+
 "type.shop.pawnbroker" = "Prêteur sur gages";
 
 "type.shop.pet" = "Animalerie";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Poissonnier";
 
+"type.shop.second_hand" = "Boutique d'objets d'occasion";
+
 "type.shop.shoes" = "Magasin de chaussures";
 
 "type.shop.sports" = "Articles de sport";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Caviste";
 
+"type.shop.antiques" = "Antiquités";
+
+"type.shop.art" = "Boutique d'art";
+
+"type.shop.baby_goods" = "Magasin pour enfants";
+
+"type.shop.bag" = "Magasin de sacs";
+
+"type.shop.boutique" = "Boutique";
+
+"type.shop.charity" = "Magasin de charité";
+
+"type.shop.cheese" = "Fromagerie";
+
+"type.shop.craft" = "L'artisanat";
+
+"type.shop.dairy" = "Les produits laitiers";
+
+"type.shop.electrical" = "Store électrique";
+
+"type.shop.fishing" = "Magasin de pêche";
+
+"type.shop.interior_decoration" = "Décorations intérieures";
+
+"type.shop.lottery" = "Tickets de loterie";
+
+"type.shop.medical_supply" = "Materiel médical";
+
+"type.shop.nutrition_supplements" = "Suppléments nutritionnels";
+
+"type.shop.paint" = "Des peintures";
+
+"type.shop.perfumery" = "Parfumerie";
+
+"type.shop.sewing" = "Matériel de couture";
+
+"type.shop.storage_rental" = "Location de stockage";
+
+"type.shop.tobacco" = "Le tabac";
+
+"type.shop.trade" = "Fournitures de métiers";
+
+"type.shop.watches" = "Montres";
+
+"type.shop.wholesale" = "Magasin de gros";
+
 "type.sport" = "Sport";
 
 "type.sport.american_football" = "Football américain";

iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Cosmetics";
 
+"type.shop.deli" = "תוינדעמ תונח";
+
 "type.shop.department_store" = "Department Store";
 
 "type.shop.doityourself" = "Hardware Store";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Shop";
 
+"type.shop.farm" = "הווחל ןוזמ תונח";
+
 "type.shop.florist" = "Florist’s";
 
 "type.shop.funeral_directors" = "Funeral Directors";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Greengrocer's";
 
+"type.shop.grocery" = "תלֶוֹכּמַ";
+
 "type.shop.hairdresser" = "Hairdresser";
 
-"type.shop.hardware" = "Hardware Store";
+"type.shop.hardware" = "ןיינב ירמוחל תונח";
+
+"type.shop.health_food" = "תואירב ןוזמ תונח";
+
+"type.shop.houseware" = "תיב ילכל תונח";
 
 "type.shop.jewelry" = "Jewelry";
 
 "type.shop.kiosk" = "Kiosk";
 
+"type.shop.kitchen" = "םיחבטמ תונח";
+
 "type.shop.laundry" = "Laundry";
 
 "type.shop.mall" = "Mall";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Outdoor Equipment";
 
+"type.shop.pastry" = "הפאמ";
+
 "type.shop.pawnbroker" = "Pawnbroker";
 
 "type.shop.pet" = "Petshop";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Seafood Shop";
 
+"type.shop.second_hand" = "היינש די תונח";
+
 "type.shop.shoes" = "Shoe Store";
 
 "type.shop.sports" = "Sports Goods";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Wine Shop";
 
+"type.shop.antiques" = "תוֹקיתִעַ";
+
+"type.shop.art" = "תויונמוא תונח";
+
+"type.shop.baby_goods" = "םידליל תונח";
+
+"type.shop.bag" = "םיקית תונח";
+
+"type.shop.boutique" = "קיטוב";
+
+"type.shop.charity" = "הקדצ תונח";
+
+"type.shop.cheese" = "תוניבג תונח";
+
+"type.shop.craft" = "הריציו תונמוא";
+
+"type.shop.dairy" = "בלח ירצומ";
+
+"type.shop.electrical" = "למשח תונח";
+
+"type.shop.fishing" = "גייד תונח";
+
+"type.shop.interior_decoration" = "םינפ יטושיק";
+
+"type.shop.lottery" = "הלרגה יסיטרכ";
+
+"type.shop.medical_supply" = "יאופר דויצ";
+
+"type.shop.nutrition_supplements" = "הנוזת יפסות";
+
+"type.shop.paint" = "םיעבצ";
+
+"type.shop.perfumery" = "תמַשְׂבָּ";
+
+"type.shop.sewing" = "הריפת דויצ";
+
+"type.shop.storage_rental" = "ןוסחא תרכשה";
+
+"type.shop.tobacco" = "קבָּטַ";
+
+"type.shop.trade" = "הקפסאב רחוס";
+
+"type.shop.watches" = "םינועש";
+
+"type.shop.wholesale" = "תיאנוטיס תונח";
+
 "type.sport" = "ספורט";
 
 "type.sport.american_football" = "כדורגל אמריקאי";

iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Kozmetikum";
 
+"type.shop.deli" = "Csemegebolt";
+
 "type.shop.department_store" = "Áruház";
 
 "type.shop.doityourself" = "Vaskereskedés";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Bolt";
 
+"type.shop.farm" = "Farm Food Shop";
+
 "type.shop.florist" = "Virágos";
 
 "type.shop.funeral_directors" = "Temetkezési vállalkozó";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Zöldséges";
 
+"type.shop.grocery" = "Élelmiszerbolt";
+
 "type.shop.hairdresser" = "Fodrász";
 
-"type.shop.hardware" = "Vaskereskedés";
+"type.shop.hardware" = "Hardver üzlet";
+
+"type.shop.health_food" = "Egészségügyi élelmiszerbolt";
+
+"type.shop.houseware" = "Háztartási bolt";
 
 "type.shop.jewelry" = "Ékszer";
 
 "type.shop.kiosk" = "Trafik";
 
+"type.shop.kitchen" = "Konyhabolt";
+
 "type.shop.laundry" = "Mosoda";
 
 "type.shop.mall" = "A pláza";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Kültéri felszerelés";
 
+"type.shop.pastry" = "Cukrászsütemény";
+
 "type.shop.pawnbroker" = "Zálogház";
 
 "type.shop.pet" = "Házikedvenc-üzlet";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Halüzlet";
 
+"type.shop.second_hand" = "Second Hand Store";
+
 "type.shop.shoes" = "Cipőbolt";
 
 "type.shop.sports" = "Sporteszközök";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Szeszesital-üzlet";
 
+"type.shop.antiques" = "Régiségek";
+
+"type.shop.art" = "Művészeti Bolt";
+
+"type.shop.baby_goods" = "Gyermekbolt";
+
+"type.shop.bag" = "Táskák bolt";
+
+"type.shop.boutique" = "Butik";
+
+"type.shop.charity" = "Jótékonysági Bolt";
+
+"type.shop.cheese" = "Sajtbolt";
+
+"type.shop.craft" = "Művészetek és kézművesség";
+
+"type.shop.dairy" = "Tejtermékek";
+
+"type.shop.electrical" = "Elektronikai üzlet";
+
+"type.shop.fishing" = "Horgászbolt";
+
+"type.shop.interior_decoration" = "Belső dekorációk";
+
+"type.shop.lottery" = "Sorsjegyek";
+
+"type.shop.medical_supply" = "Orvosi eszközök";
+
+"type.shop.nutrition_supplements" = "Táplálékkiegészítők";
+
+"type.shop.paint" = "Festékek";
+
+"type.shop.perfumery" = "Illatszerek";
+
+"type.shop.sewing" = "Varrás kellékek";
+
+"type.shop.storage_rental" = "Tárhely bérlés";
+
+"type.shop.tobacco" = "Dohány";
+
+"type.shop.trade" = "Kellékekkel kereskedik";
+
+"type.shop.watches" = "Órák";
+
+"type.shop.wholesale" = "Nagykereskedelmi üzlet";
+
 "type.sport" = "Sport";
 
 "type.sport.american_football" = "Amerikai foci";

iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings

@@ -2764,6 +2764,8 @@
 
 "type.shop.cosmetics" = "Kosmetik";
 
+"type.shop.deli" = "Toko Kue";
+
 "type.shop.department_store" = "Toko serba ada";
 
 "type.shop.doityourself" = "Toko perangkat keras";
@@ -2776,6 +2778,8 @@
 
 "type.shop.fabric" = "Toko";
 
+"type.shop.farm" = "Toko Makanan Pertanian";
+
 "type.shop.florist" = "Tukang bunga";
 
 "type.shop.funeral_directors" = "Direktur Pemakaman";
@@ -2788,14 +2792,22 @@
 
 "type.shop.greengrocer" = "Penjual sayuran";
 
+"type.shop.grocery" = "Kebutuhan sehari-hari";
+
 "type.shop.hairdresser" = "Penata rambut";
 
 "type.shop.hardware" = "Toko perangkat keras";
 
+"type.shop.health_food" = "Toko Makanan Kesehatan";
+
+"type.shop.houseware" = "Toko Peralatan Rumah Tangga";
+
 "type.shop.jewelry" = "Perhiasan";
 
 "type.shop.kiosk" = "Toko";
 
+"type.shop.kitchen" = "Toko Dapur";
+
 "type.shop.laundry" = "Londri";
 
 "type.shop.mall" = "Mall";
@@ -2818,6 +2830,8 @@
 
 "type.shop.outdoor" = "Peralatan Outdoor";
 
+"type.shop.pastry" = "Kue-kue";
+
 "type.shop.pawnbroker" = "Rumah Gadai";
 
 "type.shop.pet" = "Toko hewan";
@@ -2826,6 +2840,8 @@
 
 "type.shop.seafood" = "Penjual Ikan";
 
+"type.shop.second_hand" = "Toko Barang bekas";
+
 "type.shop.shoes" = "Toko sepatu";
 
 "type.shop.sports" = "Barang olahraga";
@@ -2854,6 +2870,52 @@
 
 "type.shop.wine" = "Toko anggur";
 
+"type.shop.antiques" = "Barang antik";
+
+"type.shop.art" = "Toko Seni";
+
+"type.shop.baby_goods" = "Toko anak-anak";
+
+"type.shop.bag" = "Toko Tas";
+
+"type.shop.boutique" = "Butik";
+
+"type.shop.charity" = "Toko Amal";
+
+"type.shop.cheese" = "Toko Keju";
+
+"type.shop.craft" = "Seni dan kerajinan";
+
+"type.shop.dairy" = "Produk susu";
+
+"type.shop.electrical" = "Toko elektronik";
+
+"type.shop.fishing" = "Toko Memancing";
+
+"type.shop.interior_decoration" = "Dekorasi Interior";
+
+"type.shop.lottery" = "Tiket Lotere";
+
+"type.shop.medical_supply" = "Suplai medis";
+
+"type.shop.nutrition_supplements" = "Suplemen Nutrisi";
+
+"type.shop.paint" = "Cat";
+
+"type.shop.perfumery" = "Wewangian";
+
+"type.shop.sewing" = "Perlengkapan Jahit";
+
+"type.shop.storage_rental" = "Sewa Penyimpanan";
+
+"type.shop.tobacco" = "Tembakau";
+
+"type.shop.trade" = "Perlengkapan Perdagangan";
+
+"type.shop.watches" = "Jam tangan";
+
+"type.shop.wholesale" = "Toko Grosir";
+
 "type.sport" = "Olahraga";
 
 "type.sport.american_football" = "Sepak Bola Amerika";