diff --git a/data/categories.txt b/data/categories.txt index b608e1ccc3..9b531850f7 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -286,16 +286,16 @@ cs:3půjčovna aut|3auto nl:3autoverhuur|auto amenity-cinema -en:3cinema -ru:кинотеатр|3кино -de:3Kino|Cinema|Filmtheater -fr:3cinéma|ciné +en:3cinema|entertainment +ru:кинотеатр|3кино|развлечения +de:3Kino|Cinema|Filmtheater|Unterhaltung +fr:3cinéma|ciné|divertissement it:3cinema|teatro -es:3cine -ko:영화 -ja:シネマ -cs:3kino|biograf -nl:3bioscoop +es:3cine|entretenimiento +ko:영화|엔터테인먼트 +ja:シネマ|エンターテイメント +cs:3kino|biograf|zábava +nl:3bioscoop|uitgaan amenity-college en:college @@ -425,7 +425,7 @@ it:3farmacia es:3farmacia ko:약국|약물 매장|약종상 ja:薬局|ドラッグストア|薬剤師|調剤|薬局の -cs:lékárna +cs:3lékárna nl:3apotheek|verdeelstation amenity-post_box @@ -501,16 +501,16 @@ cs:2telefon|telefoní budka|telefoní automat nl:2telefoon amenity-theatre -en:3theatre|theater -ru:3театр -de:3Theater -fr:3théâtre +en:3theatre|theater|entertainment +ru:3театр|развлечения +de:3Theater|Unterhaltung +fr:3théâtre|divertissement it:3teatro -es:3teatro -ko:연극 -ja:劇場 -cs:3divadlo -nl:3theater +es:3teatro|entretenimiento +ko:연극|엔터테인먼트 +ja:劇場|エンターテイメント +cs:3divadlo|zábava +nl:3theater|uitgaan amenity-toilets en:3toilet|wc @@ -1023,16 +1023,16 @@ cs:4tržiště|samoobsluha|market|obchod nl:4markt|winkel amenity-nightclub -en:3nightclub|3disco|dance -ru:3ночной клуб|3дискотека -de:3Nachtclub|Nachtklub -fr:3discothèque|3nuit-club +en:3nightclub|3disco|dance|entertainment +ru:3ночной клуб|3дискотека|развлечения +de:3Nachtclub|Nachtklub|Unterhaltung +fr:3discothèque|3nuit-club|divertissement it:3night club -es:3discoteca|nightclub -ko:나이트 클럽 -ja:ナイトクラブ -cs:4noční klub|3disco|3klub -nl:3nightclub|3disco|dansen +es:3discoteca|nightclub|entretenimiento +ko:나이트 클럽|엔터테인먼트 +ja:ナイトクラブ|エンターテイメント +cs:4noční klub|3disco|3klub|zábava +nl:3nightclub|3disco|dansen|uitgaan amenity-embassy en:4embassy diff --git a/iphone/Maps/Classes/SearchVC.mm b/iphone/Maps/Classes/SearchVC.mm index 6e27ff0aac..15f7a9822f 100644 --- a/iphone/Maps/Classes/SearchVC.mm +++ b/iphone/Maps/Classes/SearchVC.mm @@ -120,7 +120,23 @@ static void OnSearchResultCallback(search::Results const & res) m_framework->PrepareSearch(hasPt, lat, lon); //mycode init array of categories - categoriesNames = [[NSArray alloc] initWithObjects:@"food", @"money", @"fuel", @"shop", @"transport", @"tourism", nil]; + categoriesNames = [[NSArray alloc] initWithObjects: + @"food", + @"transport", + @"fuel", + @"parking", + @"shop", + @"hotel", + @"tourism", + @"entertainment", + @"atm", + @"bank", + @"pharmacy", + @"hospital", + @"toilet", + @"post", + @"police", + nil]; } return self; } @@ -185,9 +201,9 @@ static void OnSearchResultCallback(search::Results const & res) m_table.dataSource = self; [m_searchBar setScopeButtonTitles:[NSArray arrayWithObjects: - NSLocalizedString(@"search_mode_nearme", @"Do search near my position only"), - NSLocalizedString(@"search_mode_viewport", @""), - NSLocalizedString(@"search_mode_all", nil), nil]]; + NSLocalizedString(@"search_mode_nearme", nil), + NSLocalizedString(@"search_mode_viewport", nil), + NSLocalizedString(@"search_mode_all", nil), nil]]; [self setSearchBarHeight]; [m_table setTableHeaderView:m_searchBar]; self.view = m_table; @@ -336,8 +352,8 @@ static void OnSearchResultCallback(search::Results const & res) { cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; } - - cell.textLabel.text = NSLocalizedString([categoriesNames objectAtIndex:indexPath.row],@"Search Suggestion"); + + cell.textLabel.text = NSLocalizedString([categoriesNames objectAtIndex:indexPath.row], nil); cell.imageView.image = [UIImage imageNamed:[categoriesNames objectAtIndex:indexPath.row]]; return cell; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 2214c3fd13..bc7798ed90 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -71,6 +71,36 @@ F785EB4116386FC4003A38A8 /* BookmarkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */; }; F7B90CD31521E6D200C054EE /* CustomNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F7B90CD21521E6D100C054EE /* CustomNavigationView.mm */; }; F7B90CD41521E6D200C054EE /* CustomNavigationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F7B90CD21521E6D100C054EE /* CustomNavigationView.mm */; }; + F7E7BA221672328F00B4492E /* atm.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA061672328F00B4492E /* atm.png */; }; + F7E7BA231672328F00B4492E /* atm@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA071672328F00B4492E /* atm@2x.png */; }; + F7E7BA241672328F00B4492E /* bank.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA081672328F00B4492E /* bank.png */; }; + F7E7BA251672328F00B4492E /* bank@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA091672328F00B4492E /* bank@2x.png */; }; + F7E7BA261672328F00B4492E /* entertainment.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA0A1672328F00B4492E /* entertainment.png */; }; + F7E7BA271672328F00B4492E /* entertainment@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA0B1672328F00B4492E /* entertainment@2x.png */; }; + F7E7BA281672328F00B4492E /* food.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA0C1672328F00B4492E /* food.png */; }; + F7E7BA291672328F00B4492E /* food@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA0D1672328F00B4492E /* food@2x.png */; }; + F7E7BA2A1672328F00B4492E /* fuel.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA0E1672328F00B4492E /* fuel.png */; }; + F7E7BA2B1672328F00B4492E /* fuel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA0F1672328F00B4492E /* fuel@2x.png */; }; + F7E7BA2C1672328F00B4492E /* hospital.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA101672328F00B4492E /* hospital.png */; }; + F7E7BA2D1672328F00B4492E /* hospital@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA111672328F00B4492E /* hospital@2x.png */; }; + F7E7BA2E1672328F00B4492E /* parking.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA121672328F00B4492E /* parking.png */; }; + F7E7BA2F1672328F00B4492E /* parking@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA131672328F00B4492E /* parking@2x.png */; }; + F7E7BA301672328F00B4492E /* pharmacy.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA141672328F00B4492E /* pharmacy.png */; }; + F7E7BA311672328F00B4492E /* pharmacy@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA151672328F00B4492E /* pharmacy@2x.png */; }; + F7E7BA321672328F00B4492E /* police.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA161672328F00B4492E /* police.png */; }; + F7E7BA331672328F00B4492E /* police@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA171672328F00B4492E /* police@2x.png */; }; + F7E7BA341672328F00B4492E /* post.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA181672328F00B4492E /* post.png */; }; + F7E7BA351672328F00B4492E /* post@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA191672328F00B4492E /* post@2x.png */; }; + F7E7BA361672328F00B4492E /* shop.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA1A1672328F00B4492E /* shop.png */; }; + F7E7BA371672328F00B4492E /* shop@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA1B1672328F00B4492E /* shop@2x.png */; }; + F7E7BA381672328F00B4492E /* toilet.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA1C1672328F00B4492E /* toilet.png */; }; + F7E7BA391672328F00B4492E /* toilet@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA1D1672328F00B4492E /* toilet@2x.png */; }; + F7E7BA3A1672328F00B4492E /* tourism.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA1E1672328F00B4492E /* tourism.png */; }; + F7E7BA3B1672328F00B4492E /* tourism@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA1F1672328F00B4492E /* tourism@2x.png */; }; + F7E7BA3C1672328F00B4492E /* transport.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA201672328F00B4492E /* transport.png */; }; + F7E7BA3D1672328F00B4492E /* transport@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA211672328F00B4492E /* transport@2x.png */; }; + F7E7BA4016723CD200B4492E /* hotel.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA3E16723CD200B4492E /* hotel.png */; }; + F7E7BA4116723CD200B4492E /* hotel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F7E7BA3F16723CD200B4492E /* hotel@2x.png */; }; F7FDD823147F30CC005900FA /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = F7FDD822147F30CC005900FA /* drules_proto.bin */; }; FA04373212CAB83F00017494 /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA04373112CAB83F00017494 /* libstorage.a */; }; FA0545F0155C22D4001F4E37 /* placemark-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0545E0155C22D4001F4E37 /* placemark-blue.png */; }; @@ -162,18 +192,6 @@ FA8A71DA153D83C8005D9795 /* bookmarks@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D3153D83C8005D9795 /* bookmarks@2x.png */; }; FA8A71DB153D83C8005D9795 /* bookmarks@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D3153D83C8005D9795 /* bookmarks@2x.png */; }; FA8F8938132D5DB00048E3FE /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8F8937132D5DB00048E3FE /* libtomcrypt.a */; }; - FA8F9331150218F10057B215 /* food.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9325150218F10057B215 /* food.png */; }; - FA8F9332150218F10057B215 /* food@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9326150218F10057B215 /* food@2x.png */; }; - FA8F9333150218F10057B215 /* fuel.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9327150218F10057B215 /* fuel.png */; }; - FA8F9334150218F10057B215 /* fuel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9328150218F10057B215 /* fuel@2x.png */; }; - FA8F9335150218F10057B215 /* money.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9329150218F10057B215 /* money.png */; }; - FA8F9336150218F10057B215 /* money@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932A150218F10057B215 /* money@2x.png */; }; - FA8F9337150218F10057B215 /* shop.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932B150218F10057B215 /* shop.png */; }; - FA8F9338150218F10057B215 /* shop@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932C150218F10057B215 /* shop@2x.png */; }; - FA8F9339150218F10057B215 /* tourism.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932D150218F10057B215 /* tourism.png */; }; - FA8F933A150218F10057B215 /* tourism@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932E150218F10057B215 /* tourism@2x.png */; }; - FA8F933B150218F10057B215 /* transport.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932F150218F10057B215 /* transport.png */; }; - FA8F933C150218F10057B215 /* transport@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9330150218F10057B215 /* transport@2x.png */; }; FA99CB73147089B100689A9A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = FA99CB71147089B100689A9A /* Localizable.strings */; }; FA9EFCBF1609E150002D6195 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA9EFCBE1609E150002D6195 /* Default-568h@2x.png */; }; FA9EFCC11609E42B002D6195 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA9EFCBE1609E150002D6195 /* Default-568h@2x.png */; }; @@ -1282,18 +1300,6 @@ FAFB08D9151215EE0041901D /* search-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = FA1FB89F147E8CA50052848B /* search-highlighted.png */; }; FAFB08DA151215EE0041901D /* search-highlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA1FB8A0147E8CA50052848B /* search-highlighted@2x.png */; }; FAFB08DB151215EE0041901D /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = F7FDD822147F30CC005900FA /* drules_proto.bin */; }; - FAFB08DC151215EE0041901D /* food.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9325150218F10057B215 /* food.png */; }; - FAFB08DD151215EE0041901D /* food@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9326150218F10057B215 /* food@2x.png */; }; - FAFB08DE151215EE0041901D /* fuel.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9327150218F10057B215 /* fuel.png */; }; - FAFB08DF151215EE0041901D /* fuel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9328150218F10057B215 /* fuel@2x.png */; }; - FAFB08E0151215EE0041901D /* money.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9329150218F10057B215 /* money.png */; }; - FAFB08E1151215EE0041901D /* money@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932A150218F10057B215 /* money@2x.png */; }; - FAFB08E2151215EE0041901D /* shop.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932B150218F10057B215 /* shop.png */; }; - FAFB08E3151215EE0041901D /* shop@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932C150218F10057B215 /* shop@2x.png */; }; - FAFB08E4151215EE0041901D /* tourism.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932D150218F10057B215 /* tourism.png */; }; - FAFB08E5151215EE0041901D /* tourism@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932E150218F10057B215 /* tourism@2x.png */; }; - FAFB08E6151215EE0041901D /* transport.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F932F150218F10057B215 /* transport.png */; }; - FAFB08E7151215EE0041901D /* transport@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9330150218F10057B215 /* transport@2x.png */; }; FAFB08E9151215EE0041901D /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; }; FAFB08EA151215EE0041901D /* MapsAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MapsAppDelegate.mm */; }; FAFB08EB151215EE0041901D /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; }; @@ -1402,6 +1408,36 @@ F7DD848414FE77F8005695E1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; F7DD848514FE7C7F005695E1 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; F7DD848614FE7FE0005695E1 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; + F7E7BA061672328F00B4492E /* atm.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = atm.png; sourceTree = ""; }; + F7E7BA071672328F00B4492E /* atm@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "atm@2x.png"; sourceTree = ""; }; + F7E7BA081672328F00B4492E /* bank.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bank.png; sourceTree = ""; }; + F7E7BA091672328F00B4492E /* bank@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bank@2x.png"; sourceTree = ""; }; + F7E7BA0A1672328F00B4492E /* entertainment.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = entertainment.png; sourceTree = ""; }; + F7E7BA0B1672328F00B4492E /* entertainment@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "entertainment@2x.png"; sourceTree = ""; }; + F7E7BA0C1672328F00B4492E /* food.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = food.png; sourceTree = ""; }; + F7E7BA0D1672328F00B4492E /* food@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "food@2x.png"; sourceTree = ""; }; + F7E7BA0E1672328F00B4492E /* fuel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fuel.png; sourceTree = ""; }; + F7E7BA0F1672328F00B4492E /* fuel@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fuel@2x.png"; sourceTree = ""; }; + F7E7BA101672328F00B4492E /* hospital.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hospital.png; sourceTree = ""; }; + F7E7BA111672328F00B4492E /* hospital@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hospital@2x.png"; sourceTree = ""; }; + F7E7BA121672328F00B4492E /* parking.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = parking.png; sourceTree = ""; }; + F7E7BA131672328F00B4492E /* parking@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "parking@2x.png"; sourceTree = ""; }; + F7E7BA141672328F00B4492E /* pharmacy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pharmacy.png; sourceTree = ""; }; + F7E7BA151672328F00B4492E /* pharmacy@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pharmacy@2x.png"; sourceTree = ""; }; + F7E7BA161672328F00B4492E /* police.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = police.png; sourceTree = ""; }; + F7E7BA171672328F00B4492E /* police@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "police@2x.png"; sourceTree = ""; }; + F7E7BA181672328F00B4492E /* post.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = post.png; sourceTree = ""; }; + F7E7BA191672328F00B4492E /* post@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "post@2x.png"; sourceTree = ""; }; + F7E7BA1A1672328F00B4492E /* shop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shop.png; sourceTree = ""; }; + F7E7BA1B1672328F00B4492E /* shop@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop@2x.png"; sourceTree = ""; }; + F7E7BA1C1672328F00B4492E /* toilet.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toilet.png; sourceTree = ""; }; + F7E7BA1D1672328F00B4492E /* toilet@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "toilet@2x.png"; sourceTree = ""; }; + F7E7BA1E1672328F00B4492E /* tourism.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tourism.png; sourceTree = ""; }; + F7E7BA1F1672328F00B4492E /* tourism@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tourism@2x.png"; sourceTree = ""; }; + F7E7BA201672328F00B4492E /* transport.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = transport.png; sourceTree = ""; }; + F7E7BA211672328F00B4492E /* transport@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "transport@2x.png"; sourceTree = ""; }; + F7E7BA3E16723CD200B4492E /* hotel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hotel.png; sourceTree = ""; }; + F7E7BA3F16723CD200B4492E /* hotel@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hotel@2x.png"; sourceTree = ""; }; F7FDD822147F30CC005900FA /* drules_proto.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto.bin; path = ../../data/drules_proto.bin; sourceTree = ""; }; FA04373112CAB83F00017494 /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libstorage.a; sourceTree = SOURCE_ROOT; }; FA0545E0155C22D4001F4E37 /* placemark-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "placemark-blue.png"; path = "Bookmarks/placemark-blue.png"; sourceTree = SOURCE_ROOT; }; @@ -1473,18 +1509,6 @@ FA8A71D2153D83C8005D9795 /* bookmarks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bookmarks.png; sourceTree = ""; }; FA8A71D3153D83C8005D9795 /* bookmarks@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bookmarks@2x.png"; sourceTree = ""; }; FA8F8937132D5DB00048E3FE /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libtomcrypt.a; sourceTree = SOURCE_ROOT; }; - FA8F9325150218F10057B215 /* food.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = food.png; sourceTree = ""; }; - FA8F9326150218F10057B215 /* food@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "food@2x.png"; sourceTree = ""; }; - FA8F9327150218F10057B215 /* fuel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fuel.png; sourceTree = ""; }; - FA8F9328150218F10057B215 /* fuel@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "fuel@2x.png"; sourceTree = ""; }; - FA8F9329150218F10057B215 /* money.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = money.png; sourceTree = ""; }; - FA8F932A150218F10057B215 /* money@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "money@2x.png"; sourceTree = ""; }; - FA8F932B150218F10057B215 /* shop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = shop.png; sourceTree = ""; }; - FA8F932C150218F10057B215 /* shop@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shop@2x.png"; sourceTree = ""; }; - FA8F932D150218F10057B215 /* tourism.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tourism.png; sourceTree = ""; }; - FA8F932E150218F10057B215 /* tourism@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tourism@2x.png"; sourceTree = ""; }; - FA8F932F150218F10057B215 /* transport.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = transport.png; sourceTree = ""; }; - FA8F9330150218F10057B215 /* transport@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "transport@2x.png"; sourceTree = ""; }; FA971562150920C600916690 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; FA99CB72147089B100689A9A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; FA9EFCBE1609E150002D6195 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; @@ -2427,18 +2451,36 @@ FA8F930C150184280057B215 /* Suggestion Icons */ = { isa = PBXGroup; children = ( - FA8F9325150218F10057B215 /* food.png */, - FA8F9326150218F10057B215 /* food@2x.png */, - FA8F9327150218F10057B215 /* fuel.png */, - FA8F9328150218F10057B215 /* fuel@2x.png */, - FA8F9329150218F10057B215 /* money.png */, - FA8F932A150218F10057B215 /* money@2x.png */, - FA8F932B150218F10057B215 /* shop.png */, - FA8F932C150218F10057B215 /* shop@2x.png */, - FA8F932D150218F10057B215 /* tourism.png */, - FA8F932E150218F10057B215 /* tourism@2x.png */, - FA8F932F150218F10057B215 /* transport.png */, - FA8F9330150218F10057B215 /* transport@2x.png */, + F7E7BA3E16723CD200B4492E /* hotel.png */, + F7E7BA3F16723CD200B4492E /* hotel@2x.png */, + F7E7BA061672328F00B4492E /* atm.png */, + F7E7BA071672328F00B4492E /* atm@2x.png */, + F7E7BA081672328F00B4492E /* bank.png */, + F7E7BA091672328F00B4492E /* bank@2x.png */, + F7E7BA0A1672328F00B4492E /* entertainment.png */, + F7E7BA0B1672328F00B4492E /* entertainment@2x.png */, + F7E7BA0C1672328F00B4492E /* food.png */, + F7E7BA0D1672328F00B4492E /* food@2x.png */, + F7E7BA0E1672328F00B4492E /* fuel.png */, + F7E7BA0F1672328F00B4492E /* fuel@2x.png */, + F7E7BA101672328F00B4492E /* hospital.png */, + F7E7BA111672328F00B4492E /* hospital@2x.png */, + F7E7BA121672328F00B4492E /* parking.png */, + F7E7BA131672328F00B4492E /* parking@2x.png */, + F7E7BA141672328F00B4492E /* pharmacy.png */, + F7E7BA151672328F00B4492E /* pharmacy@2x.png */, + F7E7BA161672328F00B4492E /* police.png */, + F7E7BA171672328F00B4492E /* police@2x.png */, + F7E7BA181672328F00B4492E /* post.png */, + F7E7BA191672328F00B4492E /* post@2x.png */, + F7E7BA1A1672328F00B4492E /* shop.png */, + F7E7BA1B1672328F00B4492E /* shop@2x.png */, + F7E7BA1C1672328F00B4492E /* toilet.png */, + F7E7BA1D1672328F00B4492E /* toilet@2x.png */, + F7E7BA1E1672328F00B4492E /* tourism.png */, + F7E7BA1F1672328F00B4492E /* tourism@2x.png */, + F7E7BA201672328F00B4492E /* transport.png */, + F7E7BA211672328F00B4492E /* transport@2x.png */, ); path = "Suggestion Icons"; sourceTree = ""; @@ -3594,18 +3636,6 @@ FA1FB8A5147E8CA50052848B /* search-highlighted.png in Resources */, FA1FB8A6147E8CA50052848B /* search-highlighted@2x.png in Resources */, F7FDD823147F30CC005900FA /* drules_proto.bin in Resources */, - FA8F9331150218F10057B215 /* food.png in Resources */, - FA8F9332150218F10057B215 /* food@2x.png in Resources */, - FA8F9333150218F10057B215 /* fuel.png in Resources */, - FA8F9334150218F10057B215 /* fuel@2x.png in Resources */, - FA8F9335150218F10057B215 /* money.png in Resources */, - FA8F9336150218F10057B215 /* money@2x.png in Resources */, - FA8F9337150218F10057B215 /* shop.png in Resources */, - FA8F9338150218F10057B215 /* shop@2x.png in Resources */, - FA8F9339150218F10057B215 /* tourism.png in Resources */, - FA8F933A150218F10057B215 /* tourism@2x.png in Resources */, - FA8F933B150218F10057B215 /* transport.png in Resources */, - FA8F933C150218F10057B215 /* transport@2x.png in Resources */, FAA3A8621512799C00C7904C /* 29-pro.png in Resources */, FAA3A8631512799C00C7904C /* 50-pro.png in Resources */, FAA3A8641512799C00C7904C /* 57-pro.png in Resources */, @@ -3654,6 +3684,36 @@ FA140657162A6288002BC1ED /* eye@2x.png in Resources */, 573D1AF4165252760093A55D /* location-follow.png in Resources */, 573D1AF5165252760093A55D /* location-follow@2x.png in Resources */, + F7E7BA221672328F00B4492E /* atm.png in Resources */, + F7E7BA231672328F00B4492E /* atm@2x.png in Resources */, + F7E7BA241672328F00B4492E /* bank.png in Resources */, + F7E7BA251672328F00B4492E /* bank@2x.png in Resources */, + F7E7BA261672328F00B4492E /* entertainment.png in Resources */, + F7E7BA271672328F00B4492E /* entertainment@2x.png in Resources */, + F7E7BA281672328F00B4492E /* food.png in Resources */, + F7E7BA291672328F00B4492E /* food@2x.png in Resources */, + F7E7BA2A1672328F00B4492E /* fuel.png in Resources */, + F7E7BA2B1672328F00B4492E /* fuel@2x.png in Resources */, + F7E7BA2C1672328F00B4492E /* hospital.png in Resources */, + F7E7BA2D1672328F00B4492E /* hospital@2x.png in Resources */, + F7E7BA2E1672328F00B4492E /* parking.png in Resources */, + F7E7BA2F1672328F00B4492E /* parking@2x.png in Resources */, + F7E7BA301672328F00B4492E /* pharmacy.png in Resources */, + F7E7BA311672328F00B4492E /* pharmacy@2x.png in Resources */, + F7E7BA321672328F00B4492E /* police.png in Resources */, + F7E7BA331672328F00B4492E /* police@2x.png in Resources */, + F7E7BA341672328F00B4492E /* post.png in Resources */, + F7E7BA351672328F00B4492E /* post@2x.png in Resources */, + F7E7BA361672328F00B4492E /* shop.png in Resources */, + F7E7BA371672328F00B4492E /* shop@2x.png in Resources */, + F7E7BA381672328F00B4492E /* toilet.png in Resources */, + F7E7BA391672328F00B4492E /* toilet@2x.png in Resources */, + F7E7BA3A1672328F00B4492E /* tourism.png in Resources */, + F7E7BA3B1672328F00B4492E /* tourism@2x.png in Resources */, + F7E7BA3C1672328F00B4492E /* transport.png in Resources */, + F7E7BA3D1672328F00B4492E /* transport@2x.png in Resources */, + F7E7BA4016723CD200B4492E /* hotel.png in Resources */, + F7E7BA4116723CD200B4492E /* hotel@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4213,18 +4273,6 @@ FAFB08D9151215EE0041901D /* search-highlighted.png in Resources */, FAFB08DA151215EE0041901D /* search-highlighted@2x.png in Resources */, FAFB08DB151215EE0041901D /* drules_proto.bin in Resources */, - FAFB08DC151215EE0041901D /* food.png in Resources */, - FAFB08DD151215EE0041901D /* food@2x.png in Resources */, - FAFB08DE151215EE0041901D /* fuel.png in Resources */, - FAFB08DF151215EE0041901D /* fuel@2x.png in Resources */, - FAFB08E0151215EE0041901D /* money.png in Resources */, - FAFB08E1151215EE0041901D /* money@2x.png in Resources */, - FAFB08E2151215EE0041901D /* shop.png in Resources */, - FAFB08E3151215EE0041901D /* shop@2x.png in Resources */, - FAFB08E4151215EE0041901D /* tourism.png in Resources */, - FAFB08E5151215EE0041901D /* tourism@2x.png in Resources */, - FAFB08E6151215EE0041901D /* transport.png in Resources */, - FAFB08E7151215EE0041901D /* transport@2x.png in Resources */, FAA3A873151279DE00C7904C /* 29-lite.png in Resources */, FAA3A874151279DE00C7904C /* 50-lite.png in Resources */, FAA3A875151279DE00C7904C /* 57-lite.png in Resources */, diff --git a/iphone/Maps/Suggestion Icons/money.png b/iphone/Maps/Suggestion Icons/atm.png similarity index 100% rename from iphone/Maps/Suggestion Icons/money.png rename to iphone/Maps/Suggestion Icons/atm.png diff --git a/iphone/Maps/Suggestion Icons/money@2x.png b/iphone/Maps/Suggestion Icons/atm@2x.png similarity index 100% rename from iphone/Maps/Suggestion Icons/money@2x.png rename to iphone/Maps/Suggestion Icons/atm@2x.png diff --git a/iphone/Maps/Suggestion Icons/bank.png b/iphone/Maps/Suggestion Icons/bank.png new file mode 100644 index 0000000000..0dbc2e9719 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/bank.png differ diff --git a/iphone/Maps/Suggestion Icons/bank@2x.png b/iphone/Maps/Suggestion Icons/bank@2x.png new file mode 100644 index 0000000000..41dec5fa43 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/bank@2x.png differ diff --git a/iphone/Maps/Suggestion Icons/entertainment.png b/iphone/Maps/Suggestion Icons/entertainment.png new file mode 100644 index 0000000000..45e201d263 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/entertainment.png differ diff --git a/iphone/Maps/Suggestion Icons/entertainment@2x.png b/iphone/Maps/Suggestion Icons/entertainment@2x.png new file mode 100644 index 0000000000..484fb9a2ba Binary files /dev/null and b/iphone/Maps/Suggestion Icons/entertainment@2x.png differ diff --git a/iphone/Maps/Suggestion Icons/hospital.png b/iphone/Maps/Suggestion Icons/hospital.png new file mode 100644 index 0000000000..f766c648bd Binary files /dev/null and b/iphone/Maps/Suggestion Icons/hospital.png differ diff --git a/iphone/Maps/Suggestion Icons/hospital@2x.png b/iphone/Maps/Suggestion Icons/hospital@2x.png new file mode 100644 index 0000000000..85b27fcb58 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/hospital@2x.png differ diff --git a/iphone/Maps/Suggestion Icons/hotel.png b/iphone/Maps/Suggestion Icons/hotel.png new file mode 100644 index 0000000000..aecdb72b28 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/hotel.png differ diff --git a/iphone/Maps/Suggestion Icons/hotel@2x.png b/iphone/Maps/Suggestion Icons/hotel@2x.png new file mode 100644 index 0000000000..ec88273cd5 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/hotel@2x.png differ diff --git a/iphone/Maps/Suggestion Icons/parking.png b/iphone/Maps/Suggestion Icons/parking.png new file mode 100644 index 0000000000..13f8ca192b Binary files /dev/null and b/iphone/Maps/Suggestion Icons/parking.png differ diff --git a/iphone/Maps/Suggestion Icons/parking@2x.png b/iphone/Maps/Suggestion Icons/parking@2x.png new file mode 100644 index 0000000000..777795b743 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/parking@2x.png differ diff --git a/iphone/Maps/Suggestion Icons/pharmacy.png b/iphone/Maps/Suggestion Icons/pharmacy.png new file mode 100644 index 0000000000..fa2147f41a Binary files /dev/null and b/iphone/Maps/Suggestion Icons/pharmacy.png differ diff --git a/iphone/Maps/Suggestion Icons/pharmacy@2x.png b/iphone/Maps/Suggestion Icons/pharmacy@2x.png new file mode 100644 index 0000000000..455bcf2f38 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/pharmacy@2x.png differ diff --git a/iphone/Maps/Suggestion Icons/police.png b/iphone/Maps/Suggestion Icons/police.png new file mode 100644 index 0000000000..198c9dd3c4 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/police.png differ diff --git a/iphone/Maps/Suggestion Icons/police@2x.png b/iphone/Maps/Suggestion Icons/police@2x.png new file mode 100644 index 0000000000..e9bb8a2e11 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/police@2x.png differ diff --git a/iphone/Maps/Suggestion Icons/post.png b/iphone/Maps/Suggestion Icons/post.png new file mode 100644 index 0000000000..1ec125c5cd Binary files /dev/null and b/iphone/Maps/Suggestion Icons/post.png differ diff --git a/iphone/Maps/Suggestion Icons/post@2x.png b/iphone/Maps/Suggestion Icons/post@2x.png new file mode 100644 index 0000000000..383a88f1d4 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/post@2x.png differ diff --git a/iphone/Maps/Suggestion Icons/toilet.png b/iphone/Maps/Suggestion Icons/toilet.png new file mode 100644 index 0000000000..913286ee2c Binary files /dev/null and b/iphone/Maps/Suggestion Icons/toilet.png differ diff --git a/iphone/Maps/Suggestion Icons/toilet@2x.png b/iphone/Maps/Suggestion Icons/toilet@2x.png new file mode 100644 index 0000000000..88d7f23a39 Binary files /dev/null and b/iphone/Maps/Suggestion Icons/toilet@2x.png differ diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings index b64b1a9072..080fac6382 100644 --- a/iphone/Maps/de.lproj/Localizable.strings +++ b/iphone/Maps/de.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "Das Land auf der Karte anzeigen"; -/* Search Suggestion */ -"food" = "essen"; - -/* Search Suggestion */ -"money" = "Geld"; - -/* Search Suggestion */ -"fuel" = "Tankstelle"; - -/* Search Suggestion */ -"shop" = "Laden"; - -/* Search Suggestion */ -"transport" = "Verkehr"; - -/* Search Suggestion */ -"tourism" = "Sehenswürdigkeit"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^wird zur Download-Warteschleife hinzugefügt"; @@ -334,10 +316,57 @@ "measurement_units_summary" = "Auswahl zwischen Meilen und Kilometern"; /* Do search in all sources */ -"search_mode_all" = "All"; +"search_mode_all" = "Überall"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "In meiner Nähe"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "Auf der Karte"; + +/* Search Suggestion */ +"food" = "Essen"; + +/* Search Suggestion */ +"transport" = "Verkehr"; + +/* Search Suggestion */ +"fuel" = "Tankstelle"; + +/* Search Suggestion */ +"parking" = "Parkplatz"; + +/* Search Suggestion */ +"shop" = "Laden"; + +"hotel" = "Hotel"; + +/* Search Suggestion */ +"tourism" = "Sehenswürdigkeit"; + +/* Search Suggestion */ +"entertainment" = "Unterhaltung"; + +/* Search Suggestion */ +"atm" = "Geldautomat"; + +/* Search Suggestion */ +"bank" = "Bank"; + +/* Search Suggestion */ +"pharmacy" = "Apotheke"; + +/* Search Suggestion */ +"hospital" = "Spital"; + +/* Search Suggestion */ +"toilet" = "Toilette"; + +/* Search Suggestion */ +"post" = "Post"; + +/* Search Suggestion */ +"police" = "Polizeistation"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "Keine Ergebnisse gefunden"; diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index 0f61eef682..6a0248653d 100644 --- a/iphone/Maps/en.lproj/Localizable.strings +++ b/iphone/Maps/en.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "Zoom to the country"; -/* Search Suggestion */ -"food" = "food"; - -/* Search Suggestion */ -"money" = "money"; - -/* Search Suggestion */ -"fuel" = "gas"; - -/* Search Suggestion */ -"shop" = "shop"; - -/* Search Suggestion */ -"transport" = "transport"; - -/* Search Suggestion */ -"tourism" = "sights"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^is added to the downloading queue."; @@ -337,7 +319,54 @@ "search_mode_all" = "All"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "Near me"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "On the map"; + +/* Search Suggestion */ +"food" = "food"; + +/* Search Suggestion */ +"transport" = "transport"; + +/* Search Suggestion */ +"fuel" = "gas"; + +/* Search Suggestion */ +"parking" = "parking"; + +/* Search Suggestion */ +"shop" = "shop"; + +"hotel" = "hotel"; + +/* Search Suggestion */ +"tourism" = "sights"; + +/* Search Suggestion */ +"entertainment" = "entertainment"; + +/* Search Suggestion */ +"atm" = "atm"; + +/* Search Suggestion */ +"bank" = "bank"; + +/* Search Suggestion */ +"pharmacy" = "pharmacy"; + +/* Search Suggestion */ +"hospital" = "hospital"; + +/* Search Suggestion */ +"toilet" = "toilet"; + +/* Search Suggestion */ +"post" = "post"; + +/* Search Suggestion */ +"police" = "police"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "No results found"; diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings index a6e870e975..4d05807737 100644 --- a/iphone/Maps/es.lproj/Localizable.strings +++ b/iphone/Maps/es.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "Ampliar la vista del país"; -/* Search Suggestion */ -"food" = "comer"; - -/* Search Suggestion */ -"money" = "dinero"; - -/* Search Suggestion */ -"fuel" = "gasolinera"; - -/* Search Suggestion */ -"shop" = "tienda"; - -/* Search Suggestion */ -"transport" = "transporte"; - -/* Search Suggestion */ -"tourism" = "turismo"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^añadido a la cola de descarga"; @@ -334,10 +316,57 @@ "measurement_units_summary" = "Elija entre millas y kilómetros"; /* Do search in all sources */ -"search_mode_all" = "All"; +"search_mode_all" = "Todos"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "Cerca de mí"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "En el mapa"; + +/* Search Suggestion */ +"food" = "comer"; + +/* Search Suggestion */ +"transport" = "transporte"; + +/* Search Suggestion */ +"fuel" = "gasolinera"; + +/* Search Suggestion */ +"parking" = "estationamiento"; + +/* Search Suggestion */ +"shop" = "tienda"; + +"hotel" = "hotel"; + +/* Search Suggestion */ +"tourism" = "turismo"; + +/* Search Suggestion */ +"entertainment" = "entretenimiento"; + +/* Search Suggestion */ +"atm" = "atm"; + +/* Search Suggestion */ +"bank" = "banco"; + +/* Search Suggestion */ +"pharmacy" = "farmacia"; + +/* Search Suggestion */ +"hospital" = "hospital"; + +/* Search Suggestion */ +"toilet" = "servicios sanitario"; + +/* Search Suggestion */ +"post" = "oficina de correos"; + +/* Search Suggestion */ +"police" = "policía"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "No se han encontrado resultados"; diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings index 7d4b8ef440..509f1f03f6 100644 --- a/iphone/Maps/fr.lproj/Localizable.strings +++ b/iphone/Maps/fr.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "Zoomer sur le pays désiré"; -/* Search Suggestion */ -"food" = "repas"; - -/* Search Suggestion */ -"money" = "argent"; - -/* Search Suggestion */ -"fuel" = "station-service"; - -/* Search Suggestion */ -"shop" = "magasin"; - -/* Search Suggestion */ -"transport" = "transport"; - -/* Search Suggestion */ -"tourism" = "curiosités"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^ajouté à son tour de télécharger"; @@ -334,10 +316,57 @@ "measurement_units_summary" = "Choisissez entre miles et kilomètres"; /* Do search in all sources */ -"search_mode_all" = "All"; +"search_mode_all" = "Partout"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "Près de moi"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "Sur la carte"; + +/* Search Suggestion */ +"food" = "repas"; + +/* Search Suggestion */ +"transport" = "transport"; + +/* Search Suggestion */ +"fuel" = "station-service"; + +/* Search Suggestion */ +"parking" = "parking"; + +/* Search Suggestion */ +"shop" = "magasin"; + +"hotel" = "hôtel"; + +/* Search Suggestion */ +"tourism" = "curiosités"; + +/* Search Suggestion */ +"entertainment" = "divertissement"; + +/* Search Suggestion */ +"atm" = "bancomat"; + +/* Search Suggestion */ +"bank" = "banque"; + +/* Search Suggestion */ +"pharmacy" = "pharmacie"; + +/* Search Suggestion */ +"hospital" = "hôpital|clinique"; + +/* Search Suggestion */ +"toilet" = "toilette"; + +/* Search Suggestion */ +"post" = "poste"; + +/* Search Suggestion */ +"police" = "gendarmerie"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "Aucun résultat trouvé"; diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings index 4beead3779..69f0390534 100644 --- a/iphone/Maps/it.lproj/Localizable.strings +++ b/iphone/Maps/it.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "Zoom to the country"; -/* Search Suggestion */ -"food" = "mangiare"; - -/* Search Suggestion */ -"money" = "soldi"; - -/* Search Suggestion */ -"fuel" = "stazione di rifornimento"; - -/* Search Suggestion */ -"shop" = "negozio"; - -/* Search Suggestion */ -"transport" = "transporto"; - -/* Search Suggestion */ -"tourism" = "turistico"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^is added to the downloading queue."; @@ -337,7 +319,54 @@ "search_mode_all" = "All"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "Near me"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "On the map"; + +/* Search Suggestion */ +"food" = "mangiare"; + +/* Search Suggestion */ +"transport" = "transporto"; + +/* Search Suggestion */ +"fuel" = "stazione di rifornimento"; + +/* Search Suggestion */ +"parking" = "parcheggio"; + +/* Search Suggestion */ +"shop" = "negozio"; + +"hotel" = "hôtel"; + +/* Search Suggestion */ +"tourism" = "turistico"; + +/* Search Suggestion */ +"entertainment" = "entertainment"; + +/* Search Suggestion */ +"atm" = "bancomat"; + +/* Search Suggestion */ +"bank" = "banca"; + +/* Search Suggestion */ +"pharmacy" = "farmacia"; + +/* Search Suggestion */ +"hospital" = "ospedale"; + +/* Search Suggestion */ +"toilet" = "toilette"; + +/* Search Suggestion */ +"post" = "posta"; + +/* Search Suggestion */ +"police" = "posto di polizia"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "No results found"; diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings index 68f51d3763..d58a29b54d 100644 --- a/iphone/Maps/ja.lproj/Localizable.strings +++ b/iphone/Maps/ja.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "国へズーム"; -/* Search Suggestion */ -"food" = "飯"; - -/* Search Suggestion */ -"money" = "金"; - -/* Search Suggestion */ -"fuel" = "燃料"; - -/* Search Suggestion */ -"shop" = "店"; - -/* Search Suggestion */ -"transport" = "輸送"; - -/* Search Suggestion */ -"tourism" = "観光"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^をダウンロードキューに追加しました"; @@ -334,10 +316,57 @@ "measurement_units_summary" = "マイルまたはキロメートルを選択"; /* Do search in all sources */ -"search_mode_all" = "All"; +"search_mode_all" = "どこにでも"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "周辺情報"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "地図上検索"; + +/* Search Suggestion */ +"food" = "飯"; + +/* Search Suggestion */ +"transport" = "輸送"; + +/* Search Suggestion */ +"fuel" = "燃料"; + +/* Search Suggestion */ +"parking" = "駐車場"; + +/* Search Suggestion */ +"shop" = "店"; + +"hotel" = "ホテル"; + +/* Search Suggestion */ +"tourism" = "観光"; + +/* Search Suggestion */ +"entertainment" = "エンターテイメント"; + +/* Search Suggestion */ +"atm" = "atm"; + +/* Search Suggestion */ +"bank" = "銀行"; + +/* Search Suggestion */ +"pharmacy" = "薬局"; + +/* Search Suggestion */ +"hospital" = "病院"; + +/* Search Suggestion */ +"toilet" = "トイレ"; + +/* Search Suggestion */ +"post" = "電子メール"; + +/* Search Suggestion */ +"police" = "警察"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "結果が見つかりませんでした"; diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings index 45ff4cc2c6..0f0e2a2a00 100644 --- a/iphone/Maps/ko.lproj/Localizable.strings +++ b/iphone/Maps/ko.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "국가로 확대하여 주세요"; -/* Search Suggestion */ -"food" = "음식"; - -/* Search Suggestion */ -"money" = "돈"; - -/* Search Suggestion */ -"fuel" = "연료"; - -/* Search Suggestion */ -"shop" = "쇼핑"; - -/* Search Suggestion */ -"transport" = "수송"; - -/* Search Suggestion */ -"tourism" = "관광"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^는 다운로드 대기열에추가됩니다."; @@ -334,10 +316,57 @@ "measurement_units_summary" = "마일과 킬로미터 중에서 선택하십시오"; /* Do search in all sources */ -"search_mode_all" = "All"; +"search_mode_all" = "모든 곳"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "근처 검색"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "현재 맵 검색"; + +/* Search Suggestion */ +"food" = "음식"; + +/* Search Suggestion */ +"transport" = "수송"; + +/* Search Suggestion */ +"fuel" = "연료"; + +/* Search Suggestion */ +"parking" = "주차"; + +/* Search Suggestion */ +"shop" = "쇼핑"; + +"hotel" = "호텔"; + +/* Search Suggestion */ +"tourism" = "관광"; + +/* Search Suggestion */ +"entertainment" = "엔터테인먼트"; + +/* Search Suggestion */ +"atm" = "atm"; + +/* Search Suggestion */ +"bank" = "은행"; + +/* Search Suggestion */ +"pharmacy" = "약국"; + +/* Search Suggestion */ +"hospital" = "병원"; + +/* Search Suggestion */ +"toilet" = "화장실"; + +/* Search Suggestion */ +"post" = "우편"; + +/* Search Suggestion */ +"police" = "치안대"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "결과 없음"; diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings index 50cd314ca0..d28c91a3ec 100644 --- a/iphone/Maps/nl.lproj/Localizable.strings +++ b/iphone/Maps/nl.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "Zoom in richting het land"; -/* Search Suggestion */ -"food" = "eten"; - -/* Search Suggestion */ -"money" = "geld"; - -/* Search Suggestion */ -"fuel" = "benzine"; - -/* Search Suggestion */ -"shop" = "winkel"; - -/* Search Suggestion */ -"transport" = "transport"; - -/* Search Suggestion */ -"tourism" = "toerisme"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^is toegevoegd aan de download wachtrij"; @@ -334,10 +316,57 @@ "measurement_units_summary" = "Kies tussen mijlen en kilometers"; /* Do search in all sources */ -"search_mode_all" = "All"; +"search_mode_all" = "Overalq"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "Dichtbij mij"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "Op de kaart"; + +/* Search Suggestion */ +"food" = "eten"; + +/* Search Suggestion */ +"transport" = "transport"; + +/* Search Suggestion */ +"fuel" = "benzine"; + +/* Search Suggestion */ +"parking" = "parkeerplaats"; + +/* Search Suggestion */ +"shop" = "winkel"; + +"hotel" = "hotel"; + +/* Search Suggestion */ +"tourism" = "toerisme"; + +/* Search Suggestion */ +"entertainment" = "uitgaan"; + +/* Search Suggestion */ +"atm" = "geldautomaat"; + +/* Search Suggestion */ +"bank" = "bank"; + +/* Search Suggestion */ +"pharmacy" = "apotheek"; + +/* Search Suggestion */ +"hospital" = "ziekenhuis"; + +/* Search Suggestion */ +"toilet" = "toilet"; + +/* Search Suggestion */ +"post" = "post"; + +/* Search Suggestion */ +"police" = "politie"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "Geen resultaten gevonden"; diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings index b2c3dfb4e1..5062b798b2 100644 --- a/iphone/Maps/ru.lproj/Localizable.strings +++ b/iphone/Maps/ru.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "Показать страну на карте"; -/* Search Suggestion */ -"food" = "еда"; - -/* Search Suggestion */ -"money" = "деньги"; - -/* Search Suggestion */ -"fuel" = "заправка"; - -/* Search Suggestion */ -"shop" = "магазин"; - -/* Search Suggestion */ -"transport" = "транспорт"; - -/* Search Suggestion */ -"tourism" = "достопримечательность"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^добавлено в очередь загрузки."; @@ -340,4 +322,51 @@ "search_mode_nearme" = "Около меня"; /* Do search in current viewport only */ -"search_mode_viewport" = "В текущем экране"; +"search_mode_viewport" = "На карте"; + +/* Search Suggestion */ +"food" = "еда"; + +/* Search Suggestion */ +"transport" = "транспорт"; + +/* Search Suggestion */ +"fuel" = "заправка"; + +/* Search Suggestion */ +"parking" = "парковка"; + +/* Search Suggestion */ +"shop" = "магазин"; + +"hotel" = "гостиница"; + +/* Search Suggestion */ +"tourism" = "достопримечательность"; + +/* Search Suggestion */ +"entertainment" = "развлечения"; + +/* Search Suggestion */ +"atm" = "банкомат"; + +/* Search Suggestion */ +"bank" = "банк"; + +/* Search Suggestion */ +"pharmacy" = "аптека"; + +/* Search Suggestion */ +"hospital" = "больница"; + +/* Search Suggestion */ +"toilet" = "туалет"; + +/* Search Suggestion */ +"post" = "почта"; + +/* Search Suggestion */ +"police" = "полиция"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "Нет результатов поиска"; diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings index 6ce39fd5a2..a006ddf56d 100644 --- a/iphone/Maps/uk.lproj/Localizable.strings +++ b/iphone/Maps/uk.lproj/Localizable.strings @@ -153,24 +153,6 @@ /* View and button titles for accessibility */ "zoom_to_country" = "Показати країну на карті"; -/* Search Suggestion */ -"food" = "food"; - -/* Search Suggestion */ -"money" = "money"; - -/* Search Suggestion */ -"fuel" = "gas"; - -/* Search Suggestion */ -"shop" = "shop"; - -/* Search Suggestion */ -"transport" = "transport"; - -/* Search Suggestion */ -"tourism" = "sights"; - /* Message to display at the center of the screen when the country is added to the downloading queue */ "country_status_added_to_queue" = "^добавлено в чергу завантаження."; @@ -334,10 +316,57 @@ "measurement_units_summary" = "Вибір між милями та кілометрами"; /* Do search in all sources */ -"search_mode_all" = "All"; +"search_mode_all" = "Скрізь"; /* Do search near my position only */ -"search_mode_nearme" = "Near Me"; +"search_mode_nearme" = "Поряд"; /* Do search in current viewport only */ -"search_mode_viewport" = "Map View"; +"search_mode_viewport" = "На мапі"; + +/* Search Suggestion */ +"food" = "food"; + +/* Search Suggestion */ +"transport" = "transport"; + +/* Search Suggestion */ +"fuel" = "gas"; + +/* Search Suggestion */ +"parking" = "parking"; + +/* Search Suggestion */ +"shop" = "shop"; + +"hotel" = "hotel"; + +/* Search Suggestion */ +"tourism" = "sights"; + +/* Search Suggestion */ +"entertainment" = "entertainment"; + +/* Search Suggestion */ +"atm" = "atm"; + +/* Search Suggestion */ +"bank" = "bank"; + +/* Search Suggestion */ +"pharmacy" = "pharmacy"; + +/* Search Suggestion */ +"hospital" = "hospital"; + +/* Search Suggestion */ +"toilet" = "toilet"; + +/* Search Suggestion */ +"post" = "post"; + +/* Search Suggestion */ +"police" = "police"; + +/* String in search result list, when nothing found */ +"no_search_results_found" = "Результатів не знайдено"; diff --git a/strings.txt b/strings.txt index ebda1a1dec..670e8479ad 100644 --- a/strings.txt +++ b/strings.txt @@ -556,77 +556,6 @@ uk = Показати країну на карті cs = Zobrazit na mapě nl = Zoom in richting het land - [food] - en = food - comment = Search Suggestion - de = essen - es = comer - fr = repas - it = mangiare - ja = 飯 - ko = 음식 - ru = еда - cs = jídlo - nl = eten - [money] - en = money - comment = Search Suggestion - de = Geld - es = dinero - fr = argent - it = soldi - ja = 金 - ko = 돈 - ru = деньги - cs = peníze - nl = geld - [fuel] - en = gas - comment = Search Suggestion - de = Tankstelle - es = gasolinera - fr = station-service - it = stazione di rifornimento - ja = 燃料 - ko = 연료 - ru = заправка - cs = čerpací stanice - nl = benzine - [shop] - en = shop - comment = Search Suggestion - de = Laden - es = tienda - fr = magasin - it = negozio - ja = 店 - ko = 쇼핑 - ru = магазин - cs = obchod - nl = winkel - [transport] - en = transport - comment = Search Suggestion - de = Verkehr - es = transporte - it = transporto - ja = 輸送 - ko = 수송 - ru = транспорт - cs = doprava - nl = transport - [tourism] - en = sights - comment = Search Suggestion - de = Sehenswürdigkeit - es = turismo - fr = curiosités - it = turistico - ja = 観光 - ko = 관광 - ru = достопримечательность - cs = pamětihodnosti - nl = toerisme [country_status_added_to_queue] en = ^is added to the downloading queue. comment = Message to display at the center of the screen when the country is added to the downloading queue @@ -1364,14 +1293,243 @@ en = All tags = ios, android comment = Do search in all sources + de = Überall + es = Todos + fr = Partout + ja = どこにでも + ko = 모든 곳 ru = Везде + uk = Скрізь + cs = Všude + nl = Overalq [search_mode_nearme] - en = Near Me + en = Near me tags = ios, android comment = Do search near my position only + de = In meiner Nähe + es = Cerca de mí + fr = Près de moi + ja = 周辺情報 + ko = 근처 검색 ru = Около меня + uk = Поряд + cs = V mé blízkosti + nl = Dichtbij mij [search_mode_viewport] - en = Map View + en = On the map tags = ios, android comment = Do search in current viewport only - ru = В текущем экране + de = Auf der Karte + es = En el mapa + fr = Sur la carte + ja = 地図上検索 + ko = 현재 맵 검색 + ru = На карте + uk = На мапі + cs = Na mapě + nl = Op de kaart + [food] + en = food + tags = ios, android + comment = Search Suggestion + de = Essen + es = comer + fr = repas + it = mangiare + ja = 飯 + ko = 음식 + ru = еда + cs = jídlo + nl = eten + [transport] + en = transport + tags = ios, android + comment = Search Suggestion + de = Verkehr + es = transporte + it = transporto + ja = 輸送 + ko = 수송 + ru = транспорт + cs = doprava + nl = transport + [fuel] + en = gas + tags = ios, android + comment = Search Suggestion + de = Tankstelle + es = gasolinera + fr = station-service + it = stazione di rifornimento + ja = 燃料 + ko = 연료 + ru = заправка + cs = čerpací stanice + nl = benzine + [parking] + en = parking + tags = ios, android + comment = Search Suggestion + de = Parkplatz + es = estationamiento + fr = parking + it = parcheggio + ja = 駐車場 + ko = 주차 + ru = парковка + cs = parkoviště + nl = parkeerplaats + [shop] + en = shop + tags = ios, android + comment = Search Suggestion + de = Laden + es = tienda + fr = magasin + it = negozio + ja = 店 + ko = 쇼핑 + ru = магазин + cs = obchod + nl = winkel + [hotel] + en = hotel + tags = ios, android + de = Hotel + es = hotel + fr = hôtel + it = hôtel + ja = ホテル + ko = 호텔 + ru = гостиница + cs = hotel + nl = hotel + [tourism] + en = sights + tags = ios, android + comment = Search Suggestion + de = Sehenswürdigkeit + es = turismo + fr = curiosités + it = turistico + ja = 観光 + ko = 관광 + ru = достопримечательность + cs = pamětihodnosti + nl = toerisme + [entertainment] + en = entertainment + tags = ios, android + comment = Search Suggestion + de = Unterhaltung + es = entretenimiento + fr = divertissement + ja = エンターテイメント + ko = 엔터테인먼트 + ru = развлечения + cs = zábava + nl = uitgaan + [atm] + en = atm + tags = ios, android + comment = Search Suggestion + de = Geldautomat + es = atm + fr = bancomat + it = bancomat + ja = atm + ko = atm + ru = банкомат + cs = bankomat + nl = geldautomaat + [bank] + en = bank + tags = ios, android + comment = Search Suggestion + de = Bank + es = banco + fr = banque + it = banca + ja = 銀行 + ko = 은행 + ru = банк + cs = banka + nl = bank + [pharmacy] + en = pharmacy + tags = ios, android + comment = Search Suggestion + de = Apotheke + es = farmacia + fr = pharmacie + it = farmacia + ja = 薬局 + ko = 약국 + ru = аптека + cs = lékárna + nl = apotheek + [hospital] + en = hospital + tags = ios, android + comment = Search Suggestion + de = Spital + es = hospital + fr = hôpital|clinique + it = ospedale + ja = 病院 + ko = 병원 + ru = больница + cs = nemocnice + nl = ziekenhuis + [toilet] + en = toilet + tags = ios, android + comment = Search Suggestion + de = Toilette + es = servicios sanitario + fr = toilette + it = toilette + ja = トイレ + ko = 화장실 + ru = туалет + cs = záchody + nl = toilet + [post] + en = post + tags = ios, android + comment = Search Suggestion + de = Post + es = oficina de correos + fr = poste + it = posta + ja = 電子メール + ko = 우편 + ru = почта + cs = pošta + nl = post + [police] + en = police + tags = ios, android + comment = Search Suggestion + de = Polizeistation + es = policía + fr = gendarmerie + it = posto di polizia + ja = 警察 + ko = 치안대 + ru = полиция + cs = policie + nl = politie + [no_search_results_found] + en = No results found + tags = ios, android + comment = String in search result list, when nothing found + de = Keine Ergebnisse gefunden + es = No se han encontrado resultados + fr = Aucun résultat trouvé + ja = 結果が見つかりませんでした + ko = 결과 없음 + ru = Нет результатов поиска + uk = Результатів не знайдено + cs = Žádné výsledky + nl = Geen resultaten gevonden