diff --git a/data/copyright.html b/data/copyright.html index f1d0943b7b..414a9b4513 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -2,7 +2,8 @@ - + + Copyright + + + + +
+To improve the quality of speaking the navigation instructions, please, download an enhanced voice package.


+To do that, follow the following instructions:
+ +
+Now the quality of speaking the navigation instructions will be better. +
+ +
+नेविगेशन निर्देश बोलने की गुणवत्ता में सुधार करने के लिए, एक परिष्कृत आवाज का पैकेज डाउनलोड करें।


+ऐसा करने के लिए, निम्न निर्देशों का पालन करें:
+ +
+अब नेविगेशन निर्देशों को बोलने की गुणवत्ता बेहतर हो जाएगी। +
+ +
+Чтобы улучшить качество проговаривания голосовых подсказок во время навигации скачайте улучшенный голосовой пакет.


+Для этого выполните следующие действия:
+ +
+Теперь качество проговаривания голосовых подсказок стало лучше. +
+ +
+Chcete-li zlepšit kvalitu hlasové navigace, pak si prosím stáhněte rozšířený hlasový balíček.


+Chcete-li to provést, pak postupujte podle následujících pokynů:
+ +
+Stáhněte si rozšířený hlasový balíček. +
+ + + + +
+Aby polepszyć jakość głosowych instrukcji nawigacji, pobierz pakiet poprawionych głosów.


+W tym celu postępuj zgodnie z poniższymi instrukcjami:
+ +
+Dzięki temu jakość głosowych instrukcji nawigacji polepszy się. +
+ +
+Förbättra röstkvaliteten på navigationsanvisningarna genom att hämta ett paket med förbättrad röst.


+Följ nedanstående anvisningar för att göra det:
+ +
+Nu blir kvaliteten på talet i navigationsanvisningarna bättre. +
+ +
+Navigasyon talimatlarının konuşma kalitesini geliştirmek için lütfen iyileştirilmiş ses paketini indir.


+Bunu yapmak için aşağıdaki talimatları izle:
+ +
+Artık navigasyon talimatlarının konuşma kalitesi daha iyi olacak. +
+ +
+Afin d'améliorer la qualité vocale des instructions de navigation, veuillez, je vous prie, télécharger un logiciel vocal haute définition.


+Pour ce faire, veuillez suivre les instructions suivantes:
+ +
+Dès lors, la qualité vocale des instructions de navigation s'en trouvera améliorée. +
+ +
+Om de kwaliteit van de gesproken navigatie-instructies te verbeteren, kunt u een verbeterd stemmenpakket downloaden.


+Om dat te doen, volgt u de volgende instructies:
+ +
+Nu zal de kwaliteit van de gesproken navigatie-instructies beter zijn. +
+ +
+Um die Sprachqualität der Navigationshilfe zu verbessern, laden Sie bitte ein verbessertes Sprachpaket herunter.


+Um dies zu tun, folgen Sie diesen Anweisungen:
+ +
+Jetzt wird die Qualität der Sprachausgabe bei der Navigation besser sein. +
+ +
+لتحسين جودة إرشادات الملاحة الصوتية، الرجاء تنزيل الحزمة الصوتية المحسنة.


+للقيام بذلك، اتبع التعليمات التالية:
+ +
+الآن ستصير إرشادات الملاحة الصوتية أفضل. +
+ +
+Για να βελτιώσετε την ποιότητα της εκφώνησης των οδηγιών πλοήγησης, παρακαλούμε, κάντε λήψη ενός βελτιωμένου φωνητικού πακέτου.


+Για να το κάνετε αυτό, ακολουθήστε τις παρακάτω οδηγίες:
+ +
+Τώρα η ποιότητα της εκφώνησης των οδηγιών πλοήγησης θα είναι βελτιωμένη. +
+ +
+Per migliorare la qualità delle istruzioni vocali di navigazione, consigliamo di scaricare il pacchetto voce ottimizzato.


+Per farlo, segui le seguenti istruzioni:
+ +
+Con questo pacchetto, la qualità delle istruzioni vocali di navigazione sarà migliore. +
+ + + + + +
+Növelheti a navigációs instrukciók beszédminőségét, ha letölti a továbbfejlesztett hangcsomagot.


+Ehhez kövesse az alábbi utasításokat:
+ +
+Ettől fogva a navigációs instrukciók beszédminősége optimálisabb lesz. +
+ +
+Pentru a îmbunătăți calitatea fluxul verbal al instrucțiunilor de navigare, vă rugăm să descărcați un pachet de voce îmbunătățit.


+Pentru a face acest lucru, urmați instrucțiunile de mai jos:
+ +
+Acum, calitatea fluxului verbal al instrucțiunilor de navigare va fi mai bună. +
+ +
+音声案内の質を上させるには、ボイスパッケージをダウンロードしてください。


+ボイスパッケージのダウンロードは、次の手順に従ってください。
+ +
+これで音声案内の質が上がります。 +
+ +
+For at forbedre kvaliteten af stemmenavigationsinstruktionerne, venligst download en forbedret stemmepakke.


+For at gøre dette, følg følgende instruktioner:
+ +
+Nu vil stemmenavigeringsinstruktionerne være bedre. +
+ +
+Para mejorar la calidad de las instrucciones habladas de navegación, por favor, descarga un paquete optimizado de voz.


+Para ello, sigue estas instrucciones:
+ +
+Descarga un paquete optimizado de voz. +
+ + +
+Per tal de millorar la qualitat vocal de les instruccions de navegació, descarregueu, si us plau, un programari vocal d'alta definició.


+Per a fer-ho, seguiu les instruccions següents:
+ +
+D'aquesta manera, es millorarà la qualitat vocal de les instruccions de navegació. +
+ +
+Parantaaksesi navigointijärjestelmän puheentunnistusta, ole hyvä ja lataa paranneltu puhepaketti.


+Ladataksesi paketin, seuraa oheista ohjetta:
+ +
+Paketin latauksen jälkeen on navigointijärjestelmäsi puheentunnistusta entistäkin parempi. +
+ + +
+Kako bi poboljšali kvalitetu govora uputa za vožnju, molimo vas da preuzmete poboljšani glasovni paket.


+Kako biste to učinili slijedite sljedeće upute:
+ +
+Sada će kvaliteta govora uputa za vožnju biti bolja. +
+ +
+Untuk meningkatkan kualitas ucapan petunjuk navigasi, silakan unduh paket suara yang disempurnakan.


+Untuk melakukannya, ikuti petunjuk berikut ini:
+ +
+Sekarang kualitas ucapan petunjuk navigasi akan menjadi lebih baik. +
+ +
+네비게이션 음성 명령 지침의 품질을 향상하려면, 강화된 음성 패키지를 다운로드하십시오.


+이를 실행하려면, 다음 지침을 따르십시오:
+ +
+지금 내비게이션 음성 명령 지침의 품질이 더 좋아졌습니다. +
+ +
+Para melhorar a qualidade das instruções verbais de navegação, por favor, baixe um pacote aprimorado de voz.


+Para fazer isso, siga as instruções a seguir:
+ +
+Agora, a qualidade das instruções verbais de navegação será melhor. +
+ +
+Ak chcete zlepšiť kvalitu hovorenia navigačných pokynov, prosím, stiahnite si vylepšený hlasový balíček.


+V záujme toho postupujte podľa nasledujúcich pokynov:
+ +
+Teraz bude kvalita hovorenia navigačných pokynov lepšia. +
+ +
+Kuinua ubora wa kuongea maelekezo ya urambazaji, tafadhali, pakua kuimarisha mfuko wa sauti ulioimarishwa.


+Kutenda hivyo, fuata maagizo yafuatayo:
+ +
+Sasa ubora wa kuongea maelekezo ya urambazaji utakuwa ni bora zaidi. +
+ +
+เพื่อปรับปรุงคุณภาพของการแนะนำการนำทางด้วยการพูด โปรดดาวน์โหลดแพ็กเกจเสียงพูดแบบปรับประสิทธิภาพ


+เพื่อดำเนินการนั้น ทำตามคำแนะนำดังต่อไปนี้:
+ +
+ตอนนี้คำแนะนำการนำทางด้วยการพูดจะดียิ่งขึ้น +
+ +
+若要提高語音導航指示的品質,請下載一個增強語音包。


+若要這樣做,請遵循以下說明:
+ +
+現在,語音導航指示的品質將會更好。 +
+ +
+若要提高语音导航指示的品质,请下载一个增强语音包。


+若要这样做,请遵循以下说明:
+ +
+现在,语音导航指示的质量将会更好。 +
+ + + + diff --git a/data/welcome.html b/data/welcome.html index 9eab93ee19..872155efa8 100644 --- a/data/welcome.html +++ b/data/welcome.html @@ -1,4 +1,13 @@ + + + + +

Offline World Map in your computer

Congratulations! You're just in one step to see yor favourite cities and countries!

diff --git a/iphone/Common/WebViewController.mm b/iphone/Common/WebViewController.mm index b1d42c3f34..61519defa0 100644 --- a/iphone/Common/WebViewController.mm +++ b/iphone/Common/WebViewController.mm @@ -35,6 +35,7 @@ UIWebView * webView = [[UIWebView alloc] initWithFrame:frame]; webView.autoresizesSubviews = YES; webView.autoresizingMask = (UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth); + webView.backgroundColor = [UIColor whiteColor]; webView.delegate = self; if (self.m_htmlText) diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 248b597879..a35d3412a9 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -10,6 +10,8 @@ #import "Preferences.h" #import "RouteState.h" #import "Statistics.h" +#import "UIColor+MapsMeColor.h" +#import "UIFont+MapsMeFonts.h" #import #import #import @@ -376,18 +378,18 @@ void InitLocalizedStrings() - (void)customizeAppearance { - NSMutableDictionary * attributes = [[NSMutableDictionary alloc] init]; - attributes[NSForegroundColorAttributeName] = [UIColor whiteColor]; + NSDictionary * attributes = @{ + NSForegroundColorAttributeName : [UIColor whiteColor], + NSFontAttributeName : [UIFont regular18] + }; - Class const navigationControllerClass = [NavigationController class]; - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setTintColor:[UIColor whiteColor]]; - [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal]; - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setBarTintColor:[UIColor colorWithColorCode:@"0e8639"]]; - attributes[NSFontAttributeName] = [UIFont fontWithName:@"HelveticaNeue" size:17.5]; - - UINavigationBar * navBar = [UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil]; - navBar.shadowImage = [[UIImage alloc] init]; + UINavigationBar * navBar = [UINavigationBar appearance]; + navBar.tintColor = [UIColor primary]; + navBar.barTintColor = [UIColor primary]; + navBar.shadowImage = [UIImage imageWithColor:[UIColor fadeBackground]]; navBar.titleTextAttributes = attributes; + + [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal]; } - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification diff --git a/iphone/Maps/MWMTTSSettingsViewController.mm b/iphone/Maps/MWMTTSSettingsViewController.mm index 248a281145..bb888bb7f0 100644 --- a/iphone/Maps/MWMTTSSettingsViewController.mm +++ b/iphone/Maps/MWMTTSSettingsViewController.mm @@ -3,6 +3,7 @@ #import "MWMTTSSettingsViewController.h" #import "SelectableCell.h" #import "Statistics.h" +#import "WebViewController.h" #import static NSString * kSelectTTSLanguageSegueName = @"TTSLanguage"; @@ -83,7 +84,7 @@ using namespace std; - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; + return 2; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section @@ -129,10 +130,14 @@ using namespace std; [tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade]; } } -#warning need to add help -// else -// { -// } + else if (indexPath.section == 1) + { + NSString * path = [[NSBundle mainBundle] pathForResource:@"tts-how-to-set-up-voice" ofType:@"html"]; + NSString * html = [[NSString alloc] initWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil]; + NSURL * baseURL = [NSURL fileURLWithPath:path]; + WebViewController * vc = [[WebViewController alloc] initWithHtml:html baseUrl:baseURL andTitleOrNil:L(@"pref_tts_how_to_set_up_voice")]; + [self.navigationController pushViewController:vc animated:YES]; + } } @end diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index aae7be04d5..eea22049c6 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -54,6 +54,11 @@ 3472747B1B0F4FF100756B37 /* me.maps.production.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 3472747A1B0F4FF100756B37 /* me.maps.production.entitlements */; }; 3472EC051B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */; }; 34751E9E1BFB8E73005299B7 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864B186C5EAA00AF7E9E /* MediaPlayer.framework */; }; + 3476B8CC1BFDCB6700874594 /* MWMTTSSettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F668F6551BCD4507002D6FFC /* MWMTTSSettingsViewController.mm */; }; + 3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; }; + 3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; }; + 3476B8E01BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; }; + 3476B8E11BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; }; 347BAC691B733D540010FF78 /* MWMPedestrianShareAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347BAC681B733D540010FF78 /* MWMPedestrianShareAlert.xib */; }; 347BAC6E1B736BA70010FF78 /* MWMSharePedestrianRoutesToastActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 347BAC6D1B736BA70010FF78 /* MWMSharePedestrianRoutesToastActivityItem.mm */; }; 347FDDA11BB59B4E00871410 /* Mapsme.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 347FDDA01BB59B4E00871410 /* Mapsme.storyboard */; }; @@ -890,6 +895,8 @@ 3472747A1B0F4FF100756B37 /* me.maps.production.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = me.maps.production.entitlements; sourceTree = ""; }; 3472EC031B4D44BE0085CB79 /* UIFont+MapsMeFonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+MapsMeFonts.h"; sourceTree = ""; }; 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIFont+MapsMeFonts.mm"; sourceTree = ""; }; + 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "tts-how-to-set-up-voice.html"; path = "../../data/tts-how-to-set-up-voice.html"; sourceTree = ""; }; + 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "tts-how-to-set-up-voice-img"; path = "../../data/tts-how-to-set-up-voice-img"; sourceTree = ""; }; 347BAC681B733D540010FF78 /* MWMPedestrianShareAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPedestrianShareAlert.xib; sourceTree = ""; }; 347BAC6C1B736BA70010FF78 /* MWMSharePedestrianRoutesToastActivityItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSharePedestrianRoutesToastActivityItem.h; sourceTree = ""; }; 347BAC6D1B736BA70010FF78 /* MWMSharePedestrianRoutesToastActivityItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSharePedestrianRoutesToastActivityItem.mm; sourceTree = ""; }; @@ -2665,6 +2672,8 @@ FA065FC61286143F00FEA989 /* External Resources */ = { isa = PBXGroup; children = ( + 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */, + 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */, 4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */, 4A23D1571B8B4DD700D4EB6F /* resources-6plus_clear */, 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_clear */, @@ -3008,6 +3017,7 @@ EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */, EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */, 347274731B0F4EE000756B37 /* me.maps.entitlements in Resources */, + 3476B8E01BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */, EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */, FAAFD697139D9BE2000AE70C /* categories.txt in Resources */, FA64D9A913F975AD00350ECF /* types.txt in Resources */, @@ -3021,6 +3031,7 @@ B0DFE6311A1B78A200B6C35E /* LocalNotifications.plist in Resources */, 34B82ABB1B837FFD00180497 /* MWMSearchHistoryRequestCell.xib in Resources */, 34B6CF5D1BBBFC6B009203C6 /* LaunchScreen.storyboard in Resources */, + 3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */, 978D4A31199A11E600D72CA7 /* faq.html in Resources */, F66A8FB21B0A0954001B9C97 /* PlacePageView.xib in Resources */, 97FC99E019C1A2CD00C1CF98 /* resources-xxhdpi in Resources */, @@ -3155,6 +3166,7 @@ 6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */, 6741A9591BF340DE002C974C /* 05_khmeros.ttf in Resources */, 6741A95A1BF340DE002C974C /* me.maps.entitlements in Resources */, + 3476B8E11BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */, 6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */, 6741A95C1BF340DE002C974C /* categories.txt in Resources */, 6741A95D1BF340DE002C974C /* types.txt in Resources */, @@ -3168,6 +3180,7 @@ 6741A9651BF340DE002C974C /* LocalNotifications.plist in Resources */, 6741A9661BF340DE002C974C /* MWMSearchHistoryRequestCell.xib in Resources */, 6741A9671BF340DE002C974C /* LaunchScreen.storyboard in Resources */, + 3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */, 6741A9681BF340DE002C974C /* faq.html in Resources */, 6741A9691BF340DE002C974C /* PlacePageView.xib in Resources */, 6741A96A1BF340DE002C974C /* resources-xxhdpi in Resources */, @@ -3539,6 +3552,7 @@ 6741A9D11BF340DE002C974C /* RenderContext.mm in Sources */, 6741A9D21BF340DE002C974C /* MWMBookmarkDescriptionViewController.mm in Sources */, 6741A9D31BF340DE002C974C /* MWMDownloadMapRequestView.mm in Sources */, + 3476B8CC1BFDCB6700874594 /* MWMTTSSettingsViewController.mm in Sources */, 6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */, 6741A9D51BF340DE002C974C /* WebViewController.mm in Sources */, 6741A9D61BF340DE002C974C /* MWMPlacePageNavigationBar.mm in Sources */,