diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 5c8fdd47ac..69683f09ac 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -31,9 +31,9 @@ Framework * m_framework = NULL; case location::EDisabledByUser: { UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Location Services are disabled", @"Location services are disabled by user alert - title") - message:NSLocalizedString(@"You currently have all location services for this device or application disabled. Please, enable them in Settings Application->Location Services.", @"Location services are disabled by user alert - message") + message:NSLocalizedString(@"You currently have all Location Services for this device or application disabled. Please enable them in Settings.", @"Location services are disabled by user alert - message") delegate:nil - cancelButtonTitle:NSLocalizedString(@"Ok", @"Location services are disabled by user alert - close alert button") + cancelButtonTitle:NSLocalizedString(@"Ok", @"Location Services are disabled by user alert - close alert button") otherButtonTitles:nil]; [alert show]; [alert release]; @@ -43,7 +43,7 @@ Framework * m_framework = NULL; case location::ENotSupported: { UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Location Services are not supported", @"Location Services are not available on the device alert - title") - message:NSLocalizedString(@"Your device doesn't support location services", @"Location Services are not available on the device alert - message") + message:NSLocalizedString(@"Your device doesn't support Location Services", @"Location Services are not available on the device alert - message") delegate:nil cancelButtonTitle:NSLocalizedString(@"Ok", @"Location Services are not available on the device alert - close alert button") otherButtonTitles:nil]; diff --git a/iphone/Maps/Classes/SearchVC.mm b/iphone/Maps/Classes/SearchVC.mm index 7ae0631e28..11d9a3d0da 100644 --- a/iphone/Maps/Classes/SearchVC.mm +++ b/iphone/Maps/Classes/SearchVC.mm @@ -412,7 +412,7 @@ static void OnSearchResultCallback(search::Result const & res, int queryId) // switch (newStatus) // { // case location::EDisabledByUser: -// m_warningViewText = [[NSString alloc] initWithString:NSLocalizedString(@"Please enable location services", @"Search View - Location is disabled by user warning text")]; +// m_warningViewText = [[NSString alloc] initWithString:NSLocalizedString(@"Please enable Location Services", @"Search View - Location is disabled by user warning text")]; // break; // case location::ENotSupported: // m_warningViewText = [[NSString alloc] initWithString:NSLocalizedString(@"Location Services are not supported", @"Search View - Location is not supported on the device warning text")]; diff --git a/iphone/Maps/Platform/LocationManager.mm b/iphone/Maps/Platform/LocationManager.mm index 9b6bc70582..42f750a180 100644 --- a/iphone/Maps/Platform/LocationManager.mm +++ b/iphone/Maps/Platform/LocationManager.mm @@ -9,7 +9,7 @@ { m_locationManager = [[CLLocationManager alloc] init]; m_locationManager.delegate = self; - m_locationManager.purpose = NSLocalizedString(@"Location services are needed to display your current position on the map.", @"Location purpose text description"); + m_locationManager.purpose = NSLocalizedString(@"Location Services are needed to display your current position on the map.", @"Location purpose text description"); m_locationManager.desiredAccuracy = kCLLocationAccuracyBest; m_locationManager.headingFilter = 3.0; m_locationManager.distanceFilter = 1.0; diff --git a/iphone/Maps/Settings/CountriesViewController.mm b/iphone/Maps/Settings/CountriesViewController.mm index 69d79f8834..e3c65a22c0 100644 --- a/iphone/Maps/Settings/CountriesViewController.mm +++ b/iphone/Maps/Settings/CountriesViewController.mm @@ -309,7 +309,7 @@ UITableViewCell * g_clickedCell = nil; if (FreeDiskSpaceInBytes() < (size + 1024*1024)) { // display warning dialog about not enough free disk space [[[[CustomAlertView alloc] initWithTitle:NSLocalizedString(@"There is not enough free disk space", @"Settings/Downloader - No free space dialog title") - message:[NSString stringWithFormat:NSLocalizedString(@"Please, free some space on your device first to download %@", @"Settings/Downloader - No free space dialog message"), countryName] + message:[NSString stringWithFormat:NSLocalizedString(@"Please free some space on your device first in order to download %@", @"Settings/Downloader - No free space dialog message"), countryName] delegate:nil cancelButtonTitle:NSLocalizedString(@"Ok", @"Settings/Downloader - No free space dialog close button") otherButtonTitles:nil] autorelease] show]; @@ -320,7 +320,7 @@ UITableViewCell * g_clickedCell = nil; if (connType == ENotConnected) { // do not initiate any download [[[[CustomAlertView alloc] initWithTitle:NSLocalizedString(@"No Internet connection detected", @"Settings/Downloader - No internet connection dialog title") - message:NSLocalizedString(@"We recommend to use WiFi to download large countries", @"Settings/Downloader - No internet connection dialog message") + message:NSLocalizedString(@"We recommend using WiFi to download larger countries", @"Settings/Downloader - No internet connection dialog message") delegate:nil cancelButtonTitle:NSLocalizedString(@"Ok", @"Settings/Downloader - No internet connection dialog close button") otherButtonTitles:nil] autorelease] show]; @@ -330,7 +330,7 @@ UITableViewCell * g_clickedCell = nil; if (connType == EConnectedBy3G && size > MAX_3G_MEGABYTES * MB) { // If user uses 3G, do not allow him to download large countries [[[[CustomAlertView alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@"%@ is too large to download over 3G", @"Settings/Downloader - 3G download warning dialog title"), countryName] - message:NSLocalizedString(@"Please, use WiFi connection to download large countries", @"Settings/Downloader - 3G download warning dialog message") + message:NSLocalizedString(@"Please use WiFi connection to download larger countries", @"Settings/Downloader - 3G download warning dialog message") delegate:nil cancelButtonTitle:NSLocalizedString(@"Ok", @"Settings/Downloader - 3G download warning dialog close button") otherButtonTitles:nil] autorelease] show]; @@ -368,8 +368,8 @@ UITableViewCell * g_clickedCell = nil; UIActionSheet * popupQuery = [[UIActionSheet alloc] initWithTitle: countryName delegate: self - cancelButtonTitle: NSLocalizedString(@"Do Nothing", @"Settings/Downloader - Cancel active download dialog - Do not cancel button") - destructiveButtonTitle: NSLocalizedString(@"Cancel Download", @"Settings/Downloader - Cancel active download dialog - Interrupt country download button") + cancelButtonTitle: NSLocalizedString(@"Do nothing", @"Settings/Downloader - Cancel active download dialog - Do not cancel button") + destructiveButtonTitle: NSLocalizedString(@"Cancel download", @"Settings/Downloader - Cancel active download dialog - Interrupt country download button") otherButtonTitles: nil]; [popupQuery showFromRect: [cell frame] inView: tableView animated: YES]; [popupQuery release]; diff --git a/iphone/Maps/Settings/SettingsManager.mm b/iphone/Maps/Settings/SettingsManager.mm index ae82369dd2..b7cd401ea3 100644 --- a/iphone/Maps/Settings/SettingsManager.mm +++ b/iphone/Maps/Settings/SettingsManager.mm @@ -9,16 +9,9 @@ using namespace storage; -// @TODO advertisement banner -// NSLocalizedString(@"MapsWithMe Pro", @"Banner title") -// NSLocalizedString(@"One step ahead! Cool search feature! Bla bla bla", @"Banner message") -// NSLocalizedString(@"Check MapsWithMe Pro", @"Banner Ok button - go to the appstore for paid version") -// NSLocalizedString(@"Remind me later", @"Banner postpone button - remind later about paid version") -// NSLocalizedString(@"Don't bother me", @"Banner cancel button - never remind user about paid version") - // @TODO Write Review dialog -// NSLocalizedString(@"Leave your review", @"Leave Review dialog title") -// NSLocalizedString(@"If you like MapsWithMe, please support us with your review. If you want to complain - please leave it on our support site", @"Leave Review dialog message") +// NSLocalizedString(@"Leave a review", @"Leave Review dialog title") +// NSLocalizedString(@"If you like MapsWithMe, please support us with a review. If you want to complain then please visit our support site", @"Leave Review dialog message") // NSLocalizedString(@"Write a review", @"Leave Review dialog - Review button") // NSLocalizedString(@"Complain", @"Leave Review dialog - Complain button (goes to support site)") // NSLocalizedString(@"Not now", @"Leave Review dialog - Not now button (remond me later)") @@ -33,6 +26,19 @@ using namespace storage; // NSLocalizedString(@"Back", @"View and button titles for accessibility") // NSLocalizedString(@"Zoom to the country", @"View and button titles for accessibility") +// @TODO Search button banner dialog for free version +// NSLocalizedString(@"Search feature", @"Search button pressed dialog title in the free version") +// NSLocalizedString(@"Search is available in the paid version of MapsWithMe. Upgrade now!", @"Search button pressed dialog message in the free version") +// NSLocalizedString(@"Go to the AppStore", @"Search button pressed dialog Positive button in the free version") +// NSLocalizedString(@"Cancel", @"Search button pressed dialog Negative button in the free version") + +// @TODO Paid version is available one-time banner dialog for free version +// NSLocalizedString(@"MapsWithMe now with Search capabilities", @"Paid version has become available one-time dialog title in the free version") +// NSLocalizedString(@"Now you can install MapsWithMe with Search!", @"Paid version has become available one-time dialog message in the free version") +// NSLocalizedString(@"Visit AppStore", @"Paid version has become available one-time dialog Positive button in the free version") +// NSLocalizedString(@"Not Now", @"Paid version has become available one-time dialog Negative button in the free version") + + // Settings are always present globally @implementation SettingsManager @@ -98,7 +104,7 @@ using namespace storage; if (framework->NeedToDeleteOldMaps()) { UIActionSheet * dialog = [[UIActionSheet alloc] - initWithTitle:NSLocalizedString(@"MapsWithMe uses new, fresh and more compact maps. For example, USA, Germany, France, Canada and Russia are splitted to smaller States/Regions. But to use new maps you should delete all previously downloaded data and download new maps.", @"Downloader/Upgrade dialog message") + initWithTitle:NSLocalizedString(@"MapsWithMe have enhanced the map data and made it far more accessible. For example, with larger countries, you can now choose to download only the region/state that you need. However, to use the new maps you should delete any older map data previously downloaded.", @"Downloader/Upgrade dialog message") delegate:self cancelButtonTitle:NSLocalizedString(@"Do nothing at the moment", @"Downloader/Upgrade Cancel button") destructiveButtonTitle:NSLocalizedString(@"Delete old and download new maps", @"Downloader/Upgrade OK button") diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index 00abf5b236..4ecf4b45f1 100644 Binary files a/iphone/Maps/en.lproj/Localizable.strings and b/iphone/Maps/en.lproj/Localizable.strings differ