diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp index 4f42d1a90d..f0bec01d86 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp @@ -38,14 +38,15 @@ jobject CreateMapObject(JNIEnv * env, int mapObjectType, string const & title, string const & subtitle, double lat, double lon, string const & address, Metadata const & metadata, string const & apiId, bool hasBanner, string const & bannerTitleId, string const & bannerMessageId, - string const & bannerIconId, string const & bannerUrl) + string const & bannerIconId, string const & bannerUrl, + bool isReachableByTaxi) { // public MapObject(@MapObjectType int mapObjectType, String title, String subtitle, double lat, - // double lon, String address, String apiId, @NonNull Banner banner) + // double lon, String address, String apiId, @NonNull Banner banner, boolean reachableByTaxi) static jmethodID const ctorId = jni::GetConstructorID(env, g_mapObjectClazz, "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;DDLjava/lang/" - "String;Lcom/mapswithme/maps/bookmarks/data/Banner;)V"); + "String;Lcom/mapswithme/maps/bookmarks/data/Banner;Z)V"); jobject jbanner = nullptr; if (hasBanner) @@ -54,7 +55,7 @@ jobject CreateMapObject(JNIEnv * env, int mapObjectType, string const & title, jobject mapObject = env->NewObject(g_mapObjectClazz, ctorId, mapObjectType, jni::ToJavaString(env, title), jni::ToJavaString(env, subtitle), jni::ToJavaString(env, address), lat, lon, - jni::ToJavaString(env, apiId), jbanner); + jni::ToJavaString(env, apiId), jbanner, isReachableByTaxi); InjectMetadata(env, g_mapObjectClazz, mapObject, metadata); return mapObject; @@ -65,9 +66,9 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) if (info.IsBookmark()) { // public Bookmark(@IntRange(from = 0) int categoryId, @IntRange(from = 0) int bookmarkId, - // String name) + // String name, @NonNull Banner banner, boolean reachableByTaxi) static jmethodID const ctorId = jni::GetConstructorID( - env, g_bookmarkClazz, "(IILjava/lang/String;Lcom/mapswithme/maps/bookmarks/data/Banner;)V"); + env, g_bookmarkClazz, "(IILjava/lang/String;Lcom/mapswithme/maps/bookmarks/data/Banner;Z)V"); jobject jbanner = nullptr; if (info.HasBanner()) @@ -82,7 +83,8 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) jni::TScopedLocalRef jName(env, jni::ToJavaString(env, data.GetName())); jobject mapObject = env->NewObject(g_bookmarkClazz, ctorId, static_cast(info.m_bac.m_categoryIndex), - static_cast(info.m_bac.m_bookmarkIndex), jName.get(), jbanner); + static_cast(info.m_bac.m_bookmarkIndex), jName.get(), jbanner, + info.IsReachableByTaxi()); if (info.IsFeature()) InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata()); return mapObject; @@ -98,18 +100,18 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) return CreateMapObject(env, kMyPosition, info.GetTitle(), info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), {}, "", info.HasBanner(), info.GetBannerTitleId(), info.GetBannerMessageId(), - info.GetBannerIconId(), info.GetBannerUrl()); + info.GetBannerIconId(), info.GetBannerUrl(), info.IsReachableByTaxi()); if (info.HasApiUrl()) return CreateMapObject(env, kApiPoint, info.GetTitle(), info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), info.GetMetadata(), info.GetApiUrl(), info.HasBanner(), info.GetBannerTitleId(), info.GetBannerMessageId(), - info.GetBannerIconId(), info.GetBannerUrl()); + info.GetBannerIconId(), info.GetBannerUrl(), info.IsReachableByTaxi()); return CreateMapObject(env, kPoi, info.GetTitle(), info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), info.IsFeature() ? info.GetMetadata() : Metadata(), "", info.HasBanner(), info.GetBannerTitleId(), info.GetBannerMessageId(), info.GetBannerIconId(), - info.GetBannerUrl()); + info.GetBannerUrl(), info.IsReachableByTaxi()); } } // namespace usermark_helper diff --git a/android/res/drawable-hdpi/ic_placepage_taxi.png b/android/res/drawable-hdpi/ic_placepage_taxi.png new file mode 100644 index 0000000000..b816195ad3 Binary files /dev/null and b/android/res/drawable-hdpi/ic_placepage_taxi.png differ diff --git a/android/res/drawable-mdpi/ic_placepage_taxi.png b/android/res/drawable-mdpi/ic_placepage_taxi.png new file mode 100644 index 0000000000..d9879ab8ba Binary files /dev/null and b/android/res/drawable-mdpi/ic_placepage_taxi.png differ diff --git a/android/res/drawable-xhdpi/ic_placepage_taxi.png b/android/res/drawable-xhdpi/ic_placepage_taxi.png new file mode 100644 index 0000000000..47a25b75a7 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_placepage_taxi.png differ diff --git a/android/res/drawable-xxhdpi/ic_placepage_taxi.png b/android/res/drawable-xxhdpi/ic_placepage_taxi.png new file mode 100644 index 0000000000..62c6b6564f Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_placepage_taxi.png differ diff --git a/android/res/drawable-xxxhdpi/ic_placepage_taxi.png b/android/res/drawable-xxxhdpi/ic_placepage_taxi.png new file mode 100644 index 0000000000..6704d09767 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_placepage_taxi.png differ diff --git a/android/res/layout-land/place_page_details.xml b/android/res/layout-land/place_page_details.xml index fe20cf04ab..30d3bba2ee 100644 --- a/android/res/layout-land/place_page_details.xml +++ b/android/res/layout-land/place_page_details.xml @@ -55,14 +55,18 @@ - - + + + + + + diff --git a/android/res/layout-w600dp-port/place_page_details.xml b/android/res/layout-w600dp-port/place_page_details.xml index 1e03e0f8e7..74562b6fec 100644 --- a/android/res/layout-w600dp-port/place_page_details.xml +++ b/android/res/layout-w600dp-port/place_page_details.xml @@ -80,14 +80,18 @@ - - + + + + + + diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml index 2c967e444a..9867e493fd 100644 --- a/android/res/layout/place_page_details.xml +++ b/android/res/layout/place_page_details.xml @@ -41,14 +41,18 @@ - - + + + + + + diff --git a/android/res/layout/place_page_taxi.xml b/android/res/layout/place_page_taxi.xml new file mode 100644 index 0000000000..9015d740f2 --- /dev/null +++ b/android/res/layout/place_page_taxi.xml @@ -0,0 +1,43 @@ + + + + + + + + + diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index 5bb7a1989c..b1480b7778 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -166,4 +166,8 @@ 22dp 40dp + + 96dp + 14dp + 10dp diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index c9b063e951..b061b55318 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1063,4 +1063,6 @@ Font Size Labels on the map can be made bigger. + + Uber diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 7b9c8df85f..205f5acc4e 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -1261,9 +1261,9 @@ public class MwmActivity extends BaseMwmFragmentActivity final RoutePoint from = data.mPoints[0]; final RoutePoint to = data.mPoints[1]; RoutingController.get().prepare(new MapObject(MapObject.API_POINT, from.mName, "", "", - from.mLat, from.mLon, "", Banner.EMPTY), + from.mLat, from.mLon, "", Banner.EMPTY, false), new MapObject(MapObject.API_POINT, to.mName, "", "", - to.mLat, to.mLon, "", Banner.EMPTY)); + to.mLat, to.mLon, "", Banner.EMPTY, false)); return true; } diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java index 1ca09cb516..19bef5ac95 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java @@ -23,9 +23,9 @@ public class Bookmark extends MapObject private Double mMerY; Bookmark(@IntRange(from = 0) int categoryId, @IntRange(from = 0) int bookmarkId, String title, - @Nullable Banner banner) + @Nullable Banner banner, boolean reachableByTaxi) { - super(BOOKMARK, title, "", "", 0, 0, "", banner); + super(BOOKMARK, title, "", "", 0, 0, "", banner, reachableByTaxi); mCategoryId = categoryId; mBookmarkId = bookmarkId; @@ -37,8 +37,8 @@ public class Bookmark extends MapObject mMerX = ll.x; mMerY = ll.y; - mLat = Math.toDegrees(2.0 * Math.atan(Math.exp(Math.toRadians(ll.y))) - Math.PI / 2.0); - mLon = ll.x; + setLat(Math.toDegrees(2.0 * Math.atan(Math.exp(Math.toRadians(ll.y))) - Math.PI / 2.0)); + setLon(ll.x); } @Override diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java index 31adbda518..15c0e7ef30 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java @@ -27,23 +27,27 @@ public class MapObject implements Parcelable @MapObjectType protected final int mMapObjectType; protected String mTitle; - protected String mSubtitle; - protected double mLat; - protected double mLon; - protected String mAddress; - protected Metadata mMetadata; - protected String mApiId; + private String mSubtitle; + private double mLat; + private double mLon; + private String mAddress; + private Metadata mMetadata; + private String mApiId; @Nullable - protected Banner mBanner; + private Banner mBanner; + private boolean mReachableByTaxi; public MapObject(@MapObjectType int mapObjectType, String title, String subtitle, String address, - double lat, double lon, String apiId, @Nullable Banner banner) + double lat, double lon, String apiId, @Nullable Banner banner, + boolean reachableByTaxi) { - this(mapObjectType, title, subtitle, address, lat, lon, new Metadata(), apiId, banner); + this(mapObjectType, title, subtitle, address, lat, lon, new Metadata(), apiId, banner, + reachableByTaxi); } public MapObject(@MapObjectType int mapObjectType, String title, String subtitle, String address, - double lat, double lon, Metadata metadata, String apiId, @Nullable Banner banner) + double lat, double lon, Metadata metadata, String apiId, @Nullable Banner banner, + boolean reachableByTaxi) { mMapObjectType = mapObjectType; mTitle = title; @@ -54,6 +58,7 @@ public class MapObject implements Parcelable mMetadata = metadata; mApiId = apiId; mBanner = banner; + mReachableByTaxi = reachableByTaxi; } protected MapObject(Parcel source) @@ -67,7 +72,8 @@ public class MapObject implements Parcelable source.readDouble(), // Lon (Metadata) source.readParcelable(Metadata.class.getClassLoader()), source.readString(), // ApiId; - (Banner) source.readParcelable(Banner.class.getClassLoader())); + (Banner) source.readParcelable(Banner.class.getClassLoader()), + source.readByte() != 0); // ReachableByTaxi } /** @@ -138,6 +144,11 @@ public class MapObject implements Parcelable return mBanner; } + public boolean isReachableByTaxi() + { + return mReachableByTaxi; + } + public void setLat(double lat) { mLat = lat; @@ -202,6 +213,7 @@ public class MapObject implements Parcelable dest.writeParcelable(mMetadata, 0); dest.writeString(mApiId); dest.writeParcelable(mBanner, 0); + dest.writeByte((byte) (mReachableByTaxi ? 1 : 0)); } public static final Creator CREATOR = new Creator() diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java index 62ef138726..336d51f112 100644 --- a/android/src/com/mapswithme/maps/location/LocationHelper.java +++ b/android/src/com/mapswithme/maps/location/LocationHelper.java @@ -305,7 +305,7 @@ public enum LocationHelper if (mMyPosition == null) mMyPosition = new MapObject(MapObject.MY_POSITION, "", "", "", mSavedLocation.getLatitude(), - mSavedLocation.getLongitude(), "", Banner.EMPTY); + mSavedLocation.getLongitude(), "", Banner.EMPTY, false); return mMyPosition; } diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java index e4e89c98c1..2bb442dca0 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingController.java @@ -340,14 +340,21 @@ public class RoutingController return; } + if (startPoint != null && endPoint != null) + mLastRouterType = Framework.nativeGetBestRouter(startPoint.getLat(), startPoint.getLon(), + endPoint.getLat(), endPoint.getLon()); + prepare(startPoint, endPoint, mLastRouterType); + } + + public void prepare(@Nullable MapObject startPoint, @Nullable MapObject endPoint, + @Framework.RouterType int routerType) + { cancel(); mStartPoint = startPoint; mEndPoint = endPoint; setState(State.PREPARE); - if (mStartPoint != null && mEndPoint != null) - mLastRouterType = Framework.nativeGetBestRouter(mStartPoint.getLat(), mStartPoint.getLon(), - mEndPoint.getLat(), mEndPoint.getLon()); + mLastRouterType = routerType; Framework.nativeSetRouter(mLastRouterType); if (mContainer != null) diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java index d4487fd96e..7ca6005161 100644 --- a/android/src/com/mapswithme/maps/search/SearchFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchFragment.java @@ -353,7 +353,7 @@ public class SearchFragment extends BaseMwmFragment { //noinspection ConstantConditions final MapObject point = new MapObject(MapObject.SEARCH, result.name, - result.description.featureType, "", result.lat, result.lon, "", Banner.EMPTY); + result.description.featureType, "", result.lat, result.lon, "", Banner.EMPTY, false); RoutingController.get().onPoiSelected(point); } diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 89293fbd45..d3ec0dd98d 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -68,6 +68,7 @@ import com.mapswithme.maps.widget.ObservableScrollView; import com.mapswithme.maps.widget.ScrollViewShadowController; import com.mapswithme.maps.widget.recycler.DividerItemDecoration; import com.mapswithme.maps.widget.recycler.RecyclerClickListener; +import com.mapswithme.util.ConnectionState; import com.mapswithme.util.Graphics; import com.mapswithme.util.StringUtils; import com.mapswithme.util.ThemeUtils; @@ -138,6 +139,7 @@ public class PlacePageView extends RelativeLayout private View mWiki; private View mEntrance; private TextView mTvEntrance; + private View mTaxi; private View mEditPlace; private View mAddOrganisation; private View mAddPlace; @@ -304,6 +306,9 @@ public class PlacePageView extends RelativeLayout mWiki.setOnClickListener(this); mEntrance = mDetails.findViewById(R.id.ll__place_entrance); mTvEntrance = (TextView) mEntrance.findViewById(R.id.tv__place_entrance); + mTaxi = mDetails.findViewById(R.id.ll__place_page_taxi); + TextView orderTaxi = (TextView) mTaxi.findViewById(R.id.tv__place_page_order_taxi); + orderTaxi.setOnClickListener(this); mEditPlace = mDetails.findViewById(R.id.ll__place_editor); mEditPlace.setOnClickListener(this); mAddOrganisation = mDetails.findViewById(R.id.ll__add_organisation); @@ -988,9 +993,16 @@ public class PlacePageView extends RelativeLayout refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance); refreshOpeningHours(); - if (RoutingController.get().isNavigating() || - RoutingController.get().isPlanning() || - MapManager.nativeIsLegacyMode()) + boolean showTaxiOffer = mMapObject.isReachableByTaxi() && + LocationHelper.INSTANCE.getMyPosition() != null && + ConnectionState.isConnected(); + + UiUtils.showIf(showTaxiOffer, mTaxi); + + boolean inRouting = RoutingController.get().isNavigating() || + RoutingController.get().isPlanning(); + + if (inRouting || MapManager.nativeIsLegacyMode()) { UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace); } @@ -1322,6 +1334,12 @@ public class PlacePageView extends RelativeLayout mSponsored.mRating, mReviewAdapter.getItems() .size(), mSponsored.mUrl); break; + case R.id.tv__place_page_order_taxi: + RoutingController.get().prepare(LocationHelper.INSTANCE.getMyPosition(), mMapObject, + Framework.ROUTER_TYPE_TAXI); + hide(); + Framework.nativeDeactivatePopup(); + break; } } diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings index 654c90d852..9863e03627 100644 --- a/iphone/Maps/ar.lproj/Localizable.strings +++ b/iphone/Maps/ar.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "يمكن جعل التسميات على الخريطة أكبر."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings index 1c621753ce..26f2199357 100644 --- a/iphone/Maps/cs.lproj/Localizable.strings +++ b/iphone/Maps/cs.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Popisky na mapě lze zvětšit."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings index badd12d5c0..063fc76886 100644 --- a/iphone/Maps/da.lproj/Localizable.strings +++ b/iphone/Maps/da.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Etiketterne på kortet kan gøres større."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings index 3c8216c84a..cba0e26ba6 100644 --- a/iphone/Maps/de.lproj/Localizable.strings +++ b/iphone/Maps/de.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Bezeichnungen auf der Karte können vergrößert werden."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/en-GB.lproj/Localizable.strings b/iphone/Maps/en-GB.lproj/Localizable.strings index 2b458f1c9e..07a534980c 100644 --- a/iphone/Maps/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/en-GB.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Labels on the map can be made bigger."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index e1a22796b2..26a14c0cef 100644 --- a/iphone/Maps/en.lproj/Localizable.strings +++ b/iphone/Maps/en.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Labels on the map can be made bigger."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings index 75bed71e4c..ae87ccbd29 100644 --- a/iphone/Maps/es.lproj/Localizable.strings +++ b/iphone/Maps/es.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Las etiquetas del mapa pueden ampliarse."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings index 941f4474d9..bc0f8d756c 100644 --- a/iphone/Maps/fi.lproj/Localizable.strings +++ b/iphone/Maps/fi.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Kartan selityksiä voi suurentaa."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings index ae4b9e6e87..69712dcebe 100644 --- a/iphone/Maps/fr.lproj/Localizable.strings +++ b/iphone/Maps/fr.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Les étiquettes sur la carte peuvent être agrandies."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings index 0591ab6466..076b6a4726 100644 --- a/iphone/Maps/hu.lproj/Localizable.strings +++ b/iphone/Maps/hu.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "A térképen a címkék lehetnek nagyobbak."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/id.lproj/Localizable.strings b/iphone/Maps/id.lproj/Localizable.strings index 0e621fdd5d..2bd315e773 100644 --- a/iphone/Maps/id.lproj/Localizable.strings +++ b/iphone/Maps/id.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Label pada peta bisa dijadikan lebih besar."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings index dcc729e120..c8be99c448 100644 --- a/iphone/Maps/it.lproj/Localizable.strings +++ b/iphone/Maps/it.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Le etichette sulla mappa possono essere ingrandite."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings index f563e18f80..d375cda3c0 100644 --- a/iphone/Maps/ja.lproj/Localizable.strings +++ b/iphone/Maps/ja.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "地図上のラベルを大きくすることができます。"; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings index 45cf3e8dde..23fb98817f 100644 --- a/iphone/Maps/ko.lproj/Localizable.strings +++ b/iphone/Maps/ko.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "지도의 레이블을 더 크게 할 수 있습니다."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/nb.lproj/Localizable.strings b/iphone/Maps/nb.lproj/Localizable.strings index 12f04cf433..34edd855e9 100644 --- a/iphone/Maps/nb.lproj/Localizable.strings +++ b/iphone/Maps/nb.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Etiketter på kartet kan gjøres større."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings index 97b13567d1..16899fe422 100644 --- a/iphone/Maps/nl.lproj/Localizable.strings +++ b/iphone/Maps/nl.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Labels op de map kunnen groter gemaakt worden."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings index 8a01ff07b8..7bc71c75f2 100644 --- a/iphone/Maps/pl.lproj/Localizable.strings +++ b/iphone/Maps/pl.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Etykiety na mapie dają się powiększyć."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings index 6587c850b9..48ab6f1f9d 100644 --- a/iphone/Maps/pt.lproj/Localizable.strings +++ b/iphone/Maps/pt.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "É possível aumentar o tamanho das letras do mapa."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/ro.lproj/Localizable.strings b/iphone/Maps/ro.lproj/Localizable.strings index 54dbc2396b..b50650a660 100644 --- a/iphone/Maps/ro.lproj/Localizable.strings +++ b/iphone/Maps/ro.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Etichetele de pe hartă pot fi făcute mai mari."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings index b85d82752a..ad0d1f31ca 100644 --- a/iphone/Maps/ru.lproj/Localizable.strings +++ b/iphone/Maps/ru.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Названия объектов на карте теперь можно сделать крупнее."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings index 6e6bd3d405..39316d0c3e 100644 --- a/iphone/Maps/sk.lproj/Localizable.strings +++ b/iphone/Maps/sk.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Nápisy na mape je možné zväčšiť."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings index 0d9255be34..aeb3a21970 100644 --- a/iphone/Maps/sv.lproj/Localizable.strings +++ b/iphone/Maps/sv.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Etiketter på kartan kan göras större."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings index 46deb53f61..8224ec2f17 100644 --- a/iphone/Maps/th.lproj/Localizable.strings +++ b/iphone/Maps/th.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "ป้ายบนแผนที่สามารถทำให้ใหญ่ขึ้นได้"; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings index 56d375e2f8..af0b9bd7c3 100644 --- a/iphone/Maps/tr.lproj/Localizable.strings +++ b/iphone/Maps/tr.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Harita üzerindeki etiketler daha büyük hale getirilebilir."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings index 48a64c1917..4616dfc325 100644 --- a/iphone/Maps/uk.lproj/Localizable.strings +++ b/iphone/Maps/uk.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Можливість збільшення розміру написів на карті."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/vi.lproj/Localizable.strings b/iphone/Maps/vi.lproj/Localizable.strings index 79e8c4c880..cf1a103c91 100644 --- a/iphone/Maps/vi.lproj/Localizable.strings +++ b/iphone/Maps/vi.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "Các nhãn mác trên bản đồ có thể được phóng to hơn."; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings index edb19f115e..974765bf07 100644 --- a/iphone/Maps/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "可以增大地图上的标签。"; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings index 26ecb6e384..61bd8abf44 100644 --- a/iphone/Maps/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings @@ -1791,3 +1791,6 @@ /* january */ "whatsnew_font_size_text" = "可將地圖上的標籤變大。"; + +/* "Translation is no needed, because it's a company name" */ +"uber" = "Uber"; diff --git a/strings.txt b/strings.txt index 044eb0d3a2..4862290599 100644 --- a/strings.txt +++ b/strings.txt @@ -22067,3 +22067,7 @@ hi = नक्शे पर लेबलों को बड़ा किया जा सकता है। pt-BR = Os rótulos no mapa podem ser ampliados. sk = Nápisy na mape je možné zväčšiť. + + [uber] + comment = "Translation is no needed, because it's a company name" + en = Uber