diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index a73391cf2..e41abb02b 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -10,7 +10,6 @@ #import -#import "Bridging.h" #import "DeepLinkRouteStrategyAdapter.h" #import "EAGLView.h" #import "FirstSession.h" diff --git a/iphone/Maps/Bridging.h b/iphone/Maps/Bridging.h deleted file mode 100644 index a0a6f0f77..000000000 --- a/iphone/Maps/Bridging.h +++ /dev/null @@ -1,7 +0,0 @@ -@interface Bridging: NSObject - - -+ (void)saveOauthTokenFrom:(NSString *)oauthCode; - - -@end diff --git a/iphone/Maps/Bridging.mm b/iphone/Maps/Bridging.mm deleted file mode 100644 index f5aa563b9..000000000 --- a/iphone/Maps/Bridging.mm +++ /dev/null @@ -1,23 +0,0 @@ -#import "Bridging.h" - -#include "base/logging.hpp" -#include "editor/server_api.hpp" -#include "platform/platform.hpp" -#include "private.h" - -#import "MWMAuthorizationCommon.h" - -using namespace osm; - -@implementation Bridging - - -+ (void)saveOauthTokenFrom:(NSString * _Nonnull)oauthCode -{ - NSString *oauthToken = @(OsmOAuth::ServerAuth().FinishAuthorization([oauthCode UTF8String]).c_str()); - OsmOAuth::ServerAuth().SetAuthToken([oauthToken UTF8String]); - osm_auth_ios::AuthorizationStoreCredentials([oauthToken UTF8String]); -} - - -@end diff --git a/iphone/Maps/Bridging/BridgeControllers.swift b/iphone/Maps/Bridging/BridgeControllers.swift new file mode 100644 index 000000000..4c09ae367 --- /dev/null +++ b/iphone/Maps/Bridging/BridgeControllers.swift @@ -0,0 +1,24 @@ +import UIKit +import SwiftUI + + +/// Class for accesing SwiftUI views from Objective-C code +@objc class BridgeControllers: NSObject { + /// The `ProfileView` + @objc static func profile() -> UIViewController { + return UIHostingController(rootView: ProfileView()) + } + + /// The `ProfileView` for presentation in an alert + @objc static func profileAsAlert() -> UIViewController { + return UIHostingController(rootView: ProfileView(isPresentedAsAlert: true)) + } +} + + +/// Class for using the SwiftUI `ProfileView` in the interface builder +class ProfileBridgeController: UIHostingController { + required init?(coder aDecoder: NSCoder) { + super.init(coder: aDecoder, rootView: ProfileView()) + } +} diff --git a/iphone/Maps/Bridging/SafariView.swift b/iphone/Maps/Bridging/SafariView.swift new file mode 100644 index 000000000..1b681b0c2 --- /dev/null +++ b/iphone/Maps/Bridging/SafariView.swift @@ -0,0 +1,41 @@ +import SwiftUI +import SafariServices + + +/// View for Safari via a Safari view controller +struct SafariView: UIViewControllerRepresentable { + // MARK: Properties + + /// The url + let url: URL + + + /// The type of dismiss button + var dismissButton: SFSafariViewController.DismissButtonStyle = .done + + + + // MARK: Methods + + /// Create a Safari view controller + /// - Parameter context: The context + /// - Returns: The Safari view controller + func makeUIViewController(context: UIViewControllerRepresentableContext) -> SFSafariViewController { + let safariViewControllerConfiguration = SFSafariViewController.Configuration() + safariViewControllerConfiguration.activityButton = nil + safariViewControllerConfiguration.barCollapsingEnabled = true + + let safariViewController = SFSafariViewController(url: url, configuration: safariViewControllerConfiguration) + safariViewController.preferredBarTintColor = UIColor.accent + safariViewController.preferredControlTintColor = UIColor.white + safariViewController.dismissButtonStyle = dismissButton + return safariViewController + } + + + /// Update the Safari view controller + /// - Parameter context: The context + func updateUIViewController(_ uiViewController: SFSafariViewController, context: UIViewControllerRepresentableContext) { + // Do nothing + } +} diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.m b/iphone/Maps/Classes/Components/MWMNavigationController.m index f77d4db7e..1812bc805 100644 --- a/iphone/Maps/Classes/Components/MWMNavigationController.m +++ b/iphone/Maps/Classes/Components/MWMNavigationController.m @@ -34,10 +34,11 @@ [navigationController setNavigationBarHidden:YES animated:animated]; return; } - - NSAssert([viewController conformsToProtocol:@protocol(MWMController)], @"Controller must inherit ViewController or TableViewController class"); - id vc = (id)viewController; - [navigationController setNavigationBarHidden:!vc.hasNavigationBar animated:animated]; + + if ([viewController conformsToProtocol:@protocol(MWMController)]) { + id vc = (id)viewController; + [navigationController setNavigationBarHidden:!vc.hasNavigationBar animated:animated]; + } } - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h index 6941774b8..004b100ba 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h @@ -31,8 +31,6 @@ - (void)presentResetChangesAlertWithBlock:(nonnull MWMVoidBlock)block; - (void)presentDeleteFeatureAlertWithBlock:(nonnull MWMVoidBlock)block; - (void)presentEditorViralAlert; -- (void)presentOsmAuthAlert; -- (void)presentOsmReauthAlert; - (void)presentPersonalInfoWarningAlertWithBlock:(nonnull MWMVoidBlock)block; - (void)presentTrackWarningAlertWithCancelBlock:(nonnull MWMVoidBlock)block; - (void)presentMobileInternetAlertWithBlock:(nonnull MWMMobileInternetAlertCompletionBlock)block; diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index f2ef49818..e2ed87ea8 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -158,13 +158,6 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" - (void)presentEditorViralAlert { [self displayAlert:[MWMAlert editorViralAlert]]; } -- (void)presentOsmAuthAlert { - [self displayAlert:[MWMAlert osmAuthAlert]]; -} - -- (void)presentOsmReauthAlert { - [self displayAlert:[MWMAlert osmReauthAlert]]; -} - (void)presentCreateBookmarkCategoryAlertWithMaxCharacterNum:(NSUInteger)max minCharacterNum:(NSUInteger)min @@ -211,7 +204,7 @@ static NSString *const kAlertControllerNibIdentifier = @"MWMAlertViewController" - (void)displayAlert:(MWMAlert *)alert { UIViewController *ownerVC = self.ownerViewController; if (ownerVC.navigationController != nil) { - ownerVC = self.ownerViewController.navigationController; + ownerVC = ownerVC.navigationController; } BOOL isOwnerLoaded = ownerVC.isViewLoaded; if (!isOwnerLoaded) { diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h index 20af2ea95..de3e72d0e 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h @@ -23,8 +23,6 @@ + (MWMAlert *)resetChangesAlertWithBlock:(MWMVoidBlock)block; + (MWMAlert *)deleteFeatureAlertWithBlock:(MWMVoidBlock)block; + (MWMAlert *)editorViralAlert; -+ (MWMAlert *)osmAuthAlert; -+ (MWMAlert *)osmReauthAlert; + (MWMAlert *)personalInfoWarningAlertWithBlock:(MWMVoidBlock)block; + (MWMAlert *)trackWarningAlertWithCancelBlock:(MWMVoidBlock)block; + (MWMAlert *)infoAlert:(NSString *)title text:(NSString *)text; diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index e904cd793..d197bad2f 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -4,8 +4,6 @@ #import "MWMDownloadTransitMapAlert.h" #import "MWMEditorViralAlert.h" #import "MWMLocationAlert.h" -#import "MWMOsmAuthAlert.h" -#import "MWMOsmReauthAlert.h" #import "MWMPlaceDoesntExistAlert.h" #import "MWMRoutingDisclaimerAlert.h" @@ -135,12 +133,6 @@ + (MWMAlert *)editorViralAlert { return [MWMEditorViralAlert alert]; } -+ (MWMAlert *)osmAuthAlert { - return [MWMOsmAuthAlert alert]; -} -+ (MWMAlert *)osmReauthAlert { - return [MWMOsmReauthAlert alert]; -} + (MWMAlert *)personalInfoWarningAlertWithBlock:(MWMVoidBlock)block { return [MWMDefaultAlert personalInfoWarningAlertWithBlock:block]; } diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm index cf3f49d24..abae056c7 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm @@ -1,7 +1,6 @@ #import "MWMEditorViralAlert.h" #import "MWMActivityViewController.h" #import "MWMAlertViewController.h" -#import "MWMAuthorizationCommon.h" #import "SwiftBridge.h" @interface MWMEditorViralAlert () diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.h b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.h deleted file mode 100644 index c44eebd88..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.h +++ /dev/null @@ -1,7 +0,0 @@ -#import "MWMAlert.h" - -@interface MWMOsmAuthAlert : MWMAlert - -+ (instancetype)alert; - -@end diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm deleted file mode 100644 index b815cb7f0..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm +++ /dev/null @@ -1,56 +0,0 @@ -#import "MWMAlertViewController.h" -#import "MWMOsmAuthAlert.h" - -#include -#include "editor/osm_auth.hpp" - -static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin"; - -extern NSString * const kMap2FBLoginSegue; -extern NSString * const kMap2GoogleLoginSegue; - -@implementation MWMOsmAuthAlert - -+ (instancetype)alert -{ - MWMOsmAuthAlert * alert = - [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject; - return alert; -} - -- (IBAction)facebookTap -{ - [self close:^{ - [self.alertController.ownerViewController performSegueWithIdentifier:kMap2FBLoginSegue - sender:nil]; - }]; -} - -- (IBAction)googleTap -{ - [self close:^{ - [self.alertController.ownerViewController performSegueWithIdentifier:kMap2GoogleLoginSegue - sender:nil]; - }]; -} - -- (IBAction)osmTap -{ - [self close:^{ - [self.alertController.ownerViewController openUrl:@(osm::OsmOAuth::ServerAuth().BuildOAuth2Url().c_str()) externally:NO skipEncoding:YES]; - }]; -} - -- (IBAction)signUpTap -{ - [self close:^{ - [self.alertController.ownerViewController openUrl:@(osm::OsmOAuth::ServerAuth().GetRegistrationURL().c_str()) externally:YES]; - }]; -} - -- (IBAction)closeTap -{ - [self close:nil]; -} - -@end diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib deleted file mode 100644 index ab0df9b28..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.xib +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.h b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.h deleted file mode 100644 index a31ea6c01..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.h +++ /dev/null @@ -1,9 +0,0 @@ -#import "MWMAlert.h" - -@interface MWMOsmReauthAlert : MWMAlert - -+ (instancetype)alert; - -@property (nonatomic) IBOutlet UITextView *messageLabel; - -@end diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm deleted file mode 100644 index c0cb37896..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.mm +++ /dev/null @@ -1,63 +0,0 @@ -#import "MWMAlertViewController.h" -#import "MWMOsmReauthAlert.h" -#import "MWMAuthorizationCommon.h" - -#include "editor/osm_auth.hpp" - -static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin"; - -@implementation MWMOsmReauthAlert - -+ (instancetype)alert -{ - MWMOsmReauthAlert * alert = [NSBundle.mainBundle loadNibNamed:[self className] owner:nil options:nil].firstObject; - - alert.messageLabel.attributedText = [self buildAlertMessage]; - alert.messageLabel.textAlignment = NSTextAlignmentCenter; - alert.messageLabel.delegate = alert; - - return alert; -} - -// Build attributed string in format "{alert_reauth_message_ios} {alert_reauth_link_text_ios}" -// where {alert_reauth_link_text_ios} has blue color as a link -+ (NSMutableAttributedString*)buildAlertMessage -{ - auto textAttrs = @{NSFontAttributeName : UIFont.regular17}; - auto linkAttrs = @{NSForegroundColorAttributeName : UIColor.linkBlue, - NSFontAttributeName : UIFont.regular17, - NSLinkAttributeName : @"https://github.com/organicmaps/organicmaps/issues/6144"}; - - NSMutableAttributedString *alertMessage = - [[NSMutableAttributedString alloc] initWithString: L(@"alert_reauth_message_ios") - attributes: textAttrs]; - // Add space char - [alertMessage appendAttributedString:([[NSMutableAttributedString alloc] initWithString: @" " - attributes: textAttrs])]; - NSAttributedString *alertLinkText = - [[NSAttributedString alloc] initWithString: L(@"alert_reauth_link_text_ios") - attributes: linkAttrs]; - [alertMessage appendAttributedString:alertLinkText]; - return alertMessage; -} - -- (IBAction)closeTap -{ - [self close:nil]; -} - -- (IBAction)osmTap -{ - [self close:^{ - [self.alertController.ownerViewController openUrl:@(osm::OsmOAuth::ServerAuth().BuildOAuth2Url().c_str()) externally:NO skipEncoding:YES]; - }]; -} - -- (BOOL)textView:(UITextView *)textView shouldInteractWithURL:(NSURL *)URL inRange:(NSRange)characterRange interaction:(UITextItemInteraction)interaction -{ - [[UIApplication sharedApplication] openURL:URL options:@{} completionHandler:nil]; - - return NO; -} - -@end diff --git a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib b/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib deleted file mode 100644 index 68b4c85ce..000000000 --- a/iphone/Maps/Classes/CustomAlert/MWMOsmReauthAlert.xib +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h deleted file mode 100644 index 44b405380..000000000 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include "editor/osm_auth.hpp" - -namespace osm_auth_ios -{ - -enum class AuthorizationButtonType -{ - AuthorizationButtonTypeGoogle, - AuthorizationButtonTypeFacebook, - AuthorizationButtonTypeOSM -}; - -// Deletes any stored credentials if called with empty key or secret. -void AuthorizationStoreCredentials(std::string const & oauthToken); -BOOL AuthorizationHaveOAuth1Credentials(); -void AuthorizationClearOAuth1Credentials(); -BOOL AuthorizationHaveCredentials(); -void AuthorizationClearCredentials(); -// Returns empty key and secret if user has not beed authorized. -std::string const AuthorizationGetCredentials(); - -void AuthorizationSetNeedCheck(BOOL needCheck); -BOOL AuthorizationIsNeedCheck(); -/// Returns nil if not logged in. -NSString * OSMUserName(); -/// Returns 0 if not logged in. -NSInteger OSMUserChangesetsCount(); - -} // namespace osm_auth_ios diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm deleted file mode 100644 index f22c42d6d..000000000 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm +++ /dev/null @@ -1,124 +0,0 @@ -#import "MWMAuthorizationCommon.h" -#import "MWMNetworkPolicy+UI.h" -#import "UIButton+RuntimeAttributes.h" - -#include "base/logging.hpp" -#include "editor/server_api.hpp" - -namespace osm_auth_ios -{ - -NSString * const kOSMRequestToken = @"OSMRequestToken"; // Unused after migration from OAuth1 to OAuth2 -NSString * const kOSMRequestSecret = @"OSMRequestSecret"; // Unused after migration from OAuth1 to OAuth2 -NSString * const kAuthNeedCheck = @"AuthNeedCheck"; -NSString * const kOSMAuthToken = @"OSMAuthToken"; -NSString * const kOSMUserName = @"UDOsmUserName"; -NSString * const kOSMChangesetsCount = @"OSMUserChangesetsCount"; - -BOOL LoadOsmUserPreferences(osm::UserPreferences & prefs) -{ - __block BOOL success = false; - dispatch_sync(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^ - { - try - { - osm::ServerApi06 const api {osm::OsmOAuth::ServerAuth(AuthorizationGetCredentials())}; - prefs = api.GetUserPreferences(); - success = true; - } - catch (std::exception const & ex) - { - LOG(LWARNING, ("Can't load user preferences from OSM server:", ex.what())); - } - }); - return success; -} - -void AuthorizationStoreCredentials(std::string const & oauthToken) -{ - NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - [ud setObject:@(oauthToken.c_str()) forKey:kOSMAuthToken]; - osm::UserPreferences prefs; - if (LoadOsmUserPreferences(prefs)) { - [ud setObject:@(prefs.m_displayName.c_str()) forKey:kOSMUserName]; - // To also see # of edits when offline. - [ud setInteger:prefs.m_changesets forKey:kOSMChangesetsCount]; - } -} - -BOOL AuthorizationHaveOAuth1Credentials() -{ - NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - NSString * requestToken = [ud stringForKey:kOSMRequestToken]; - NSString * requestSecret = [ud stringForKey:kOSMRequestSecret]; - return requestToken.length && requestSecret.length; -} - -void AuthorizationClearOAuth1Credentials() -{ - NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - [ud removeObjectForKey:kOSMRequestToken]; - [ud removeObjectForKey:kOSMRequestSecret]; -} - -BOOL AuthorizationHaveCredentials() -{ - NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - NSString * oauthToken = [ud stringForKey:kOSMAuthToken]; - return oauthToken.length; -} - -void AuthorizationClearCredentials() -{ - NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - [ud removeObjectForKey:kOSMAuthToken]; - [ud removeObjectForKey:kOSMRequestToken]; - [ud removeObjectForKey:kOSMRequestSecret]; - [ud removeObjectForKey:kOSMUserName]; - [ud removeObjectForKey:kOSMChangesetsCount]; -} - -std::string const AuthorizationGetCredentials() -{ - NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - NSString * oauthToken = [ud stringForKey:kOSMAuthToken]; - if (oauthToken) - return std::string(oauthToken.UTF8String); - return {}; -} - -void AuthorizationSetNeedCheck(BOOL needCheck) -{ - NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - [ud setBool:needCheck forKey:kAuthNeedCheck]; -} - -BOOL AuthorizationIsNeedCheck() -{ - return [NSUserDefaults.standardUserDefaults boolForKey:kAuthNeedCheck]; -} - -NSString * OSMUserName() -{ - return [NSUserDefaults.standardUserDefaults stringForKey:kOSMUserName]; -} - -NSInteger OSMUserChangesetsCount() -{ - __block NSInteger count = -1; - [[MWMNetworkPolicy sharedPolicy] callOnlineApi:^(BOOL permitted) { - if (permitted) - if (osm::UserPreferences prefs; YES == LoadOsmUserPreferences(prefs)) - count = prefs.m_changesets; - }]; - - NSUserDefaults * ud = NSUserDefaults.standardUserDefaults; - if (count >= 0) - { - [ud setInteger:count forKey:kOSMChangesetsCount]; - return count; - } - return [ud integerForKey:kOSMChangesetsCount]; -} - -} // namespace osm_auth_ios diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h deleted file mode 100644 index fa272b364..000000000 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMViewController.h" - -@interface MWMAuthorizationLoginViewController : MWMViewController - -@end diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm deleted file mode 100644 index c7582fdaf..000000000 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ /dev/null @@ -1,149 +0,0 @@ -#import "MWMAlertViewController.h" -#import "MWMAuthorizationCommon.h" -#import "MWMAuthorizationLoginViewController.h" - -#include - -namespace -{ -NSString * const kWebViewAuthSegue = @"Authorization2WebViewAuthorizationSegue"; -NSString * const kOSMAuthSegue = @"Authorization2OSMAuthorizationSegue"; - -NSString * const kCancel = L(@"cancel"); -NSString * const kLogout = L(@"logout"); -NSString * const kRefresh = L(@"refresh"); -} // namespace - -using namespace osm; -using namespace osm_auth_ios; - -@interface MWMAuthorizationLoginViewController () - -@property (weak, nonatomic) IBOutlet UIView * authView; -@property (weak, nonatomic) IBOutlet UIView * accountView; - -@property (weak, nonatomic) IBOutlet UIButton * loginOSMButton; -@property (weak, nonatomic) IBOutlet UIButton * signupButton; - -@property (weak, nonatomic) IBOutlet UILabel * changesCountLabel; -@property (weak, nonatomic) IBOutlet UILabel * lastUpdateLabel; - -@end - -@implementation MWMAuthorizationLoginViewController - -- (void)viewDidLoad -{ - [super viewDidLoad]; -} - -- (void)viewWillAppear:(BOOL)animated -{ - [super viewWillAppear:animated]; - [self checkConnection]; - if (AuthorizationHaveCredentials()) - [self configHaveAuth]; - else - [self configNoAuth]; - - AuthorizationSetNeedCheck(NO); -} - -- (void)checkConnection -{ - self.signupButton.enabled = Platform::IsConnected(); -} - -- (void)configHaveAuth -{ - NSString * osmUserName = OSMUserName(); - self.title = osmUserName.length > 0 ? osmUserName : L(@"osm_account"); - self.authView.hidden = YES; - self.accountView.hidden = NO; - - self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"•••" style:UIBarButtonItemStylePlain target:self action:@selector(showActionSheet)]; - [self refresh:NO]; -} - -- (void)configNoAuth -{ - self.title = L(@"profile"); - self.authView.hidden = NO; - self.accountView.hidden = YES; -} - -#pragma mark - Actions - -- (void)performOnlineAction:(MWMVoidBlock)block -{ - if (Platform::IsConnected()) - block(); - else - [self.alertController presentNoConnectionAlert]; -} - -- (IBAction)loginOSM -{ - [self performOnlineAction:^ - { - - [self openUrl:@(OsmOAuth::ServerAuth().BuildOAuth2Url().c_str()) externally:NO skipEncoding:YES]; - }]; -} - -- (IBAction)signup -{ - [self performOnlineAction:^ - { - [self openUrl:@(OsmOAuth::ServerAuth().GetRegistrationURL().c_str()) externally:YES]; - }]; -} - -- (IBAction)osmTap -{ - [self openUrl:L(@"osm_wiki_about_url")]; -} - -- (IBAction)historyTap -{ - [self openUrl:@(OsmOAuth::ServerAuth().GetHistoryURL([OSMUserName() UTF8String]).c_str())]; -} - -- (void)logout -{ - AuthorizationClearCredentials(); - [self.navigationController popViewControllerAnimated:YES]; -} - -- (void)refresh:(BOOL)force -{ - self.changesCountLabel.text = @(OSMUserChangesetsCount()).stringValue; -} - -#pragma mark - ActionSheet - -- (void)showActionSheet -{ - UIAlertController * alertController = - [UIAlertController alertControllerWithTitle:nil - message:nil - preferredStyle:UIAlertControllerStyleActionSheet]; - alertController.popoverPresentationController.barButtonItem = - self.navigationItem.rightBarButtonItem; - [alertController addAction:[UIAlertAction actionWithTitle:kRefresh - style:UIAlertActionStyleDefault - handler:^(UIAlertAction * action) { - [self refresh:YES]; - }]]; - [alertController addAction:[UIAlertAction actionWithTitle:kLogout - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction * action) { - [self logout]; - }]]; - [alertController - addAction:[UIAlertAction actionWithTitle:kCancel style:UIAlertActionStyleCancel handler:nil]]; - - [self presentViewController:alertController animated:YES completion:nil]; -} - -@end diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h deleted file mode 100644 index 8cf14391b..000000000 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "MWMViewController.h" - -@interface MWMAuthorizationOSMLoginViewController : MWMViewController - -@end diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm deleted file mode 100644 index e8cfabc2a..000000000 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationOSMLoginViewController.mm +++ /dev/null @@ -1,147 +0,0 @@ -#import "MWMAuthorizationOSMLoginViewController.h" -#import "MWMAlertViewController.h" -#import "MWMAuthorizationCommon.h" -#import "MWMCircularProgress.h" -#import "MWMSettingsViewController.h" -#import "UITextField+RuntimeAttributes.h" - -#include "base/logging.hpp" -#include "editor/server_api.hpp" -#include "platform/platform.hpp" -#include "private.h" - -using namespace osm; - -@interface MWMAuthorizationOSMLoginViewController () - -@property(weak, nonatomic) IBOutlet UITextField * loginTextField; -@property(weak, nonatomic) IBOutlet UITextField * passwordTextField; -@property(weak, nonatomic) IBOutlet UIButton * loginButton; -@property(weak, nonatomic) IBOutlet UIButton * forgotButton; -@property(weak, nonatomic) IBOutlet UIView * spinnerView; - -@property(nonatomic) MWMCircularProgress * spinner; - -@end - -@implementation MWMAuthorizationOSMLoginViewController - -- (void)viewDidLoad -{ - [super viewDidLoad]; - self.title = L(@"osm_account"); - [self checkConnection]; - [self stopSpinner]; -} - -- (void)viewDidAppear:(BOOL)animated -{ - [super viewDidAppear:animated]; - if (!self.loginTextField.text.length && !self.passwordTextField.text.length) - [self.loginTextField becomeFirstResponder]; -} - -- (BOOL)shouldAutorotate { return NO; } -- (void)checkConnection { self.forgotButton.enabled = Platform::IsConnected(); } - -#pragma mark - UITextFieldDelegate - -- (BOOL)textFieldShouldReturn:(UITextField *)textField -{ - if ([textField isEqual:self.loginTextField]) - { - [self.passwordTextField becomeFirstResponder]; - } - else if ([textField isEqual:self.passwordTextField]) - { - [textField resignFirstResponder]; - [self login]; - } - return YES; -} - -- (void)startSpinner -{ - self.spinnerView.hidden = NO; - self.spinner = [[MWMCircularProgress alloc] initWithParentView:self.spinnerView]; - [self.spinner setInvertColor:YES]; - self.spinner.state = MWMCircularProgressStateSpinner; - self.loginTextField.enabled = NO; - self.passwordTextField.enabled = NO; - self.forgotButton.enabled = NO; - [self.loginButton setTitle:@"" forState:UIControlStateNormal]; -} - -- (void)stopSpinner -{ - self.spinnerView.hidden = YES; - self.spinner = nil; - self.loginTextField.enabled = YES; - self.passwordTextField.enabled = YES; - self.forgotButton.enabled = YES; - [self.loginButton setTitle:L(@"login") forState:UIControlStateNormal]; -} - -#pragma mark - Actions - -- (IBAction)login -{ - if (!self.loginButton.enabled || self.spinner) - return; - if (Platform::IsConnected()) - { - NSString * username = self.loginTextField.text; - NSString * password = self.passwordTextField.text; - - [self startSpinner]; - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{ - OsmOAuth auth = OsmOAuth::ServerAuth(); - try - { - auth.AuthorizePassword(username.UTF8String, password.UTF8String); - } - catch (std::exception const & ex) - { - LOG(LWARNING, ("Error login", ex.what())); - } - - dispatch_async(dispatch_get_main_queue(), ^{ - [self stopSpinner]; - - if (auth.IsAuthorized()) - { - osm_auth_ios::AuthorizationStoreCredentials(auth.GetAuthToken()); - UIViewController * svc = nil; - for (UIViewController * vc in self.navigationController.viewControllers) - { - if ([vc isKindOfClass:[MWMSettingsViewController class]]) - { - svc = vc; - break; - } - } - if (svc) - [self.navigationController popToViewController:svc animated:YES]; - else - [self.navigationController popToRootViewControllerAnimated:YES]; - } - else - { - [self.alertController presentInvalidUserNameOrPasswordAlert]; - } - }); - }); - } - else - { - [self.alertController presentNoConnectionAlert]; - } -} - -- (IBAction)cancel { [self.navigationController popViewControllerAnimated:YES]; } -- (IBAction)forgotPassword -{ - [self openUrl:@(OsmOAuth::ServerAuth().GetResetPasswordURL().c_str())]; -} - -@end diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index a6f4d220a..68fd84ed8 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -26,8 +26,6 @@ - (void)updateStatusBarStyle; -- (void)migrateOAuthCredentials; - - (void)performAction:(NSString *_Nonnull)action; - (void)openMenu; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 10c5e04b6..9b679c0cb 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -1,7 +1,6 @@ #import "MapViewController.h" #import #import "EAGLView.h" -#import "MWMAuthorizationCommon.h" #import "MWMAutoupdateController.h" #import "MWMEditorViewController.h" #import "MWMFrameworkListener.h" @@ -425,10 +424,6 @@ NSString *const kSettingsSegue = @"Map2Settings"; if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden) self.controlsManager.menuState = self.controlsManager.menuRestoreState; - // Added in https://github.com/organicmaps/organicmaps/pull/7333 - // After all users migrate to OAuth2 we can remove next code - [self migrateOAuthCredentials]; - if (self.trackRecordingManager.isActive) [self showTrackRecordingPlacePage]; @@ -499,8 +494,7 @@ NSString *const kSettingsSegue = @"Map2Settings"; - (void)showViralAlertIfNeeded { NSUserDefaults *ud = NSUserDefaults.standardUserDefaults; - using namespace osm_auth_ios; - if (!AuthorizationIsNeedCheck() || [ud objectForKey:kUDViralAlertWasShown] || !AuthorizationHaveCredentials()) + if (!Profile.needsReauthorization || [ud objectForKey:kUDViralAlertWasShown] || Profile.isExisting) return; if (osm::Editor::Instance().GetStats().m_edits.size() < 2) @@ -536,14 +530,6 @@ NSString *const kSettingsSegue = @"Map2Settings"; [self setNeedsStatusBarAppearanceUpdate]; } -- (void)migrateOAuthCredentials { - if (osm_auth_ios::AuthorizationHaveOAuth1Credentials()) - { - osm_auth_ios::AuthorizationClearOAuth1Credentials(); - [self.alertController presentOsmReauthAlert]; - } -} - - (id)initWithCoder:(NSCoder *)coder { NSLog(@"MapViewController initWithCoder Started"); self = [super initWithCoder:coder]; @@ -661,13 +647,12 @@ NSString *const kSettingsSegue = @"Map2Settings"; #pragma mark - Authorization - (void)checkAuthorization { - using namespace osm_auth_ios; - BOOL const isAfterEditing = AuthorizationIsNeedCheck() && !AuthorizationHaveCredentials(); + BOOL const isAfterEditing = Profile.needsReauthorization && !Profile.isExisting; if (isAfterEditing) { - AuthorizationSetNeedCheck(NO); + [Profile requestReauthorizationWithShouldReauthorize:NO]; if (!Platform::IsConnected()) return; - [self.alertController presentOsmAuthAlert]; + [self presentViewController:BridgeControllers.profileAsAlert animated:YES completion:nil]; } } diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 876f13b5e..f8b97ec5e 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -1,7 +1,6 @@ #import "MapsAppDelegate.h" #import "EAGLView.h" -#import "MWMAuthorizationCommon.h" #import "MWMCoreRouterType.h" #import "MWMFrameworkListener.h" #import "MWMFrameworkObservers.h" @@ -58,7 +57,6 @@ void InitLocalizedStrings() { } } // namespace -using namespace osm_auth_ios; @interface MapsAppDelegate () diff --git a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift index 1a9a1fc45..6b575edb4 100644 --- a/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift +++ b/iphone/Maps/Core/DeepLink/DeepLinkHandler.swift @@ -135,10 +135,14 @@ component.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty } if let code = components.first { - Bridging.saveOauthToken(from: code) - let window = (UIApplication.shared.connectedScenes.filter { $0.activationState == .foregroundActive }.first(where: { $0 is UIWindowScene }) as? UIWindowScene)?.keyWindow - window?.rootViewController?.presentedViewController?.navigationController?.popToRootViewController(animated: true) - window?.rootViewController?.presentedViewController?.dismiss(animated: true) + Task(priority: .userInitiated) { + await Profile.saveAuthorizationToken(from: code) + DispatchQueue.main.sync { + let window = (UIApplication.shared.connectedScenes.filter { $0.activationState == .foregroundActive }.first(where: { $0 is UIWindowScene }) as? UIWindowScene)?.keyWindow + window?.rootViewController?.presentedViewController?.navigationController?.popToRootViewController(animated: true) + window?.rootViewController?.presentedViewController?.dismiss(animated: true) + } + } return true } else { return false diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm index 762dcf6be..1a4aefcbd 100644 --- a/iphone/Maps/Core/Editor/MWMEditorHelper.mm +++ b/iphone/Maps/Core/Editor/MWMEditorHelper.mm @@ -1,6 +1,6 @@ #import "MWMEditorHelper.h" #import -#import "MWMAuthorizationCommon.h" +#import "SwiftBridge.h" #include #include @@ -10,7 +10,7 @@ + (void)uploadEdits:(void (^)(UIBackgroundFetchResult))completionHandler { - if (!osm_auth_ios::AuthorizationHaveCredentials() || + if (!Profile.isExisting || Platform::EConnectionType::CONNECTION_NONE == Platform::ConnectionStatus()) { completionHandler(UIBackgroundFetchResultFailed); @@ -31,7 +31,12 @@ break; } }; - std::string const oauthToken = osm_auth_ios::AuthorizationGetCredentials(); + + NSString *authorizationToken = Profile.authorizationToken; + if (authorizationToken == nil) { + authorizationToken = @""; + } + std::string const oauthToken = std::string([authorizationToken UTF8String]); osm::Editor::Instance().UploadChanges( oauthToken, {{"created_by", diff --git a/iphone/Maps/Images.xcassets/Accent Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Accent Color.colorset/Contents.json new file mode 100644 index 000000000..d50fd6b76 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Accent Color.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.341", + "green" : "0.506", + "red" : "0.345" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/Contents.json deleted file mode 100644 index dd73dd3c9..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "facebook_btn.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "facebook_btn@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "facebook_btn@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn.png deleted file mode 100644 index 666233f76..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn@2x.png deleted file mode 100644 index 787f14375..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn@3x.png deleted file mode 100644 index b35f6db29..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn.imageset/facebook_btn@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/Contents.json deleted file mode 100644 index d50f7717a..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "facebook_btn_highlighted.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "facebook_btn_highlighted@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "facebook_btn_highlighted@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted.png deleted file mode 100644 index c6d22328d..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted@2x.png deleted file mode 100644 index 741f94c75..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted@3x.png deleted file mode 100644 index eb80a4a9b..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/facebook_btn_highlighted.imageset/facebook_btn_highlighted@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/Contents.json deleted file mode 100644 index 6c4ede7f6..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "google_btn.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "google_btn@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "google_btn@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn.png deleted file mode 100644 index 2949b1554..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn@2x.png deleted file mode 100644 index 9f1c89295..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn@3x.png deleted file mode 100644 index f70706c16..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn.imageset/google_btn@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/Contents.json deleted file mode 100644 index 19f722e7e..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "google_btn_highlighted.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "google_btn_highlighted@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "google_btn_highlighted@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted.png deleted file mode 100644 index 0d1eeda1f..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted@2x.png deleted file mode 100644 index dfee19b1f..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted@3x.png deleted file mode 100644 index 7e47fba9a..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/google_btn_highlighted.imageset/google_btn_highlighted@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/Contents.json deleted file mode 100644 index 8e0da4ec8..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "img_login.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "img_login@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "img_login@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login.png deleted file mode 100644 index 5dab21763..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login@2x.png deleted file mode 100644 index b0de8a2ba..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login@3x.png deleted file mode 100644 index cadb0125f..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/img_login.imageset/img_login@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/Contents.json deleted file mode 100644 index 566538574..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "osm_btn_dark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "osm_btn_dark@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "osm_btn_dark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark.png deleted file mode 100644 index 14ca7d406..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark@2x.png deleted file mode 100644 index 11eb3bde5..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark@3x.png deleted file mode 100644 index b221b1cb4..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_dark.imageset/osm_btn_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/Contents.json deleted file mode 100644 index 1abdfae43..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "osm_btn_highlighted_dark.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "osm_btn_highlighted_dark@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "osm_btn_highlighted_dark@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark.png deleted file mode 100644 index cee9e0917..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark@2x.png deleted file mode 100644 index 27b299e11..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark@3x.png deleted file mode 100644 index f0b697762..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_dark.imageset/osm_btn_highlighted_dark@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/Contents.json deleted file mode 100644 index 783e244fd..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "osm_btn_highlighted_light.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "osm_btn_highlighted_light@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "osm_btn_highlighted_light@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light.png deleted file mode 100644 index 989d7e3e8..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light@2x.png deleted file mode 100644 index 2bb7ea9b3..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light@3x.png deleted file mode 100644 index 1e73afb80..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_highlighted_light.imageset/osm_btn_highlighted_light@3x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/Contents.json b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/Contents.json deleted file mode 100644 index 70d6b8472..000000000 --- a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "osm_btn_light.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "osm_btn_light@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "osm_btn_light@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light.png deleted file mode 100644 index 92a3ad431..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light@2x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light@2x.png deleted file mode 100644 index 9193ed8c5..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light@2x.png and /dev/null differ diff --git a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light@3x.png b/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light@3x.png deleted file mode 100644 index 67ad17042..000000000 Binary files a/iphone/Maps/Images.xcassets/AlertsAndDialogs/osm_btn_light.imageset/osm_btn_light@3x.png and /dev/null differ diff --git a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings index e24e642e7..f58a29608 100644 --- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Sluit oor %@"; "closed" = "Gesluit"; "add_opening_hours" = "Voeg besigheidsure toe"; -"no_osm_account" = "Het u nie ’n OpenStreetMap-rekening nie?"; -"register_at_openstreetmap" = "Registreer by OpenStreetMap"; -"password_8_chars_min" = "Wagwoord (ten minste 8 karakters)"; -"invalid_username_or_password" = "Ongeldige gebruikersnaam of wagwoord."; -"login" = "OpenStreetMap-aantekening"; -"login_osm" = "Teken aan op OpenStreetMap"; -"forgot_password" = "Het u u wagwoord vergeet?"; -"osm_account" = "OSM-rekening"; -"logout" = "Teken af"; + +/* OpenStreetMap */ +"osm_explanation" = "Gemeenskap-geskepte OpenStreetMap-data vanaf %@. Kom meer te wete oor hoe om die kaart te redigeer en op te dateer by OpenStreetMap.org"; +"osm_more_about" = "Meer oor OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap-profiel"; +"osm_profile_promt" = "Skep 'n OpenStreetMap-rekening of meld aan om jou kaartwysigings aan die wêreld te publiseer."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Teken aan op OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Het u nie ’n OpenStreetMap-rekening nie?"; +"osm_profile_register" = "Registreer by OpenStreetMap"; +"osm_profile_verfied_changes" = "Bevestigde veranderinge"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Laaste oplaai"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Verander ligging"; "message_invalid_feature_position" = "Geen voorwerp kan hier geplaas word nie"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Gemeenskap-geskepte OpenStreetMap-data vanaf %@. Kom meer te wete oor hoe om die kaart te redigeer en op te dateer by OpenStreetMap.org"; -"login_to_make_edits_visible" = "Skep 'n OpenStreetMap-rekening of meld aan om jou kaartwysigings aan die wêreld te publiseer."; - /* Error dialog no space */ "migration_no_space_message" = "U benodig meer spasie om af te laai. Skrap asb. enige onnodige data."; "editor_sharing_title" = "Ek het CoMaps verbeter"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Thank you for using our community-built maps!"; diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index ab7a657d2..a1802ff1a 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "يغلق في غضون %@"; "closed" = "مغلق"; "add_opening_hours" = "أضف ساعات العمل"; -"no_osm_account" = "ليس لديك حساب في خريطة الشارع المفتوحة؟"; -"register_at_openstreetmap" = "التسجيل في خريطة الشارع المفتوحة"; -"password_8_chars_min" = "كلمة المرور (٨ أحرف بحد أدنى)"; -"invalid_username_or_password" = "اسم المستخدم أو كلمة المرور غير صالحة."; -"login" = "تسجيل الدخول"; -"login_osm" = "تسجيل الدخول الى OpenStreetMap"; -"forgot_password" = "هل نسيت كلمة المرور؟"; -"osm_account" = "حساب على خريطة الشارع المفتوحة"; -"logout" = "تسجيل الخروج"; + +/* OpenStreetMap */ +"osm_explanation" = "بيانات OpenStreetMap التي أنشأها المجتمع اعتبارًا من %@. تعرف على المزيد حول كيفية تعديل الخريطة وتحديثها على OpenStreetMap.org"; +"osm_more_about" = "المزيد عن خريطة الشارع المفتوحة"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Ar:About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "ملف الشخصي على خريطة الشارع المفتوحة"; +"osm_profile_promt" = "أنشئ حساباً على OpenStreetMap أو سجّل الدخول لنشر تعديلاتك على الخريطة للعالم."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "تسجيل الدخول الى OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "ليس لديك حساب في خريطة الشارع المفتوحة؟"; +"osm_profile_register" = "التسجيل في خريطة الشارع المفتوحة"; +"osm_profile_verfied_changes" = "التعديلات التي تم التحقق منها"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "آخر تعديل"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "تغيير الموقع"; "message_invalid_feature_position" = "لا يمكن تحديد موقع الكائن هنا"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "بيانات OpenStreetMap التي أنشأها المجتمع اعتبارًا من %@. تعرف على المزيد حول كيفية تعديل الخريطة وتحديثها على OpenStreetMap.org"; -"login_to_make_edits_visible" = "أنشئ حساباً على OpenStreetMap أو سجّل الدخول لنشر تعديلاتك على الخريطة للعالم."; - /* Error dialog no space */ "migration_no_space_message" = "للتنزيل، فأنت تحتاج إلى توفير مساحة أكبر. من فضلك، الرجاء قم بحذف البيانات غير الضرورية."; "editor_sharing_title" = "لقد قمت بتحسين خرائط تطبيق CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/ar"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Ar:About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "شكرًا لك على استخدام الخرائط التي أنشأها مجتمعنا!"; diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings index 4df80003f..045b4c3b3 100644 --- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "%@ sonra bağlanır"; "closed" = "Bağlı"; "add_opening_hours" = "Açılış saatlarını əlavə edin"; -"no_osm_account" = "OpenStreetMap hesabınız yoxdur?"; -"register_at_openstreetmap" = "OpenStreetMap üçün qeydiyyatdan keçin"; -"password_8_chars_min" = "Parol (ən azı 8 simvol)"; -"invalid_username_or_password" = "Yanlış istifadəçi adı və ya şifrə."; -"login" = "Daxil ol"; -"login_osm" = "OpenStreetMap-a daxil olun"; -"forgot_password" = "Parolu unutmusunuz?"; -"osm_account" = "OSM Hesabı"; -"logout" = "Çıxış"; + +/* OpenStreetMap */ +"osm_explanation" = "%@ tarixinə icma tərəfindən yaradılmış OpenStreetMap datası. OpenStreetMap.org saytında xəritəni necə redaktə etmək və yeniləmək haqqında ətraflı məlumat əldə edin"; +"osm_more_about" = "OpenStreetMap haqqında əlavə məlumat"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Az:Layihə_haqqında"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profili"; +"osm_profile_promt" = "OpenStreetMap hesabı yaradın və ya xəritə redaktələrinizi dünyada dərc etmək üçün daxil olun."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "OpenStreetMap-a daxil olun"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "OpenStreetMap hesabınız yoxdur?"; +"osm_profile_register" = "OpenStreetMap üçün qeydiyyatdan keçin"; +"osm_profile_verfied_changes" = "Təsdiqlənmiş Dəyişikliklər"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Son yükləmə"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Ünvanı dəyişdirin"; "message_invalid_feature_position" = "Burada obyekti yerləşdirmək mümkün deyil"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "%@ tarixinə icma tərəfindən yaradılmış OpenStreetMap datası. OpenStreetMap.org saytında xəritəni necə redaktə etmək və yeniləmək haqqında ətraflı məlumat əldə edin"; -"login_to_make_edits_visible" = "OpenStreetMap hesabı yaradın və ya xəritə redaktələrinizi dünyada dərc etmək üçün daxil olun."; - /* Error dialog no space */ "migration_no_space_message" = "Endirmək üçün daha çox yerə ehtiyacınız var. Zəhmət olmasa önəmli olmayan məlumatları silin."; "editor_sharing_title" = "CoMaps xəritələrini təkmilləşdirdim"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/tr/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Az:Layihə_haqqında"; - /* App Tip #00 */ "app_tip_00" = "İcma tərəfindən yaradılmış xəritələrimizdən istifadə etdiyiniz üçün təşəkkür edirik!"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index 2277ec8b4..6e88e4a6a 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Зачыняецца праз %@"; "closed" = "Закрыта"; "add_opening_hours" = "Дадаць часы працы"; -"no_osm_account" = "Не зарэгістраваныя на OpenStreetMap?"; -"register_at_openstreetmap" = "Зарэгістравацца на OpenStreetMap"; -"password_8_chars_min" = "Пароль (мінімум 8 сімвалаў)"; -"invalid_username_or_password" = "Няправільныя імя карыстальніка альбо пароль."; -"login" = "Увайсці"; -"login_osm" = "Увайсці ў OpenStreetMap"; -"forgot_password" = "Забылі пароль?"; -"osm_account" = "Акаунт OSM"; -"logout" = "Выйсці"; + +/* OpenStreetMap */ +"osm_explanation" = "Створаныя супольнасцю даныя OpenStreetMap па стане на %@. Даведайцеся больш пра тое, як рэдагаваць і абнаўляць карту на OpenStreetMap.org"; +"osm_more_about" = "Падрабязней пра OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/RU:О_проекте"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Профіль OpenStreetMap"; +"osm_profile_promt" = "Стварыце ўліковы запіс OpenStreetMap або ўвайдзіце ў сістэму, каб апублікаваць праўкі карты ўсім на свеце."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Увайсці ў OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Не зарэгістраваныя на OpenStreetMap?"; +"osm_profile_register" = "Зарэгістравацца на OpenStreetMap"; +"osm_profile_verfied_changes" = "Правераныя змены"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Апошняя запампоўка"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Змяніце месцазнаходжанне"; "message_invalid_feature_position" = "Аб'ект не можа знаходзіцца тут"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Створаныя супольнасцю даныя OpenStreetMap па стане на %@. Даведайцеся больш пра тое, як рэдагаваць і абнаўляць карту на OpenStreetMap.org"; -"login_to_make_edits_visible" = "Стварыце ўліковы запіс OpenStreetMap або ўвайдзіце ў сістэму, каб апублікаваць праўкі карты ўсім на свеце."; - /* Error dialog no space */ "migration_no_space_message" = "Каб спампаваць, трэба больш месца. Выдаліце непатрэбныя даныя."; "editor_sharing_title" = "Я палепшыў карты CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/ru/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/RU:О_проекте"; - /* App Tip #00 */ "app_tip_00" = "Дзякуй за выкарыстанне нашых карт, створаных супольнасцю!"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index fdfd3e8b7..77d69e43f 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "Затворено"; "add_opening_hours" = "Добавяне на работно време"; -"no_osm_account" = "Нямате акаунт в OpenStreetMap?"; -"register_at_openstreetmap" = "Регистриране в OpenStreetMap"; -"password_8_chars_min" = "Парола (поне 8 символа)"; -"invalid_username_or_password" = "Невалидно потребителско име или парола."; -"login" = "Вход"; -"login_osm" = "Влезте в OpenStreetMap"; -"forgot_password" = "Забравили сте паролата си?"; -"osm_account" = "OSM Акаунт"; -"logout" = "Изход"; + +/* OpenStreetMap */ +"osm_explanation" = "Създадени от общността данни от OpenStreetMap към %@. Научете повече за това как да редактирате и актуализирате картата в OpenStreetMap.org"; +"osm_more_about" = "Повече за OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Bg:About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Профил в OpenStreetMap"; +"osm_profile_promt" = "Създайте акаунт в OpenStreetMap или влезте в него, за да публикувате своите редакции на картата в света."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Влезте в OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Нямате акаунт в OpenStreetMap?"; +"osm_profile_register" = "Регистриране в OpenStreetMap"; +"osm_profile_verfied_changes" = "Потвърдени промени"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Последно качване"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Смяна на местоположение"; "message_invalid_feature_position" = "Тук не може да бъде намерен обект"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Създадени от общността данни от OpenStreetMap към %@. Научете повече за това как да редактирате и актуализирате картата в OpenStreetMap.org"; -"login_to_make_edits_visible" = "Създайте акаунт в OpenStreetMap или влезте в него, за да публикувате своите редакции на картата в света."; - /* Error dialog no space */ "migration_no_space_message" = "За изтегляне ви е необходимо повече място. Моля, изтрийте всички ненужни данни."; "editor_sharing_title" = "Подобрих картите на CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Bg:About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Благодарим ви, че използвате нашите карти, създадени от общността!"; diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings index a6e03b022..6fc6d650e 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Tanca en %@"; "closed" = "Tancat"; "add_opening_hours" = "Afegeix horari d'obertura"; -"no_osm_account" = "No teniu compte de l’OpenStreetMap?"; -"register_at_openstreetmap" = "Registre a OpenStreetMap"; -"password_8_chars_min" = "Contrasenya (mínim 8 caràcters)"; -"invalid_username_or_password" = "Nom d'usuari o contrasenya no vàlids."; -"login" = "Inicia sessió"; -"login_osm" = "Inicia sessió a l’OpenStreetMap"; -"forgot_password" = "Heu oblidat la contrasenya?"; -"osm_account" = "Compte OSM"; -"logout" = "Tanca la sessió"; + +/* OpenStreetMap */ +"osm_explanation" = "Dades de l’OpenStreetMap creades per la comunitat a partir de %@. Obteniu més informació sobre com editar i actualitzar el mapa a OpenStreetMap.org"; +"osm_more_about" = "Més sobre l'OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Ca:About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Perfil de l’OpenStreetMap"; +"osm_profile_promt" = "Creeu un compte d'OpenStreetMap o inicieu sessió per publicar les vostres edicions de mapes al món."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Inicia sessió a l’OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "No teniu compte de l’OpenStreetMap?"; +"osm_profile_register" = "Registre a OpenStreetMap"; +"osm_profile_verfied_changes" = "Canvis verificats"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Última pujada"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Canvia la ubicació"; "message_invalid_feature_position" = "No s’ha trobat cap objecte aquí"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Dades de l’OpenStreetMap creades per la comunitat a partir de %@. Obteniu més informació sobre com editar i actualitzar el mapa a OpenStreetMap.org"; -"login_to_make_edits_visible" = "Creeu un compte d'OpenStreetMap o inicieu sessió per publicar les vostres edicions de mapes al món."; - /* Error dialog no space */ "migration_no_space_message" = "Per a la baixada, us cal més espai. Suprimiu les dades no necessàries."; "editor_sharing_title" = "He millorat els mapes de l’CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/ca/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Ca:About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Gràcies per utilitzar els nostres mapes creats per la comunitat!"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 42bd9925e..a09bafaf5 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Zavírá za %@"; "closed" = "Zavřeno"; "add_opening_hours" = "Přidat otevírací dobu"; -"no_osm_account" = "Nemáte účet u OpenStreetMap?"; -"register_at_openstreetmap" = "Zaregistrujte si účet na OpenStreetMap"; -"password_8_chars_min" = "Heslo (minimálně 8 znaků)"; -"invalid_username_or_password" = "Neplatné uživatelské jméno nebo heslo."; -"login" = "Přihlásit se"; -"login_osm" = "Přihlásit se do OpenStreetMap"; -"forgot_password" = "Zapomenuté heslo?"; -"osm_account" = "Účet OSM"; -"logout" = "Odhlášení"; + +/* OpenStreetMap */ +"osm_explanation" = "Data OpenStreetMap vytvořená komunitou ke dni %@. Další informace o tom, jak upravovat a aktualizovat mapu, najdete na stránkách OpenStreetMap.org"; +"osm_more_about" = "Další informace o projektu OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Cs:Co_je_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Profil OpenStreetMap"; +"osm_profile_promt" = "Vytvořte si účet OpenStreetMap nebo se přihlaste a zveřejněte své úpravy mapy celému světu."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Přihlásit se do OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Nemáte účet u OpenStreetMap?"; +"osm_profile_register" = "Zaregistrujte si účet na OpenStreetMap"; +"osm_profile_verfied_changes" = "Oveřené změny"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Poslední nahrání"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Změnit umístění"; "message_invalid_feature_position" = "Objekt zde nemůže být umístěn"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Data OpenStreetMap vytvořená komunitou ke dni %@. Další informace o tom, jak upravovat a aktualizovat mapu, najdete na stránkách OpenStreetMap.org"; -"login_to_make_edits_visible" = "Vytvořte si účet OpenStreetMap nebo se přihlaste a zveřejněte své úpravy mapy celému světu."; - /* Error dialog no space */ "migration_no_space_message" = "Ke stažení potřebujete více volného místa. Odstraňte prosím nepotřebná data."; "editor_sharing_title" = "Vylepšil jsem mapy CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/cs/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Cs:Co_je_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Děkujeme, že používáte naše komunitní mapy!"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index dfeb75bf9..a497cf21c 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Lukker om %@"; "closed" = "Lukket"; "add_opening_hours" = "Tilføj arbejdstid"; -"no_osm_account" = "Har du ikke OpenStreetMap-konto?"; -"register_at_openstreetmap" = "Tilmeld dig OpenStreetMap"; -"password_8_chars_min" = "Adgangskode (mindst 8 tegn)"; -"invalid_username_or_password" = "Ugyldigt brugernavn eller adgangskode."; -"login" = "Log ind"; -"login_osm" = "Log ind på OpenStreetMap"; -"forgot_password" = "Glemt adgangskode?"; -"osm_account" = "OSM-konto"; -"logout" = "Log ud"; + +/* OpenStreetMap */ +"osm_explanation" = "Fællesskabsskabte OpenStreetMap-data fra %@. Få mere at vide om, hvordan du redigerer og opdaterer kortet på OpenStreetMap.org"; +"osm_more_about" = "Mere om OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Da:Om_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profil"; +"osm_profile_promt" = "Opret en OpenStreetMap-konto eller log ind for at offentliggøre dine kortredigeringer til hele verden."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Log ind på OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Har du ikke OpenStreetMap-konto?"; +"osm_profile_register" = "Tilmeld dig OpenStreetMap"; +"osm_profile_verfied_changes" = "Bekræftede ændringer"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Sidste overførsel"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Skift lokation"; "message_invalid_feature_position" = "Et objekt kan ikke placeres her"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Fællesskabsskabte OpenStreetMap-data fra %@. Få mere at vide om, hvordan du redigerer og opdaterer kortet på OpenStreetMap.org"; -"login_to_make_edits_visible" = "Opret en OpenStreetMap-konto eller log ind for at offentliggøre dine kortredigeringer til hele verden."; - /* Error dialog no space */ "migration_no_space_message" = "For at opdatere app'en skal du bruge mere plads. Slet unødvendig data."; "editor_sharing_title" = "Jeg forbedrede CoMaps kortene"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Da:Om_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Tak, fordi du bruger vores fællesskabsskabte kort!"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index ed6e0dffc..0930b52f0 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -525,15 +525,29 @@ "closes_in" = "Schließt in %@"; "closed" = "Geschlossen"; "add_opening_hours" = "Öffnungszeiten hinzufügen"; -"no_osm_account" = "Kein Konto bei OpenStreetMap?"; -"register_at_openstreetmap" = "Bei OpenStreetMap registrieren"; -"password_8_chars_min" = "Passwort (mindestens 8 Zeichen)"; -"invalid_username_or_password" = "Ungültiger Benutzername oder Passwort."; -"login" = "Bei OpenStreetMap anmelden"; -"login_osm" = "Bei OpenStreetMap anmelden"; -"forgot_password" = "Passwort vergessen?"; -"osm_account" = "OSM Konto"; -"logout" = "Abmelden"; + +/* OpenStreetMap */ +"osm_explanation" = "Von der Community erstellte OpenStreetMap-Daten (Stand: %@). Erfahre mehr darüber, wie du die Karte bearbeiten und aktualisieren kannst unter OpenStreetMap.org"; +"osm_more_about" = "Mehr Informationen über OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/DE:Über_OSM"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap-Profil"; +"osm_profile_promt" = "Erstellen Sie ein OpenStreetMap-Konto oder melden Sie sich an, um Ihre Kartenbearbeitungen weltweit zu veröffentlichen."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) ist ein Gemeinschaftsprojekt zur Erstellung einer freien und offenen Karte. Es ist die Hauptquelle für Kartendaten in CoMaps und funktioniert ähnlich wie Wikipedia. Sie können Orte hinzufügen oder bearbeiten, die dann Millionen von Nutzern weltweit zur Verfügung stehen. Werden Sie Teil der Gemeinschaft und helfen Sie mit, eine bessere Karte für alle zu erstellen! +"; +"osm_profile_login" = "Bei OpenStreetMap anmelden"; +"osm_profile_reauthorize_promt" = "Das OpenStreetMap-Konoto wurde von dieser App getrennt"; +"osm_profile_reauthorize" = "OpenStreetMap-Konto erneut verbinden"; +"osm_profile_remove_promt" = "Wenn Sie Ihr Konto nicht erneut verbinden können oder möchten, können Sie es einfach aus dieser App entfernen"; +"osm_profile_remove" = "OpenStreetMap-Konto entfernen"; +"osm_profile_register_promt" = "Kein Konto bei OpenStreetMap?"; +"osm_profile_register" = "Bei OpenStreetMap registrieren"; +"osm_profile_verfied_changes" = "Bestätigte Änderungen der Karte"; +"osm_profile_view_edit_history" = "Bearbeitungsverlauf ansehen"; +"osm_profile_view_notes" = "Notizen ansehen"; +"osm_profile_logout" = "OpenStreetMap-Konto abmelden"; +"osm_profile_delete" = "OpenStreetMap-Konto löschen"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Zuletzt hochgeladen"; @@ -582,12 +596,8 @@ "dialog_incorrect_feature_position" = "Standort wechseln"; "message_invalid_feature_position" = "Ein Objekt kann hier nicht positioniert werden"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Von der Community erstellte OpenStreetMap-Daten (Stand: %@). Erfahre mehr darüber, wie du die Karte bearbeiten und aktualisieren kannst unter OpenStreetMap.org"; -"login_to_make_edits_visible" = "Erstellen Sie ein OpenStreetMap-Konto oder melden Sie sich an, um Ihre Kartenbearbeitungen weltweit zu veröffentlichen."; - /* Error dialog no space */ -"migration_no_space_message" = "Zum Herunterladen benötigen Sie mehr Platz. Bitte löschen Sie unnötige Daten."; +"migration_no_space_message" = "Zum Herunterladen benötigen Sie mehr Platz. Bitte löschen Sie unnötige Daten."; "editor_sharing_title" = "Ich habe die CoMaps-Karten verbessert"; /* Downloaded 10 **of** 20 <- it is that "of" */ @@ -936,12 +946,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/de/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/DE:Über_OSM"; - /* App Tip #00 */ "app_tip_00" = "Danke, dass du unsere von der Community erstellten Karten benutzt!"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index 73815a770..ff9d865af 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Κλείνει σε %@"; "closed" = "Κλειστό"; "add_opening_hours" = "Προσθέστε ώρες λειτουργίας"; -"no_osm_account" = "Δεν έχετε λογαριασμό OpenStreetMap;"; -"register_at_openstreetmap" = "Εγγραφή στο OpenStreetMap"; -"password_8_chars_min" = "Κωδικός πρόσβασης (τουλάχιστον 8 χαρακτήρες)"; -"invalid_username_or_password" = "Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης."; -"login" = "Σύνδεση"; -"login_osm" = "Συνδεθείτε στο OpenStreetMap"; -"forgot_password" = "Ξαχάσατε τον κωδικό πρόσβασης;"; -"osm_account" = "Λογαριασμός OSM"; -"logout" = "Αποσύνδεση"; + +/* OpenStreetMap */ +"osm_explanation" = "Δεδομένα OpenStreetMap που δημιουργήθηκαν από την κοινότητα στις %@. Μάθετε περισσότερα για τον τρόπο επεξεργασίας και ενημέρωσης του χάρτη στο OpenStreetMap.org"; +"osm_more_about" = "Περισσότερα σχετικά με το OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/El:Σχετικά_με_το_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Προφίλ OpenStreetMap"; +"osm_profile_promt" = "Δημιουργήστε έναν λογαριασμό OpenStreetMap ή συνδεθείτε για να δημοσιεύσετε τις επεξεργασίες του χάρτη σας στον κόσμο."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Συνδεθείτε στο OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Δεν έχετε λογαριασμό OpenStreetMap;"; +"osm_profile_register" = "Εγγραφή στο OpenStreetMap"; +"osm_profile_verfied_changes" = "Επαληθευμένες αλλαγές"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Τελευταία μεταφόρτωση"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Αλλαγή τοποθεσίας"; "message_invalid_feature_position" = "Δε μπορεί να τοποθετηθεί αντικείμενο εδώ"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Δεδομένα OpenStreetMap που δημιουργήθηκαν από την κοινότητα στις %@. Μάθετε περισσότερα για τον τρόπο επεξεργασίας και ενημέρωσης του χάρτη στο OpenStreetMap.org"; -"login_to_make_edits_visible" = "Δημιουργήστε έναν λογαριασμό OpenStreetMap ή συνδεθείτε για να δημοσιεύσετε τις επεξεργασίες του χάρτη σας στον κόσμο."; - /* Error dialog no space */ "migration_no_space_message" = "Για να το κατεβάσετε, χρειάζεστε περισσότερο χώρο. Διαγράψτε μη απαραίτητα δεδομένα."; "editor_sharing_title" = "Βελτίωσα τους χάρτες CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/El:Σχετικά_με_το_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Σας ευχαριστούμε που χρησιμοποιείτε τους χάρτες μας που δημιουργήθηκαν από την κοινότητα!"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index 813040561..1c8fcb5fe 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "Closed"; "add_opening_hours" = "Add opening hours"; -"no_osm_account" = "Don't have an OpenStreetMap account?"; -"register_at_openstreetmap" = "Register at OpenStreetMap"; -"password_8_chars_min" = "Password (8 characters minimum)"; -"invalid_username_or_password" = "Invalid username or password."; -"login" = "Login"; -"login_osm" = "Login to OpenStreetMap"; -"forgot_password" = "Forgot your password?"; -"osm_account" = "OSM Account"; -"logout" = "Log Out"; + +/* OpenStreetMap */ +"osm_explanation" = "Community-created OpenStreetMap data as of %@. Learn more about how to edit and update the map at OpenStreetMap.org"; +"osm_more_about" = "More about OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profile"; +"osm_profile_promt" = "Create an OpenStreetMap account or log in to publish your map edits to the world."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Login to OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Don't have an OpenStreetMap account?"; +"osm_profile_register" = "Register at OpenStreetMap"; +"osm_profile_verfied_changes" = "Verified Changes"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Last upload"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Change location"; "message_invalid_feature_position" = "No object can be located here"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Community-created OpenStreetMap data as of %@. Learn more about how to edit and update the map at OpenStreetMap.org"; -"login_to_make_edits_visible" = "Create an OpenStreetMap account or log in to publish your map edits to the world."; - /* Error dialog no space */ "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data."; "editor_sharing_title" = "I improved the CoMaps maps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Thank you for using our community-built maps!"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index 297580870..5621f307c 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -545,15 +545,28 @@ "closes_in" = "Closes in %@"; "closed" = "Closed"; "add_opening_hours" = "Add opening hours"; -"no_osm_account" = "Don't have an OpenStreetMap account?"; -"register_at_openstreetmap" = "Register at OpenStreetMap"; -"password_8_chars_min" = "Password (8 characters minimum)"; -"invalid_username_or_password" = "Invalid username or password."; -"login" = "Login"; -"login_osm" = "Login to OpenStreetMap"; -"forgot_password" = "Forgot your password?"; -"osm_account" = "OSM Account"; -"logout" = "Log Out"; + +/* OpenStreetMap */ +"osm_explanation" = "Community-created OpenStreetMap data as of %@. Learn more about how to edit and update the map at OpenStreetMap.org"; +"osm_more_about" = "More about OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profile"; +"osm_profile_promt" = "Create an OpenStreetMap account or log in to publish your map edits to the world."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Login to OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Don't have an OpenStreetMap account?"; +"osm_profile_register" = "Register at OpenStreetMap"; +"osm_profile_verfied_changes" = "Verified Changes"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Last upload"; @@ -602,10 +615,6 @@ "dialog_incorrect_feature_position" = "Change location"; "message_invalid_feature_position" = "No object can be located here"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Community-created OpenStreetMap data as of %@. Learn more about how to edit and update the map at OpenStreetMap.org"; -"login_to_make_edits_visible" = "Create an OpenStreetMap account or log in to publish your map edits to the world."; - /* Error dialog no space */ "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data."; "editor_sharing_title" = "I improved the CoMaps maps"; @@ -960,12 +969,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Thank you for using our community-built maps!"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index 1dc46c283..746a0d104 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Cierra en %@"; "closed" = "Cerrado"; "add_opening_hours" = "Añadir horarios de apertura"; -"no_osm_account" = "¿No tiene cuenta en OpenStreetMap?"; -"register_at_openstreetmap" = "Registrarse en OpenStreetMap"; -"password_8_chars_min" = "Contraseña (mínimo 8 caracteres)"; -"invalid_username_or_password" = "Usuario o contraseña incorrectos."; -"login" = "Iniciar sesión"; -"login_osm" = "Iniciar sesión en OpenStreetMap"; -"forgot_password" = "¿Ha olvidado su contraseña?"; -"osm_account" = "Cuenta OSM"; -"logout" = "Cerrar sesión"; + +/* OpenStreetMap */ +"osm_explanation" = "Datos de OpenStreetMap creados por la comunidad a partir de %@. Obtenga más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org"; +"osm_more_about" = "Más acerca de OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Perfil de OpenStreetMap"; +"osm_profile_promt" = "Cree una cuenta OpenStreetMap o inicie sesión para publicar sus ediciones de mapas en todo el mundo."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Iniciar sesión en OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "¿No tiene cuenta en OpenStreetMap?"; +"osm_profile_register" = "Registrarse en OpenStreetMap"; +"osm_profile_verfied_changes" = "Cambios verificados"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Última carga"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Cambiar ubicación"; "message_invalid_feature_position" = "No se puede ubicar ningún objeto aquí"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Datos de OpenStreetMap creados por la comunidad a partir de %@. Obtenga más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org"; -"login_to_make_edits_visible" = "Cree una cuenta OpenStreetMap o inicie sesión para publicar sus ediciones de mapas en todo el mundo."; - /* Error dialog no space */ "migration_no_space_message" = "Necesita más espacio para descargar. Elimine los datos innecesarios."; "editor_sharing_title" = "He mejorado los mapas de CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/es/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "¡Gracias por utilizar nuestros mapas creados por la comunidad!"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index ed1e1e03f..9bf715cea 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Cierra en %@"; "closed" = "Cerrado"; "add_opening_hours" = "Añadir horarios de apertura"; -"no_osm_account" = "¿No tiene cuenta en OpenStreetMap?"; -"register_at_openstreetmap" = "Registrarse en OpenStreetMap"; -"password_8_chars_min" = "Contraseña (mínimo 8 caracteres)"; -"invalid_username_or_password" = "Usuario o contraseña incorrectos."; -"login" = "Acceder"; -"login_osm" = "Acceder a OpenStreetMap"; -"forgot_password" = "¿Ha olvidado su contraseña?"; -"osm_account" = "Cuenta OSM"; -"logout" = "Cerrar sesión"; + +/* OpenStreetMap */ +"osm_explanation" = "Datos de OpenStreetMap creados por la comunidad a partir de %@. Más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org"; +"osm_more_about" = "Más acerca de OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Perfil de OpenStreetMap"; +"osm_profile_promt" = "Cree una cuenta OpenStreetMap o inicie sesión para publicar sus ediciones de mapas en todo el mundo."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Acceder a OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "¿No tiene cuenta en OpenStreetMap?"; +"osm_profile_register" = "Registrarse en OpenStreetMap"; +"osm_profile_verfied_changes" = "Cambios verificados"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Última carga"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Cambiar ubicación"; "message_invalid_feature_position" = "No se puede ubicar ningún objeto aquí"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Datos de OpenStreetMap creados por la comunidad a partir de %@. Más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org"; -"login_to_make_edits_visible" = "Cree una cuenta OpenStreetMap o inicie sesión para publicar sus ediciones de mapas en todo el mundo."; - /* Error dialog no space */ "migration_no_space_message" = "Necesita más espacio para descargar. Elimine los datos innecesarios."; "editor_sharing_title" = "He mejorado los mapas de CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/es/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/ES:Acerca_de_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "¡Gracias por utilizar nuestros mapas creados por la comunidad!"; diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings index cd3f61777..d1b0402ca 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Suletakse %@ jooksul"; "closed" = "Suletud"; "add_opening_hours" = "Lisa tööaeg"; -"no_osm_account" = "Sul puudub OpenStreetMapi konto?"; -"register_at_openstreetmap" = "Registreeru OpenStreetMapis"; -"password_8_chars_min" = "Salasõna (vähemalt 8 märki)"; -"invalid_username_or_password" = "Vigane kasutajanimi või salasõna."; -"login" = "Logi sisse"; -"login_osm" = "Logi sisse OpenStreetMappi"; -"forgot_password" = "Unustasid oma salasõna?"; -"osm_account" = "OSMi kasutajakonto"; -"logout" = "Logi välja"; + +/* OpenStreetMap */ +"osm_explanation" = "Kogukonna loodud OpenStreetMapi andmed seisuga %@. Lisateavet kaardi muutmise ja uuendamise kohta leiad OpenStreetMap.org saidist"; +"osm_more_about" = "Lisateave OpenStreetMapi kohta"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMapi profiil"; +"osm_profile_promt" = "Loo OpenStreetMapi konto või logi sisse, et avaldada oma kaardimuudatused kogu maailmale."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Logi sisse OpenStreetMappi"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Sul puudub OpenStreetMapi konto?"; +"osm_profile_register" = "Registreeru OpenStreetMapis"; +"osm_profile_verfied_changes" = "Kinnitatud muudatused"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Viimane üleslaadimine"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Muuda asukohta"; "message_invalid_feature_position" = "Ükski objekt ei saa siin asuda"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Kogukonna loodud OpenStreetMapi andmed seisuga %@. Lisateavet kaardi muutmise ja uuendamise kohta leiad OpenStreetMap.org saidist"; -"login_to_make_edits_visible" = "Loo OpenStreetMapi konto või logi sisse, et avaldada oma kaardimuudatused kogu maailmale."; - /* Error dialog no space */ "migration_no_space_message" = "Allalaadimiseks vajad rohkem andmeruumi. Palun kustuta ebavajalikke andmeid."; "editor_sharing_title" = "Parandasin CoMaps kaarte"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/et/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Aitäh, et kasutad meie kogukonna koostatud kaarte!"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings index de43dbc8a..f41ed73ba 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "%@ barru itxiko da"; "closed" = "Itxita"; "add_opening_hours" = "Gehitu ordutegia"; -"no_osm_account" = "Ez al duzu OpenStreetMap konturik?"; -"register_at_openstreetmap" = "Eman izena OpenStreetMap-en"; -"password_8_chars_min" = "Pasahitza (gutxienez 8 karaktere)"; -"invalid_username_or_password" = "Erabiltzaile izena edo pasahitza baliogabea."; -"login" = "Saioa hasi"; -"login_osm" = "Hasi saioa OpenStreetMap-en"; -"forgot_password" = "Pasahitza ahaztu duzu?"; -"osm_account" = "OSM kontua"; -"logout" = "Saioa itxi"; + +/* OpenStreetMap */ +"osm_explanation" = "Komunitateak sortutako OpenStreetMap datuak %@-tik aurrera. Lortu informazio gehiago mapa editatu eta eguneratzeari buruz OpenStreetMap.org helbidean"; +"osm_more_about" = "OpenStreetMap-i buruzko informazio gehiago"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profila"; +"osm_profile_promt" = "Sortu OpenStreetMap kontu bat edo hasi saioa zure maparen aldaketak munduan argitaratzeko."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Hasi saioa OpenStreetMap-en"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Ez al duzu OpenStreetMap konturik?"; +"osm_profile_register" = "Eman izena OpenStreetMap-en"; +"osm_profile_verfied_changes" = "Egiaztatutako aldaketak"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Azken karga"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Aldatu kokapena"; "message_invalid_feature_position" = "Hemen ezin da objekturik jarri"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Komunitateak sortutako OpenStreetMap datuak %@-tik aurrera. Lortu informazio gehiago mapa editatu eta eguneratzeari buruz OpenStreetMap.org helbidean"; -"login_to_make_edits_visible" = "Sortu OpenStreetMap kontu bat edo hasi saioa zure maparen aldaketak munduan argitaratzeko."; - /* Error dialog no space */ "migration_no_space_message" = "Leku gehiago behar duzu deskargatzeko. Ezabatu beharrezkoak ez diren datuak."; "editor_sharing_title" = "CoMaps mapak hobetu ditut"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/eu/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Eskerrik asko gure komunitateak eraikitako mapak erabiltzeagatik!"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index ddda2450b..802b81455 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "تعطیل"; "add_opening_hours" = "اضافه کردن ساعت بازگشایی"; -"no_osm_account" = "آیا حساب OpenStreetMap ندارید؟"; -"register_at_openstreetmap" = "ثبت نام در OpenStreetMap"; -"password_8_chars_min" = "رمز عبور (حداقل 8 عدد یا حرف)"; -"invalid_username_or_password" = "نام کاربری یا رمز عبور نامعتبر است."; -"login" = "ورود"; -"login_osm" = "شوید OpenStreetMap وارد"; -"forgot_password" = "رمز عبور خود را فراموش کردید؟"; -"osm_account" = "حساب OSM"; -"logout" = "خروج از حساب"; + +/* OpenStreetMap */ +"osm_explanation" = "داده های OpenStreetMap ایجاد شده توسط انجمن از %@. درباره نحوه ویرایش و به روز رسانی نقشه در OpenStreetMap.org بیشتر بیاموزید"; +"osm_more_about" = "در مورد OpenStreetMap بیشتر بدانید"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Fa:About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap نمایه"; +"osm_profile_promt" = "یک حساب OpenStreetMap ایجاد کنید یا وارد شوید تا ویرایش های نقشه خود را در جهان منتشر کنید."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "شوید OpenStreetMap وارد"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "آیا حساب OpenStreetMap ندارید؟"; +"osm_profile_register" = "ثبت نام در OpenStreetMap"; +"osm_profile_verfied_changes" = "تغییرات تایید شد"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "اخرین بروزرسانی"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "تغییر موقعیت"; "message_invalid_feature_position" = "نمی توان شی ای در این مکان باشد"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "داده های OpenStreetMap ایجاد شده توسط انجمن از %@. درباره نحوه ویرایش و به روز رسانی نقشه در OpenStreetMap.org بیشتر بیاموزید"; -"login_to_make_edits_visible" = "یک حساب OpenStreetMap ایجاد کنید یا وارد شوید تا ویرایش های نقشه خود را در جهان منتشر کنید."; - /* Error dialog no space */ "migration_no_space_message" = "برای دانلود، شما نیازمند فضای ذخیره سازی بیشتری هستید.لطفا داده‌های غیر ضروری خود را حذف کنید."; "editor_sharing_title" = "من نقشه‌های CoMaps را بهبود بخشیدم"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Fa:About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "از شما برای استفاده از نقشه های ساخته شده توسط جامعه سپاسگزاریم!"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 0e47388b5..995d6982a 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Sulkeutuu %@ kuluttua"; "closed" = "Suljettu"; "add_opening_hours" = "Lisää aukioloajat"; -"no_osm_account" = "Eikö sinulla ole OpenStreetMap-tiliä?"; -"register_at_openstreetmap" = "Rekisteröi tili OpenStreetMapissa"; -"password_8_chars_min" = "Salasana (vähintään 8 merkkiä)"; -"invalid_username_or_password" = "Virheellinen käyttäjätunnus tai salasana."; -"login" = "Kirjaudu sisään"; -"login_osm" = "Kirjaudu OpenStreetMapiin"; -"forgot_password" = "Unohtuiko salasana?"; -"osm_account" = "OSM-tili"; -"logout" = "Kirjaudu ulos"; + +/* OpenStreetMap */ +"osm_explanation" = "Yhteisön luomat OpenStreetMap-tiedot %@:sta alkaen. Lisätietoja kartan muokkaamisesta ja päivittämisestä osoitteessa OpenStreetMap.org"; +"osm_more_about" = "Lisätietoja OpenStreetMap:sta"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap-profiili"; +"osm_profile_promt" = "Luo OpenStreetMap-tili tai kirjaudu sisään, jotta voit julkaista karttamuokkauksesi maailmalle."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Kirjaudu OpenStreetMapiin"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Eikö sinulla ole OpenStreetMap-tiliä?"; +"osm_profile_register" = "Rekisteröi tili OpenStreetMapissa"; +"osm_profile_verfied_changes" = "Vahvistetut karttamuutokset"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Viimeisin lisäys"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Vaihda sijaintia"; "message_invalid_feature_position" = "Kohdetta ei voida asettaa tänne"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Yhteisön luomat OpenStreetMap-tiedot %@:sta alkaen. Lisätietoja kartan muokkaamisesta ja päivittämisestä osoitteessa OpenStreetMap.org"; -"login_to_make_edits_visible" = "Luo OpenStreetMap-tili tai kirjaudu sisään, jotta voit julkaista karttamuokkauksesi maailmalle."; - /* Error dialog no space */ "migration_no_space_message" = "Tarvitset lisää tilaa ladataksesi. Poista tarpeeton data."; "editor_sharing_title" = "Paransin CoMaps-karttoja"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/fi/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Kiitos, että käytät yhteisön laatimia karttojamme!"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 7e6a17914..ee57c4319 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Fermé dans %@"; "closed" = "Fermé"; "add_opening_hours" = "Ajouter les heures d'ouverture"; -"no_osm_account" = "Vous n'avez pas de compte sur OpenStreetMap ?"; -"register_at_openstreetmap" = "S'inscrire sur OpenStreetMap"; -"password_8_chars_min" = "Mot de passe (8 caractères minimum)"; -"invalid_username_or_password" = "Nom d'utilisateur ou mot de passe invalide."; -"login" = "Connexion"; -"login_osm" = "Se connecter à OpenStreetMap"; -"forgot_password" = "Mot de passe oublié ?"; -"osm_account" = "Compte OSM"; -"logout" = "Déconnexion"; + +/* OpenStreetMap */ +"osm_explanation" = "Données OpenStreetMap créées par la communauté en date du %@. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consulte le site OpenStreetMap.org."; +"osm_more_about" = "En savoir plus sur OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/FR:À_propos_d’OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Profil OpenStreetMap"; +"osm_profile_promt" = "Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de cartes dans le monde entier."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Se connecter à OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Vous n'avez pas de compte sur OpenStreetMap ?"; +"osm_profile_register" = "S'inscrire sur OpenStreetMap"; +"osm_profile_verfied_changes" = "Modifications vérifiées"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Dernier envoi"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Modifier l'emplacement"; "message_invalid_feature_position" = "Aucun objet ne peut être localisé ici"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Données OpenStreetMap créées par la communauté en date du %@. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consulte le site OpenStreetMap.org."; -"login_to_make_edits_visible" = "Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de cartes dans le monde entier."; - /* Error dialog no space */ "migration_no_space_message" = "Pour télécharger, vous avez besoin de plus d'espace. Veuillez supprimer les données non nécessaires."; "editor_sharing_title" = "J'ai amélioré les cartes de CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/fr/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/FR:À_propos_d’OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Merci d'utiliser nos cartes créées par la communauté !"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index 6d3b37fb1..139cc3bfa 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "נסגר עוד %@"; "closed" = "סגור"; "add_opening_hours" = "הוספת שעות פעילות"; -"no_osm_account" = "אין לך חשבון OpenStreetMap?"; -"register_at_openstreetmap" = "הירשם ב-OpenStreetMap"; -"password_8_chars_min" = "סיסמה (לפחות 8 תווים)"; -"invalid_username_or_password" = "שם משתמש או סיסמה לא תקינים."; -"login" = "כניסה"; -"login_osm" = "היכנס ל-OpenStreetMap"; -"forgot_password" = "שכחת סיסמה?"; -"osm_account" = "חשבון OSM"; -"logout" = "התנתק"; + +/* OpenStreetMap */ +"osm_explanation" = "נתוני OpenStreetMap שנוצרו על ידי הקהילה החל מ-%@. למידע נוסף על איך לערוך ולעדכן את המפה ב-OpenStreetMap.org"; +"osm_more_about" = "עוד על OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "פרופיל OpenStreetMap"; +"osm_profile_promt" = "צור חשבון OpenStreetMap או היכנס כדי לפרסם את עריכות המפה שלך לעולם."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "היכנס ל-OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "אין לך חשבון OpenStreetMap?"; +"osm_profile_register" = "הירשם ב-OpenStreetMap"; +"osm_profile_verfied_changes" = "שינויים מאומתים"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "עדכון אחרון"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "שנה מיקום"; "message_invalid_feature_position" = "לא ניתן למקם כאן פריט"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "נתוני OpenStreetMap שנוצרו על ידי הקהילה החל מ-%@. למידע נוסף על איך לערוך ולעדכן את המפה ב-OpenStreetMap.org"; -"login_to_make_edits_visible" = "צור חשבון OpenStreetMap או היכנס כדי לפרסם את עריכות המפה שלך לעולם."; - /* Error dialog no space */ "migration_no_space_message" = "כדי להוריד, צריך עוד מקום. נא למחוק מידע שאינו הכרחי."; "editor_sharing_title" = "אני משפר את המפות של CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "תודה על השימוש במפות שנבנו בקהילה שלנו!"; diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings index 6a08bd4e0..0491f6467 100644 --- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "%@ में बंद हो जाता है"; "closed" = "बंद"; "add_opening_hours" = "Add opening hours"; -"no_osm_account" = "आपके पास अभी तक OpenStreetMap खाता नहीं है?"; -"register_at_openstreetmap" = "Openstreetmap पर पंजीकरण करें"; -"password_8_chars_min" = "Password (8 characters minimum)"; -"invalid_username_or_password" = "Invalid username or password."; -"login" = "Login"; -"login_osm" = "Login to OpenStreetMap"; -"forgot_password" = "Forgot your password?"; -"osm_account" = "OSM Account"; -"logout" = "Log Out"; + +/* OpenStreetMap */ +"osm_explanation" = "समुदाय-निर्मित OpenStreetMap डेटा %@ तक। OpenStreetMap.org पर मानचित्र को संपादित और अपडेट करने के तरीके के बारे में और जानें"; +"osm_more_about" = "OpenStreetMap के बारे में अधिक जानकारी"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap प्रोफ़ाइल"; +"osm_profile_promt" = "अपने मानचित्र संपादनों को दुनिया भर में प्रकाशित करने के लिए एक OpenStreetMap खाता बनाएं या लॉग इन करें।"; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Login to OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "आपके पास अभी तक OpenStreetMap खाता नहीं है?"; +"osm_profile_register" = "Openstreetmap पर पंजीकरण करें"; +"osm_profile_verfied_changes" = "Verified Changes"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Last upload"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Change location"; "message_invalid_feature_position" = "No object can be located here"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "समुदाय-निर्मित OpenStreetMap डेटा %@ तक। OpenStreetMap.org पर मानचित्र को संपादित और अपडेट करने के तरीके के बारे में और जानें"; -"login_to_make_edits_visible" = "अपने मानचित्र संपादनों को दुनिया भर में प्रकाशित करने के लिए एक OpenStreetMap खाता बनाएं या लॉग इन करें।"; - /* Error dialog no space */ "migration_no_space_message" = "डाउनलोड करने के लिए आपको अधिक जगह की आवश्यकता होगी। कृपया कोई भी अनावश्यक डेटा हटा दें."; "editor_sharing_title" = "I improved the CoMaps maps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/hi/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "हमारे समुदाय-निर्मित मानचित्रों का उपयोग करने के लिए धन्यवाद!"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index 4b6ac573c..be074170d 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Bezár ekkor: %@"; "closed" = "Zárva"; "add_opening_hours" = "Nyitvatartás hozzáadása"; -"no_osm_account" = "Nem rendelkezik még felhasználói fiókkal az OpenStreetMapen?"; -"register_at_openstreetmap" = "Regisztráció az OpenStreetMap oldalon"; -"password_8_chars_min" = "Jelszó (legalább 8 karakter)"; -"invalid_username_or_password" = "Érvénytelen felhasználónév vagy jelszó."; -"login" = "Bejelentkezés"; -"login_osm" = "Jelentkezzen be az OpenStreetMap fiókjába"; -"forgot_password" = "Elfelejtette a jelszavát?"; -"osm_account" = "OSM-fiók"; -"logout" = "Kijelentkezés"; + +/* OpenStreetMap */ +"osm_explanation" = "Közösség által létrehozott OpenStreetMap adatok innen: %@. További információkat a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon találhat"; +"osm_more_about" = "További részletek az OpenStreetMap adatbázisról"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Hu:Névjegy"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profil"; +"osm_profile_promt" = "Hozzon létre egy fiókot az OpenStreetMapen, vagy jelentkezzen be, hogy közzétehesse térképszerkesztéseit a világ számára."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Jelentkezzen be az OpenStreetMap fiókjába"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Nem rendelkezik még felhasználói fiókkal az OpenStreetMapen?"; +"osm_profile_register" = "Regisztráció az OpenStreetMap oldalon"; +"osm_profile_verfied_changes" = "Jóváhagyott módosítások"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Utolsó frissítés"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Helyszín módosítása"; "message_invalid_feature_position" = "Itt nem található objektum"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Közösség által létrehozott OpenStreetMap adatok innen: %@. További információkat a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon találhat"; -"login_to_make_edits_visible" = "Hozzon létre egy fiókot az OpenStreetMapen, vagy jelentkezzen be, hogy közzétehesse térképszerkesztéseit a világ számára."; - /* Error dialog no space */ "migration_no_space_message" = "A letöltéshez több szabad tárhelyre van szükség. Törölje a szükségtelen adatokat."; "editor_sharing_title" = "Fejlesztettem a CoMaps térképeket"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/hu/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Hu:Névjegy"; - /* App Tip #00 */ "app_tip_00" = "Köszönjük, hogy használja a közösség által készített térképeinket!"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index 44c53108f..6ae989d3f 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "Tutup"; "add_opening_hours" = "Tambah jam kerja"; -"no_osm_account" = "Tidak ada akun di OpenStreetMap?"; -"register_at_openstreetmap" = "Daftar di OpenStreetMap"; -"password_8_chars_min" = "Kata Sandi (minimal 8 karakter)"; -"invalid_username_or_password" = "Nama pengguna dan Kata sandi tidak valid."; -"login" = "Masuk"; -"login_osm" = "Masuk ke OpenStreetMap"; -"forgot_password" = "Lupa kata sandi?"; -"osm_account" = "Akun OSM"; -"logout" = "Keluar"; + +/* OpenStreetMap */ +"osm_explanation" = "Data OpenStreetMap yang dibuat oleh komunitas pada tanggal %@. Pelajari lebih lanjut mengenai cara mengedit dan memperbarui peta di OpenStreetMap.org"; +"osm_more_about" = "Selengkapnya tentang OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Profil OpenStreetMap"; +"osm_profile_promt" = "Buat akun OpenStreetMap atau masuk untuk mempublikasikan hasil editan peta Anda ke seluruh dunia."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Masuk ke OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Tidak ada akun di OpenStreetMap?"; +"osm_profile_register" = "Daftar di OpenStreetMap"; +"osm_profile_verfied_changes" = "Perubahan Terverifikasi"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Pengunggahan terakhir"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Ubah lokasi"; "message_invalid_feature_position" = "Objek tidak dapat diletakkan di sini"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Data OpenStreetMap yang dibuat oleh komunitas pada tanggal %@. Pelajari lebih lanjut mengenai cara mengedit dan memperbarui peta di OpenStreetMap.org"; -"login_to_make_edits_visible" = "Buat akun OpenStreetMap atau masuk untuk mempublikasikan hasil editan peta Anda ke seluruh dunia."; - /* Error dialog no space */ "migration_no_space_message" = "Untuk mengunduh, Anda perlu ruang lebih banyak. Harap menghapus data yang tidak diperlukan."; "editor_sharing_title" = "Saya meningkatkan peta CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/id/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Terima kasih telah menggunakan peta buatan komunitas kami!"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index a67ba286a..6deec4827 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Chiude tra %@"; "closed" = "Chiuso"; "add_opening_hours" = "Aggiungi orari di apertura"; -"no_osm_account" = "Non hai un account OpenStreetMap?"; -"register_at_openstreetmap" = "Iscriviti a OpenStreetMap"; -"password_8_chars_min" = "Password (minimo 8 caratteri)"; -"invalid_username_or_password" = "Username o password non corretti."; -"login" = "Accedi"; -"login_osm" = "Accedi a OpenStreetMap"; -"forgot_password" = "Hai dimenticato la password?"; -"osm_account" = "Account OSM"; -"logout" = "Esci"; + +/* OpenStreetMap */ +"osm_explanation" = "Dati OpenStreetMap creati dalla comunità al %@. Per saperne di più su come modificare e aggiornare la mappa, visita OpenStreetMap.org"; +"osm_more_about" = "Informazioni su OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/IT:About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Profilo OpenStreetMap"; +"osm_profile_promt" = "Crea un account OpenStreetMap o effettua il login per pubblicare le tue modifiche alla mappa in tutto il mondo."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Accedi a OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Non hai un account OpenStreetMap?"; +"osm_profile_register" = "Iscriviti a OpenStreetMap"; +"osm_profile_verfied_changes" = "Modifiche approvate"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Ultimo caricamento"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Cambia posizione"; "message_invalid_feature_position" = "Nessun oggetto può essere posizionato qui"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Dati OpenStreetMap creati dalla comunità al %@. Per saperne di più su come modificare e aggiornare la mappa, visita OpenStreetMap.org"; -"login_to_make_edits_visible" = "Crea un account OpenStreetMap o effettua il login per pubblicare le tue modifiche alla mappa in tutto il mondo."; - /* Error dialog no space */ "migration_no_space_message" = "Hai bisogno di più spazio nella memoria per scaricare altri file. Per favore, elimina i dati non necessari."; "editor_sharing_title" = "Ho migliorato le mappe CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/it/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/IT:About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Grazie per utilizzare le nostre mappe create dalla comunità!"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index a7cfb3afc..8038457f9 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "あと %@ に閉店"; "closed" = "閉店"; "add_opening_hours" = "営業時間を追加"; -"no_osm_account" = "OpenStreetMapのアカウントをお持ちではないですか？"; -"register_at_openstreetmap" = "OpenStreetMapのアカウントを登録"; -"password_8_chars_min" = "パスワード(最低8文字)"; -"invalid_username_or_password" = "ユーザー名またはパスワードが無効です。"; -"login" = "ログイン"; -"login_osm" = "OpenStreetMapにログイン"; -"forgot_password" = "パスワードをお忘れですか？"; -"osm_account" = "OSMアカウント"; -"logout" = "ログアウト"; + +/* OpenStreetMap */ +"osm_explanation" = "コミュニティが作成した%@時点の OpenStreetMap のデータ。地図の編集や更新の方法については、OpenStreetMap.org を参照してください"; +"osm_more_about" = "OpenStreetMapについての詳細"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/JA:OpenStreetMap_について"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap プロフィール"; +"osm_profile_promt" = "OpenStreetMapのアカウントを作成するかログインして、あなたの地図編集を世界中に公開しましょう。"; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "OpenStreetMapにログイン"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "OpenStreetMapのアカウントをお持ちではないですか？"; +"osm_profile_register" = "OpenStreetMapのアカウントを登録"; +"osm_profile_verfied_changes" = "確認された変更"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "最終更新"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "位置を変更してください"; "message_invalid_feature_position" = "ここにはオブジェクトを配置できません"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "コミュニティが作成した%@時点の OpenStreetMap のデータ。地図の編集や更新の方法については、OpenStreetMap.org を参照してください"; -"login_to_make_edits_visible" = "OpenStreetMapのアカウントを作成するかログインして、あなたの地図編集を世界中に公開しましょう。"; - /* Error dialog no space */ "migration_no_space_message" = "ダウンロードするには空き容量が必要です。不要なデータを削除してください。"; "editor_sharing_title" = "CoMapsの地図を改善しました"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/JA:OpenStreetMap_について"; - /* App Tip #00 */ "app_tip_00" = "私たちのコミュニティが作った地図をご利用いただき、ありがとうございます！"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index 0a0e6c697..6d6a54a71 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "닫음"; "add_opening_hours" = "영업일 추가"; -"no_osm_account" = "OpenStreetMap에서 계정이 없습니까?"; -"register_at_openstreetmap" = "OpenStreetMap에 등록하세요"; -"password_8_chars_min" = "암호(최소 8자)"; -"invalid_username_or_password" = "잘못된 사용자 이름 또는 암호."; -"login" = "로그인"; -"login_osm" = "OpenStreetMap에 로그인"; -"forgot_password" = "암호를 잊으 셨나요?"; -"osm_account" = "OSM 계정"; -"logout" = "로그 아웃"; + +/* OpenStreetMap */ +"osm_explanation" = "커뮤니티에서 만든 오픈스트리트맵 데이터(%@ 기준). 지도를 편집하고 업데이트하는 방법에 대한 자세한 내용은 OpenStreetMap.org에서 확인하세요."; +"osm_more_about" = "OpenStreetMap 정보"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Ko:OpenStreetMap_소개"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap 프로필"; +"osm_profile_promt" = "OpenStreetMap 계정을 만들거나 로그인하여 지도 편집 내용을 전 세계에 공개하세요."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "OpenStreetMap에 로그인"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "OpenStreetMap에서 계정이 없습니까?"; +"osm_profile_register" = "OpenStreetMap에 등록하세요"; +"osm_profile_verfied_changes" = "변경사항 승인"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "마지막 업로드"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "위치 변경"; "message_invalid_feature_position" = "목적지를 이곳에서 찾을 수 없습니다"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "커뮤니티에서 만든 오픈스트리트맵 데이터(%@ 기준). 지도를 편집하고 업데이트하는 방법에 대한 자세한 내용은 OpenStreetMap.org에서 확인하세요."; -"login_to_make_edits_visible" = "OpenStreetMap 계정을 만들거나 로그인하여 지도 편집 내용을 전 세계에 공개하세요."; - /* Error dialog no space */ "migration_no_space_message" = "다운로드하려면, 더 많은 여유 공간이 필요합니다. 불필요한 데이터를 삭제하십시오."; "editor_sharing_title" = "나는 CoMaps 지도를 향상함"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Ko:OpenStreetMap_소개"; - /* App Tip #00 */ "app_tip_00" = "커뮤니티에서 제작한 지도를 이용해 주셔서 감사합니다!"; diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings index 509d60680..ba77309f7 100644 --- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Užsidaro už %@"; "closed" = "Uždaryta"; "add_opening_hours" = "Pridėti darbo valandas"; -"no_osm_account" = "Neturite „OpenStreetMap“ paskyros?"; -"register_at_openstreetmap" = "Registruotis „OpenStreetMap“"; -"password_8_chars_min" = "Slaptažodis (bent 8 simboliai)"; -"invalid_username_or_password" = "Netinkamas naudotojo vardas arba slaptažodis."; -"login" = "Prisijungti"; -"login_osm" = "Prisijungti prie „OpenStreetMap“"; -"forgot_password" = "Pamiršote slaptažodį?"; -"osm_account" = "OSM paskyra"; -"logout" = "Atsijungti"; + +/* OpenStreetMap */ +"osm_explanation" = "Bendruomenės surinkti „OpenStreetMap“ duomenys %@ dienai. Sužinokite, kaip redaguoti ir atnaujinti žemėlapį, apsilankydami OpenStreetMap.org svetainėje"; +"osm_more_about" = "Plačiau apie „OpenStreetMap“"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "„OpenStreetMap“ profilis"; +"osm_profile_promt" = "Susikurkite „OpenStreetMap“ paskyrą arba prisijunkite, kad galėtumėte skelbti savo žemėlapio pakeitimus pasauliui."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Prisijungti prie „OpenStreetMap“"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Neturite „OpenStreetMap“ paskyros?"; +"osm_profile_register" = "Registruotis „OpenStreetMap“"; +"osm_profile_verfied_changes" = "Patvirtinti pakeitimai"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Paskutinis įkėlimas"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Keisti vietą"; "message_invalid_feature_position" = "Čia negalima talpinti jokių objektų"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Bendruomenės surinkti „OpenStreetMap“ duomenys %@ dienai. Sužinokite, kaip redaguoti ir atnaujinti žemėlapį, apsilankydami OpenStreetMap.org svetainėje"; -"login_to_make_edits_visible" = "Susikurkite „OpenStreetMap“ paskyrą arba prisijunkite, kad galėtumėte skelbti savo žemėlapio pakeitimus pasauliui."; - /* Error dialog no space */ "migration_no_space_message" = "Žemėlapiams atsiųsti reikia daugiau laisvos vietos. Pašalinkite nereikalingus duomenis."; "editor_sharing_title" = "Aš patobulinau „CoMaps“ žemėlapius"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Dėkojame, kad naudojatės mūsų bendruomenės sukurtais žemėlapiais!"; diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings index 8f2e734ca..bb0648eac 100644 --- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Slēgts pēc %@"; "closed" = "Slēgts"; "add_opening_hours" = "Pievienot darba laiku"; -"no_osm_account" = "Vai jums nav „OpenStreetMap“ konta?"; -"register_at_openstreetmap" = "Reģistrējieties „OpenStreetMap“"; -"password_8_chars_min" = "Parole (vismaz 8 simboli)"; -"invalid_username_or_password" = "Nederīgs lietotājvārds vai parole."; -"login" = "Ierakstīties"; -"login_osm" = "Ierakstīties OpenStreetMap"; -"forgot_password" = "Vai aizmirsāt paroli?"; -"osm_account" = "OSM konts"; -"logout" = "Izrakstīties"; + +/* OpenStreetMap */ +"osm_explanation" = "Kopienas veidotie „OpenStreetMap“ dati, %@. Uzziniet vairāk par to, kā piedalīties kartes rediģēšanā un uzlabošanā vietnē „OpenStreetMap.org“."; +"osm_more_about" = "Vairāk par „OpenStreetMap“"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "„OpenStreetMap“ profils"; +"osm_profile_promt" = "Izveidojiet OpenStreetMap kontu vai piesakieties, lai publicētu savas kartes rediģējumus visā pasaulē."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Ierakstīties OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Vai jums nav „OpenStreetMap“ konta?"; +"osm_profile_register" = "Reģistrējieties „OpenStreetMap“"; +"osm_profile_verfied_changes" = "Apstiprinātas izmaiņas"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Pēdējo reizi augšupielādēja"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Mainīt atrašanās vietu"; "message_invalid_feature_position" = "Šeit objekti nevar atrasties"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Kopienas veidotie „OpenStreetMap“ dati, %@. Uzziniet vairāk par to, kā piedalīties kartes rediģēšanā un uzlabošanā vietnē „OpenStreetMap.org“."; -"login_to_make_edits_visible" = "Izveidojiet OpenStreetMap kontu vai piesakieties, lai publicētu savas kartes rediģējumus visā pasaulē."; - /* Error dialog no space */ "migration_no_space_message" = "Lejupielādei nepieciešams vairāk vietas. Izdzēsiet liekos datus."; "editor_sharing_title" = "Es uzlaboju „CoMaps“ kartes"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Paldies, ka izmantojat mūsu kopienas veidotās kartes!"; diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings index 1b2195b92..90d9cc20b 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings @@ -522,15 +522,28 @@ "closes_in" = "आणखी %@ मध्ये बंद होईल"; "closed" = "बंद"; "add_opening_hours" = "उघडण्याची वेळ जोड"; -"no_osm_account" = "OpenStreetMap खाते नाही?"; -"register_at_openstreetmap" = "OpenStreetMap वर नोंदणी करा"; -"password_8_chars_min" = "पासवर्ड (किमान ८ अक्षरे)"; -"invalid_username_or_password" = "अवैध वापरकर्तानाव किंवा पासवर्ड."; -"login" = "लॉग इन"; -"login_osm" = "OpenStreetMap मध्ये लॉगिन करा"; -"forgot_password" = "पासवर्ड विसरलात?"; -"osm_account" = "OSM खाते"; -"logout" = "लॉग आऊट"; + +/* OpenStreetMap */ +"osm_explanation" = "समुदाय-निर्मित OpenStreetMap डेटा %@ नुसार. OpenStreetMap.org वर नकाशा संपादित आणि अपडेट कसा करायचा याबद्दल अधिक जाणून घ्या"; +"osm_more_about" = "OpenStreetMap बद्दल अधिक"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap प्रोफाइल"; +"osm_profile_promt" = "एक OpenStreetMap खाते तयार करा किंवा तुमची नकाशा संपादने जगासमोर प्रकाशित करण्यासाठी लॉग इन करा."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "OpenStreetMap मध्ये लॉगिन करा"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "OpenStreetMap खाते नाही?"; +"osm_profile_register" = "OpenStreetMap वर नोंदणी करा"; +"osm_profile_verfied_changes" = "सत्यापित बदल"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "शेवटचे अपलोड"; @@ -579,10 +592,6 @@ "dialog_incorrect_feature_position" = "स्थान बदला"; "message_invalid_feature_position" = "इथे कोणतीही वस्तू ठेवू शकत नाही"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "समुदाय-निर्मित OpenStreetMap डेटा %@ नुसार. OpenStreetMap.org वर नकाशा संपादित आणि अपडेट कसा करायचा याबद्दल अधिक जाणून घ्या"; -"login_to_make_edits_visible" = "एक OpenStreetMap खाते तयार करा किंवा तुमची नकाशा संपादने जगासमोर प्रकाशित करण्यासाठी लॉग इन करा."; - /* Error dialog no space */ "migration_no_space_message" = "डाउनलोड करण्यासाठी तुम्हाला अधिक जागा आवश्यक आहे. कृपया अनावश्यक डेटा पुसून टाका."; "editor_sharing_title" = "मी CoMaps नकाशे सुधारित केले"; @@ -933,12 +942,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/mr/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "आमचे समुदाय-निर्मित नकाशे वापरल्याबद्दल धन्यवाद!"; diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings index 3ecace825..2f83eef78 100644 --- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "Magħluq"; "add_opening_hours" = "Add opening hours"; -"no_osm_account" = "M’ għandekx kont ta’ OpenStreetMap?"; -"register_at_openstreetmap" = "Irreġistra f’ OpenStreetMap"; -"password_8_chars_min" = "Password (8 characters minimum)"; -"invalid_username_or_password" = "Invalid username or password."; -"login" = "Illoggja"; -"login_osm" = "Illoggja f’ OpenStreetMap"; -"forgot_password" = "Insejt il-password tiegħek?"; -"osm_account" = "OSM Account"; -"logout" = "Oħroġ"; + +/* OpenStreetMap */ +"osm_explanation" = "Community-created OpenStreetMap data as of %@. Learn more about how to edit and update the map at OpenStreetMap.org"; +"osm_more_about" = "Aktar dwar OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Profil ta’ OpenStreetMap"; +"osm_profile_promt" = "Oħloq kont OpenStreetMap jew idħol biex tippubblika l-editjar tal-mapep tiegħek fid-dinja."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Illoggja f’ OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "M’ għandekx kont ta’ OpenStreetMap?"; +"osm_profile_register" = "Irreġistra f’ OpenStreetMap"; +"osm_profile_verfied_changes" = "Bidliet Ivverifikati"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Last upload"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Change location"; "message_invalid_feature_position" = "Ebda oġġett ma jista' jinstab hawn"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Community-created OpenStreetMap data as of %@. Learn more about how to edit and update the map at OpenStreetMap.org"; -"login_to_make_edits_visible" = "Oħloq kont OpenStreetMap jew idħol biex tippubblika l-editjar tal-mapep tiegħek fid-dinja."; - /* Error dialog no space */ "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data."; "editor_sharing_title" = "I improved the CoMaps maps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Grazzi talli użajtu l-mapep tagħna mibnija mill-komunita’!"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index 6bd9dd5b4..d3f56f632 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Stenger om %@"; "closed" = "Stengt"; "add_opening_hours" = "Legg til åpningstider"; -"no_osm_account" = "Har du ingen konto hos OpenStreetMap?"; -"register_at_openstreetmap" = "Registrer deg på OpenStreetMap"; -"password_8_chars_min" = "Passord (minimum 8 tegn)"; -"invalid_username_or_password" = "Ugyldig brukernavn eller passord."; -"login" = "Logg inn"; -"login_osm" = "Logg på OpenStreetMap"; -"forgot_password" = "Glemt passordet?"; -"osm_account" = "OSM-konto"; -"logout" = "Logg ut"; + +/* OpenStreetMap */ +"osm_explanation" = "Fellesskapsopprettede OpenStreetMap-data fra %@. Les mer om hvordan du redigerer og oppdaterer kartet på OpenStreetMap.org."; +"osm_more_about" = "Mer om OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/No:Hva_er_OpenStreetmap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profil"; +"osm_profile_promt" = "Opprett en OpenStreetMap-konto eller logg inn for å publisere kartredigeringene dine til hele verden."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Logg på OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Har du ingen konto hos OpenStreetMap?"; +"osm_profile_register" = "Registrer deg på OpenStreetMap"; +"osm_profile_verfied_changes" = "Bekreftede endringer"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Siste opplasting"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Endre plassering"; "message_invalid_feature_position" = "Et objekt kan ikke plasseres her"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Fellesskapsopprettede OpenStreetMap-data fra %@. Les mer om hvordan du redigerer og oppdaterer kartet på OpenStreetMap.org."; -"login_to_make_edits_visible" = "Opprett en OpenStreetMap-konto eller logg inn for å publisere kartredigeringene dine til hele verden."; - /* Error dialog no space */ "migration_no_space_message" = "Du må frigjøre mer lagringsplass for å laste ned. Slett unødvendig data."; "editor_sharing_title" = "Jeg har forbedret CoMaps kartene"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/No:Hva_er_OpenStreetmap"; - /* App Tip #00 */ "app_tip_00" = "Takk for at du bruker kartene vi har laget i fellesskap!"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index 2aaff0346..4166ce6e1 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Sluit over %@"; "closed" = "Gesloten"; "add_opening_hours" = "Voeg openingstijden toe"; -"no_osm_account" = "Geen account bij OpenStreetMap?"; -"register_at_openstreetmap" = "Registreer bij OpenStreetMap"; -"password_8_chars_min" = "Wachtwoord (minimaal 8 tekens)"; -"invalid_username_or_password" = "Ongeldige gebruikersnaam of ongeldig wachtwoord."; -"login" = "Log in"; -"login_osm" = "Log in bij OpenStreetMap"; -"forgot_password" = "Wachtwoord vergeten?"; -"osm_account" = "OSM-account"; -"logout" = "Log uit"; + +/* OpenStreetMap */ +"osm_explanation" = "Door de gemeenschap gemaakte OpenStreetMap-gegevens tot %@. Lees meer over hoe je de kaart kunt bewerken en bijwerken op OpenStreetMap.org"; +"osm_more_about" = "Meer over OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/NL:Wat_is_OpenStreetMap%3F"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap-profiel"; +"osm_profile_promt" = "Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Log in bij OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Geen account bij OpenStreetMap?"; +"osm_profile_register" = "Registreer bij OpenStreetMap"; +"osm_profile_verfied_changes" = "Gecontroleerde wijzigingen"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Laatste upload"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Wijzig locatie"; "message_invalid_feature_position" = "Hier kan geen object worden geplaatst"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Door de gemeenschap gemaakte OpenStreetMap-gegevens tot %@. Lees meer over hoe je de kaart kunt bewerken en bijwerken op OpenStreetMap.org"; -"login_to_make_edits_visible" = "Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren."; - /* Error dialog no space */ "migration_no_space_message" = "Om te kunnen downloaden, heb je meer ruimte nodig. Verwijder overbodige gegevens."; "editor_sharing_title" = "Ik heb de CoMaps-kaarten verbeterd"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/nl/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/NL:Wat_is_OpenStreetMap%3F"; - /* App Tip #00 */ "app_tip_00" = "Bedankt voor het gebruik van onze door de community gemaakte kaarten!"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index d2e2218a3..f6c73a214 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Zamknięcie za %@"; "closed" = "Zamknięte"; "add_opening_hours" = "Dodaj godziny otwarcia"; -"no_osm_account" = "Nie masz konta w OpenStreetMap?"; -"register_at_openstreetmap" = "Zarejestruj się w OpenStreetMap"; -"password_8_chars_min" = "Hasło (minimum 8 znaków)"; -"invalid_username_or_password" = "Nieprawidłowa nazwa użytkownika lub hasło."; -"login" = "Zaloguj się"; -"login_osm" = "Zaloguj się do OpenStreetMap"; -"forgot_password" = "Nie pamiętasz hasła?"; -"osm_account" = "Konto OSM"; -"logout" = "Wyloguj"; + +/* OpenStreetMap */ +"osm_explanation" = "Dane OpenStreetMap stworzone przez społeczność na dzień %@. Dowiedz się więcej o tym, jak edytować i aktualizować mapę na stronie OpenStreetMap.org"; +"osm_more_about" = "Więcej o OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Pl:Wstęp"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Profil OpenStreetMap"; +"osm_profile_promt" = "Proszę utworzyć konto OpenStreetMap lub zalogować się, aby opublikować swoje zmiany na mapie."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Zaloguj się do OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Nie masz konta w OpenStreetMap?"; +"osm_profile_register" = "Zarejestruj się w OpenStreetMap"; +"osm_profile_verfied_changes" = "Zmiany zweryfikowane"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Ostatnio przesłane"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Zmień lokalizację"; "message_invalid_feature_position" = "Obiekt nie może znajdować się tutaj"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Dane OpenStreetMap stworzone przez społeczność na dzień %@. Dowiedz się więcej o tym, jak edytować i aktualizować mapę na stronie OpenStreetMap.org"; -"login_to_make_edits_visible" = "Proszę utworzyć konto OpenStreetMap lub zalogować się, aby opublikować swoje zmiany na mapie."; - /* Error dialog no space */ "migration_no_space_message" = "Aby pobrać, potrzebujesz więcej miejsca. Usuń niepotrzebne dane."; "editor_sharing_title" = "Dokonałem poprawek map na CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/pl/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Pl:Wstęp"; - /* App Tip #00 */ "app_tip_00" = "Dziękujemy za korzystanie z naszych map stworzonych przez społeczność!"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index 09a1bfbd0..436634084 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Fecha em %@"; "closed" = "Fechado"; "add_opening_hours" = "Adicionar horário de funcionamento"; -"no_osm_account" = "Sem conta no OpenStreetMap?"; -"register_at_openstreetmap" = "Abra uma conta no OpenStreetMap"; -"password_8_chars_min" = "Senha (mínimo de 8 caracteres)"; -"invalid_username_or_password" = "Nome de usuário ou senha inválida."; -"login" = "Login"; -"login_osm" = "Entrar no OpenStreetMap"; -"forgot_password" = "Esqueceu sua senha?"; -"osm_account" = "Conta OSM"; -"logout" = "Encerrar sessão"; + +/* OpenStreetMap */ +"osm_explanation" = "Dados do OpenStreetMap criados pela comunidade até %@. Saiba mais sobre como editar e atualizar o mapa em OpenStreetMap.org"; +"osm_more_about" = "Mais sobre OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Conta OpenStreetMap"; +"osm_profile_promt" = "Crie uma conta no OpenStreetMap ou faça login para publicar suas edições de mapas para o mundo."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Entrar no OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Sem conta no OpenStreetMap?"; +"osm_profile_register" = "Abra uma conta no OpenStreetMap"; +"osm_profile_verfied_changes" = "Alterações verificadas"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Último upload"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Mudar local"; "message_invalid_feature_position" = "Nenhum objeto pode ser posicionado aqui"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Dados do OpenStreetMap criados pela comunidade até %@. Saiba mais sobre como editar e atualizar o mapa em OpenStreetMap.org"; -"login_to_make_edits_visible" = "Crie uma conta no OpenStreetMap ou faça login para publicar suas edições de mapas para o mundo."; - /* Error dialog no space */ "migration_no_space_message" = "É necessário mais espaço para baixar. Por favor, elimine dados desnecessários."; "editor_sharing_title" = "Eu melhorei os mapas do CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/pt-BR/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Obrigado por você usar nossos mapas criados pela comunidade!"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index 19c6e573b..931a92b49 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Fecha em %@"; "closed" = "Fechado"; "add_opening_hours" = "Adicionar horário de funcionamento"; -"no_osm_account" = "Não tem uma conta no OpenStreetMap?"; -"register_at_openstreetmap" = "Crie uma conta no OpenStreetMap"; -"password_8_chars_min" = "Palavra-chave (mínimo de 8 caracteres)"; -"invalid_username_or_password" = "Nome de utilizador ou palavra-chave inválida."; -"login" = "Iniciar sessão"; -"login_osm" = "Entrar no OpenStreetMap"; -"forgot_password" = "Esqueceu-se da palavra-chave?"; -"osm_account" = "Conta OSM"; -"logout" = "Terminar sessão"; + +/* OpenStreetMap */ +"osm_explanation" = "Dados do OpenStreetMap criados pela comunidade até %@. Sabe mais sobre como editar e atualizar o mapa em OpenStreetMap.org"; +"osm_more_about" = "Mais sobre o OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Conta OpenStreetMap"; +"osm_profile_promt" = "Crie uma conta OpenStreetMap ou inicie sessão para publicar as suas edições de mapas para o mundo."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Entrar no OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Não tem uma conta no OpenStreetMap?"; +"osm_profile_register" = "Crie uma conta no OpenStreetMap"; +"osm_profile_verfied_changes" = "Alterações verificadas"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Último envio"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Mudar local"; "message_invalid_feature_position" = "Nenhum objeto pode ser posicionado aqui"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Dados do OpenStreetMap criados pela comunidade até %@. Sabe mais sobre como editar e atualizar o mapa em OpenStreetMap.org"; -"login_to_make_edits_visible" = "Crie uma conta OpenStreetMap ou inicie sessão para publicar as suas edições de mapas para o mundo."; - /* Error dialog no space */ "migration_no_space_message" = "Para descarregar, é necessário mais espaço. Por favor, elimine os dados desnecessários."; "editor_sharing_title" = "Melhorei os mapas do CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/pt/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Obrigado por utilizar os nossos mapas construídos pela comunidade!"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index 38c1624ae..d4b785c31 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Închide în %@"; "closed" = "Închis"; "add_opening_hours" = "Adaugă orele de funcționare"; -"no_osm_account" = "Nu ai un cont OpenStreetMap?"; -"register_at_openstreetmap" = "Înregistrați-vă la OpenStreetMap"; -"password_8_chars_min" = "Parola (minim 8 caractere)"; -"invalid_username_or_password" = "Nume de utilizator sau parolă incorecte."; -"login" = "Autentificare"; -"login_osm" = "Conectați-vă la OpenStreetMap"; -"forgot_password" = "Ai uitat parola?"; -"osm_account" = "Cont OSM"; -"logout" = "Deconectare"; + +/* OpenStreetMap */ +"osm_explanation" = "Date OpenStreetMap create de comunitate la data de %@. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org"; +"osm_more_about" = "Mai multe despre OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Profil OpenStreetMap"; +"osm_profile_promt" = "Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Conectați-vă la OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Nu ai un cont OpenStreetMap?"; +"osm_profile_register" = "Înregistrați-vă la OpenStreetMap"; +"osm_profile_verfied_changes" = "Modificări confirmate"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Ultima încărcare"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Schimbă poziția"; "message_invalid_feature_position" = "Niciun obiect nu poate fi poziționat aici"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Date OpenStreetMap create de comunitate la data de %@. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org"; -"login_to_make_edits_visible" = "Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume."; - /* Error dialog no space */ "migration_no_space_message" = "Ai nevoie de mai mult spațiu pentru a descărca. Șterge datele care nu sunt necesare."; "editor_sharing_title" = "Am îmbunătățit hărțile CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Vă mulțumim că utilizați hărțile create de comunitatea noastră!"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index cc0bb1d49..823531fa9 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Закроется через %@"; "closed" = "Закрыто"; "add_opening_hours" = "Добавить время работы"; -"no_osm_account" = "Не зарегистрированы в OpenStreetMap?"; -"register_at_openstreetmap" = "Зарегистрироваться"; -"password_8_chars_min" = "Пароль (минимум 8 символов)"; -"invalid_username_or_password" = "Неверное имя пользователя или пароль."; -"login" = "Войти"; -"login_osm" = "Войти в OpenStreetMap"; -"forgot_password" = "Забыли пароль?"; -"osm_account" = "OSM Аккаунт"; -"logout" = "Выйти"; + +/* OpenStreetMap */ +"osm_explanation" = "Созданные сообществом данные OpenStreetMap по состоянию на %@. Узнайте больше о том, как редактировать и обновлять карту, на сайте OpenStreetMap.org"; +"osm_more_about" = "Подробнее об OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/RU:О_проекте"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Профиль OpenStreetMap"; +"osm_profile_promt" = "Создайте учетную запись OpenStreetMap или войдите в нее, чтобы опубликовать свои правки на карте для всего мира."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Войти в OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Не зарегистрированы в OpenStreetMap?"; +"osm_profile_register" = "Зарегистрироваться"; +"osm_profile_verfied_changes" = "Учтённые правки"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Последняя отправка"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Измените местоположение"; "message_invalid_feature_position" = "Объект не может находиться в этом месте"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Созданные сообществом данные OpenStreetMap по состоянию на %@. Узнайте больше о том, как редактировать и обновлять карту, на сайте OpenStreetMap.org"; -"login_to_make_edits_visible" = "Создайте учетную запись OpenStreetMap или войдите в нее, чтобы опубликовать свои правки на карте для всего мира."; - /* Error dialog no space */ "migration_no_space_message" = "Для загрузки требуется больше свободного места. Пожалуйста, удалите ненужные данные."; "editor_sharing_title" = "Я улучшил карты CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/ru/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/RU:О_проекте"; - /* App Tip #00 */ "app_tip_00" = "Спасибо, что пользуетесь нашими картами, созданными сообществом!"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index 59ae689ba..113efcb9b 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Zatvoria o %@"; "closed" = "Zatvorené"; "add_opening_hours" = "Pridať otváracie hodiny"; -"no_osm_account" = "Nemáte účet v OpenStreetMap?"; -"register_at_openstreetmap" = "Zaregistrujte sa na OpenStreetMap"; -"password_8_chars_min" = "Heslo (minimálne 8 znakov)"; -"invalid_username_or_password" = "Nesprávne používateľské meno alebo heslo."; -"login" = "Prihlásiť sa"; -"login_osm" = "Prihláste sa do OpenStreetMap"; -"forgot_password" = "Zabudli ste heslo?"; -"osm_account" = "OSM účet"; -"logout" = "Odhlásiť sa"; + +/* OpenStreetMap */ +"osm_explanation" = "Údaje OpenStreetMap vytvorené komunitou od %@. Viac informácií o tom, ako upravovať a aktualizovať mapu, nájdete na stránke OpenStreetMap.org"; +"osm_more_about" = "Viac o OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Profil OpenStreetMap"; +"osm_profile_promt" = "Vytvorte si účet OpenStreetMap alebo sa prihláste a zverejnite svoje úpravy mapy na celom svete."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Prihláste sa do OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Nemáte účet v OpenStreetMap?"; +"osm_profile_register" = "Zaregistrujte sa na OpenStreetMap"; +"osm_profile_verfied_changes" = "Overené zmeny"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Posledné nahrávanie"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Zmeniť polohu"; "message_invalid_feature_position" = "Objekt sa tu nedá umiestniť"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Údaje OpenStreetMap vytvorené komunitou od %@. Viac informácií o tom, ako upravovať a aktualizovať mapu, nájdete na stránke OpenStreetMap.org"; -"login_to_make_edits_visible" = "Vytvorte si účet OpenStreetMap alebo sa prihláste a zverejnite svoje úpravy mapy na celom svete."; - /* Error dialog no space */ "migration_no_space_message" = "Ak chcete pokračovať v sťahovaní, musíte uvoľniť viac miesta na ukladacom priestore. Prosím, odstráňte prebytočné dáta."; "editor_sharing_title" = "Vďaka mne sú mapy na CoMaps lepšie"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Ďakujeme, že používate naše mapy vytvorené komunitou!"; diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings index 04cd0bd65..19e9ae475 100644 --- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Затвара се за %@"; "closed" = "Затворено"; "add_opening_hours" = "Додај радно време"; -"no_osm_account" = "Немате OpenStreetMap налог?"; -"register_at_openstreetmap" = "Региструјте се на OpenStreetMap-у"; -"password_8_chars_min" = "Лозинка (минимум 8 знакова)"; -"invalid_username_or_password" = "Неисправно корисничко име или лозинка."; -"login" = "Пријавите се"; -"login_osm" = "Пријава на OpenStreetMap"; -"forgot_password" = "Заборављена лозинка?"; -"osm_account" = "OSM налог"; -"logout" = "Одјави се"; + +/* OpenStreetMap */ +"osm_explanation" = "Подаци са OpenStreetMap-а које је креирала заједница до %@. Научите више о томе како да мењате и ажурирате мапу на OpenStreetMap.org"; +"osm_more_about" = "Више о OpenStreetMap-у"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap профил"; +"osm_profile_promt" = "Пријавите се на openstreetmap.org да бисте објавили ваше промене остатку света."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Пријава на OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Немате OpenStreetMap налог?"; +"osm_profile_register" = "Региструјте се на OpenStreetMap-у"; +"osm_profile_verfied_changes" = "Верификоване промене"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Последње слање"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Промените локацију"; "message_invalid_feature_position" = "Објекат не може бити на овом месту"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Подаци са OpenStreetMap-а које је креирала заједница до %@. Научите више о томе како да мењате и ажурирате мапу на OpenStreetMap.org"; -"login_to_make_edits_visible" = "Пријавите се на openstreetmap.org да бисте објавили ваше промене остатку света."; - /* Error dialog no space */ "migration_no_space_message" = "Да бисте завршили преузимање потребно је више слободног простора. Молим Вас да обришете непотребне податке."; "editor_sharing_title" = "Ја сам поправио/ла мапе у CoMaps-у"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Хвала што користите мапе које је направила заједница!"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 221573155..620e4dbc5 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "Stängt"; "add_opening_hours" = "Lägg till öppettider"; -"no_osm_account" = "Inget konto hos OpenStreetMap?"; -"register_at_openstreetmap" = "Registrera dig på OpenStreetMap"; -"password_8_chars_min" = "Lösenord (minst 8 tecken)"; -"invalid_username_or_password" = "Fel användarnamn eller lösenord."; -"login" = "Logga in"; -"login_osm" = "Logga in på OpenStreetMap"; -"forgot_password" = "Glömt lösenord?"; -"osm_account" = "OSM-konto"; -"logout" = "Logga ut"; + +/* OpenStreetMap */ +"osm_explanation" = "Community-skapade OpenStreetMap-data från och med %@. Läs mer om hur du redigerar och uppdaterar kartan på OpenStreetMap.org"; +"osm_more_about" = "Mer om OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Sv:Om_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profil"; +"osm_profile_promt" = "Skapa ett OpenStreetMap-konto eller logga in för att publicera dina kartredigeringar till hela världen."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Logga in på OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Inget konto hos OpenStreetMap?"; +"osm_profile_register" = "Registrera dig på OpenStreetMap"; +"osm_profile_verfied_changes" = "Verifierade ändringar"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Senaste uppladdning"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Ändra plats"; "message_invalid_feature_position" = "Ett objekt kan inte placeras här"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Community-skapade OpenStreetMap-data från och med %@. Läs mer om hur du redigerar och uppdaterar kartan på OpenStreetMap.org"; -"login_to_make_edits_visible" = "Skapa ett OpenStreetMap-konto eller logga in för att publicera dina kartredigeringar till hela världen."; - /* Error dialog no space */ "migration_no_space_message" = "Du behöver mer utrymme för att ladda ned. Radera onödig data."; "editor_sharing_title" = "Jag förbättrade kartorna åt CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/sv/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Sv:Om_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Tack för att du använder våra community-byggda kartor!"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 1148cc519..cf8e129e9 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "Closed"; "add_opening_hours" = "Add opening hours"; -"no_osm_account" = "Don't have an OpenStreetMap account?"; -"register_at_openstreetmap" = "Register at OpenStreetMap"; -"password_8_chars_min" = "Password (8 characters minimum)"; -"invalid_username_or_password" = "Invalid username or password."; -"login" = "Login"; -"login_osm" = "Ingia kwa OpenStreetMap"; -"forgot_password" = "Forgot your password?"; -"osm_account" = "OSM Account"; -"logout" = "Log Out"; + +/* OpenStreetMap */ +"osm_explanation" = "Data ya OpenStreetMap iliyoundwa na jumuiya kufikia %@. Pata maelezo zaidi kuhusu jinsi ya kuhariri na kusasisha ramani katika OpenStreetMap.org"; +"osm_more_about" = "More about OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profile"; +"osm_profile_promt" = "Fungua akaunti ya OpenStreetMap au ingia ili kuchapisha mabadiliko yako ya ramani kwa ulimwengu."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Ingia kwa OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Don't have an OpenStreetMap account?"; +"osm_profile_register" = "Register at OpenStreetMap"; +"osm_profile_verfied_changes" = "Verified Changes"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Last upload"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Change location"; "message_invalid_feature_position" = "No object can be located here"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Data ya OpenStreetMap iliyoundwa na jumuiya kufikia %@. Pata maelezo zaidi kuhusu jinsi ya kuhariri na kusasisha ramani katika OpenStreetMap.org"; -"login_to_make_edits_visible" = "Fungua akaunti ya OpenStreetMap au ingia ili kuchapisha mabadiliko yako ya ramani kwa ulimwengu."; - /* Error dialog no space */ "migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data."; "editor_sharing_title" = "I improved the CoMaps maps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Asante kwa kutumia ramani zetu zilizojengwa na jumuiya!"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index dc82b0e5b..f0ad33f57 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "ปิด"; "add_opening_hours" = "เพิ่มชั่วโมงทำการ"; -"no_osm_account" = "ไม่มีบัญชีใน OpenStreetMap?"; -"register_at_openstreetmap" = "ลงทะเบียนที่ OpenStreetMap"; -"password_8_chars_min" = "รหัสผ่าน (อย่างน้อย 8 ตัวอักษร)"; -"invalid_username_or_password" = "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"; -"login" = "ล็อกอิน"; -"login_osm" = "เข้าสู่ระบบ OpenStreetMap"; -"forgot_password" = "ลืมรหัสผ่าน?"; -"osm_account" = "บัญชี OSM"; -"logout" = "ออกจากระบบ"; + +/* OpenStreetMap */ +"osm_explanation" = "ข้อมูล OpenStreetMap ที่สร้างโดยชุมชน ณ %@ เรียนรู้เพิ่มเติมเกี่ยวกับวิธีแก้ไขและอัปเดตแผนที่ได้ที่ OpenStreetMap.org"; +"osm_more_about" = "ข้อมูลเพิ่มเติมเกี่ยวกับ OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Th:เกี่ยวกับ_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "โปรไฟล์ OpenStreetMap"; +"osm_profile_promt" = "สร้างบัญชี OpenStreetMap หรือเข้าสู่ระบบเพื่อเผยแพร่การแก้ไขแผนที่ของคุณไปทั่วโลก"; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "เข้าสู่ระบบ OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "ไม่มีบัญชีใน OpenStreetMap?"; +"osm_profile_register" = "ลงทะเบียนที่ OpenStreetMap"; +"osm_profile_verfied_changes" = "การเปลี่ยนแปลงที่อนุมัติแล้ว"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "อัปโหลดครั้งสุดท้าย"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "เปลี่ยนสถานที่ตั้ง"; "message_invalid_feature_position" = "ไม่สามารถตั้งวัตถุได้ที่นี่"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "ข้อมูล OpenStreetMap ที่สร้างโดยชุมชน ณ %@ เรียนรู้เพิ่มเติมเกี่ยวกับวิธีแก้ไขและอัปเดตแผนที่ได้ที่ OpenStreetMap.org"; -"login_to_make_edits_visible" = "สร้างบัญชี OpenStreetMap หรือเข้าสู่ระบบเพื่อเผยแพร่การแก้ไขแผนที่ของคุณไปทั่วโลก"; - /* Error dialog no space */ "migration_no_space_message" = "ในการดาวน์โหลด คุณต้องมีพื้นที่มากขึ้น กรุณาลบเนื้อหาที่ไม่จำเป็นออกไป"; "editor_sharing_title" = "ฉันได้ปรับปรุงแผนที่ CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Th:เกี่ยวกับ_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "ขอขอบคุณที่ใช้แผนที่ที่สร้างโดยชุมชนของเรา!"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index d400c2326..ddf05498f 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "%@ sonra kapanıyor"; "closed" = "Kapalı"; "add_opening_hours" = "Açılış saatlerini ekle"; -"no_osm_account" = "OpenStreetMap hesabınız yok mu?"; -"register_at_openstreetmap" = "OpenStreetMap'e kaydol"; -"password_8_chars_min" = "Parola (en az 8 karakter)"; -"invalid_username_or_password" = "Geçersiz kullanıcı adı ya da parola."; -"login" = "Oturum aç"; -"login_osm" = "OpenStreetMap'e giriş yap"; -"forgot_password" = "Şifrenizi mi unuttunuz?"; -"osm_account" = "OSM Hesabı"; -"logout" = "Oturumu kapat"; + +/* OpenStreetMap */ +"osm_explanation" = "%@ tarihine ait topluluk tarafından oluşturulmuş OpenStreetMap verilerini kullanıyorsunuz. OpenStreetMap.org adresinden haritayı nasıl düzenleyebileceğinizle ilgili bilgi edinebilirsiniz"; +"osm_more_about" = "OpenStreetMap ile ilgili ek bilgi"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Tr:About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap profili"; +"osm_profile_promt" = "Harita düzenlemelerinizi herkese ulaştırmak için OpenStreetMap hesabı oluşturun veya oturum açın."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "OpenStreetMap'e giriş yap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "OpenStreetMap hesabınız yok mu?"; +"osm_profile_register" = "OpenStreetMap'e kaydol"; +"osm_profile_verfied_changes" = "Doğrulanan Düzenleme"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Son yükleme"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Konumu değiştir"; "message_invalid_feature_position" = "Buraya bir nesne konumlandırılamıyor"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "%@ tarihine ait topluluk tarafından oluşturulmuş OpenStreetMap verilerini kullanıyorsunuz. OpenStreetMap.org adresinden haritayı nasıl düzenleyebileceğinizle ilgili bilgi edinebilirsiniz"; -"login_to_make_edits_visible" = "Harita düzenlemelerinizi herkese ulaştırmak için OpenStreetMap hesabı oluşturun veya oturum açın."; - /* Error dialog no space */ "migration_no_space_message" = "İndirmek için daha çok alan gerekiyor. Lütfen gereksiz verileri silin."; "editor_sharing_title" = "CoMaps'in haritasını düzenledim"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/tr/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Tr:About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Topluluk tarafından oluşturulan haritalarımızı kullandığınız için teşekkür ederiz!"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index 783094e5f..3a3b31a32 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Зачиняється через %@"; "closed" = "Зачинено"; "add_opening_hours" = "Додати години роботи"; -"no_osm_account" = "Не зареєстровані в OpenStreetMap?"; -"register_at_openstreetmap" = "Зареєструватися"; -"password_8_chars_min" = "Пароль (мінімум 8 символів)"; -"invalid_username_or_password" = "Невірне ім'я користувача або пароль."; -"login" = "Увійти"; -"login_osm" = "Увійдіть до OpenStreetMap"; -"forgot_password" = "Забули пароль?"; -"osm_account" = "Обліковий запис OSM"; -"logout" = "Вийти"; + +/* OpenStreetMap */ +"osm_explanation" = "Дані OpenStreetMap, створені спільнотою, станом на %@. Дізнайтеся більше про те, як редагувати та оновлювати мапу на OpenStreetMap.org"; +"osm_more_about" = "Більше про OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Uk:Про_проект"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Профіль OpenStreetMap"; +"osm_profile_promt" = "Створіть обліковий запис OpenStreetMap або увійдіть до нього, щоб опублікувати свої редагування мапи для всього світу."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Увійдіть до OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Не зареєстровані в OpenStreetMap?"; +"osm_profile_register" = "Зареєструватися"; +"osm_profile_verfied_changes" = "Виправлення, що ураховані"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Остання вiдправка"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Змініть розташування"; "message_invalid_feature_position" = "Об'єкт не може перебувати в цьому місцезнаходженні"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Дані OpenStreetMap, створені спільнотою, станом на %@. Дізнайтеся більше про те, як редагувати та оновлювати мапу на OpenStreetMap.org"; -"login_to_make_edits_visible" = "Створіть обліковий запис OpenStreetMap або увійдіть до нього, щоб опублікувати свої редагування мапи для всього світу."; - /* Error dialog no space */ "migration_no_space_message" = "Для завантаження потрібно більше вільного місця. Будь ласка, видаліть непотрібні дані."; "editor_sharing_title" = "Я покращив мапи CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/uk/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Uk:Про_проект"; - /* App Tip #00 */ "app_tip_00" = "Дякуємо, що користуєтесь нашими мапами, створеними спільнотою!"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index d9247b88f..2ab850e2e 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "Closes in %@"; "closed" = "Đã đóng"; "add_opening_hours" = "Thêm giờ làm việc"; -"no_osm_account" = "Bạn chưa có tài khoản tại OpenStreetMap ư?"; -"register_at_openstreetmap" = "Đăng ký tại OpenStreetMap"; -"password_8_chars_min" = "Mật khẩu (tối thiểu 8 ký tự)"; -"invalid_username_or_password" = "Sai Tên người dùng hoặc Mật khẩu."; -"login" = "Đăng nhập"; -"login_osm" = "Đăng nhập vào OpenStreetMap"; -"forgot_password" = "Quên mật khẩu?"; -"osm_account" = "Tài khoản OSM"; -"logout" = "Đăng xuất"; + +/* OpenStreetMap */ +"osm_explanation" = "Dữ liệu OpenStreetMap do cộng đồng tạo ra kể từ %@. Tìm hiểu thêm về cách chỉnh sửa và cập nhật bản đồ tại OpenStreetMap.org"; +"osm_more_about" = "Thông tin bổ sung về OpenStreetMap"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "Hồ sơ OpenStreetMap"; +"osm_profile_promt" = "Tạo tài khoản OpenStreetMap hoặc đăng nhập để xuất bản các chỉnh sửa bản đồ của bạn với thế giới."; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "Đăng nhập vào OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "Bạn chưa có tài khoản tại OpenStreetMap ư?"; +"osm_profile_register" = "Đăng ký tại OpenStreetMap"; +"osm_profile_verfied_changes" = "Các thay đổi đã được xác thực"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "Tải lên mới nhất"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "Thay đổi địa điểm"; "message_invalid_feature_position" = "Một đối tượng không thể đặt được ở đây"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "Dữ liệu OpenStreetMap do cộng đồng tạo ra kể từ %@. Tìm hiểu thêm về cách chỉnh sửa và cập nhật bản đồ tại OpenStreetMap.org"; -"login_to_make_edits_visible" = "Tạo tài khoản OpenStreetMap hoặc đăng nhập để xuất bản các chỉnh sửa bản đồ của bạn với thế giới."; - /* Error dialog no space */ "migration_no_space_message" = "Để tải xuống, bạn cần thêm dung lượng. Xin xóa mọi dữ liệu không cần thiết."; "editor_sharing_title" = "Tôi đã cải thiện các bản đồ CoMaps"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "Cảm ơn bạn đã sử dụng bản đồ do cộng đồng xây dựng của chúng tôi!"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index 5b9bbd9a1..ad65c6289 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "将于 %@ 后不营业"; "closed" = "已停止营业"; "add_opening_hours" = "添加营业时间"; -"no_osm_account" = "没有 OpenStreetMap 账号吗？"; -"register_at_openstreetmap" = "注册 OpenStreetMap 账号"; -"password_8_chars_min" = "密码（至少 8 个字符）"; -"invalid_username_or_password" = "无效的用户名或密码。"; -"login" = "登录"; -"login_osm" = "登录 OpenStreetMap"; -"forgot_password" = "忘记密码？"; -"osm_account" = "OSM 账号"; -"logout" = "登出"; + +/* OpenStreetMap */ +"osm_explanation" = "截至 %@ 的社区创建的 OpenStreetMap 数据。请访问 OpenStreetMap.org 详细了解如何编辑和更新地图"; +"osm_more_about" = "关于 OpenStreetMap 的更多信息"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Zh-hans:关于"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap 个人资料"; +"osm_profile_promt" = "创建 OpenStreetMap 账号或登录，向全世界发布您编辑的地图。"; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "登录 OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "没有 OpenStreetMap 账号吗？"; +"osm_profile_register" = "注册 OpenStreetMap 账号"; +"osm_profile_verfied_changes" = "已验证的更改"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "最后上传"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "更改位置"; "message_invalid_feature_position" = "地点不能放置在这里"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "截至 %@ 的社区创建的 OpenStreetMap 数据。请访问 OpenStreetMap.org 详细了解如何编辑和更新地图"; -"login_to_make_edits_visible" = "创建 OpenStreetMap 账号或登录，向全世界发布您编辑的地图。"; - /* Error dialog no space */ "migration_no_space_message" = "为了下载，您需要更多的存储空间。请删除不必要的文件。"; "editor_sharing_title" = "我改进了 CoMaps 地图"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/zh-Hans/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Zh-hans:关于"; - /* App Tip #00 */ "app_tip_00" = "感谢您使用我们社区构建的地图！"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index ef73421c5..210613e3c 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -525,15 +525,28 @@ "closes_in" = "將於 %@ 後歇業"; "closed" = "已停止營業"; "add_opening_hours" = "新增營業時間"; -"no_osm_account" = "沒有 OpenStreetMap 帳戶嗎？"; -"register_at_openstreetmap" = "註冊 OpenStreetMap 帳戶"; -"password_8_chars_min" = "密碼（至少 8 個字符）"; -"invalid_username_or_password" = "無效的使用者名稱或密碼。"; -"login" = "登入"; -"login_osm" = "登錄 OpenStreetMap"; -"forgot_password" = "忘記密碼？"; -"osm_account" = "OSM 帳號"; -"logout" = "登出"; + +/* OpenStreetMap */ +"osm_explanation" = "截至 %@ 的社群創建的 OpenStreetMap 資料。請訪問 OpenStreetMap.org 以了解有關如何編輯和更新地圖的更多資訊"; +"osm_more_about" = "關於 OpenStreetMap 的更多資訊"; +"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Zh-hant:關於OpenStreetMap"; + +/* OpenStreetMap Profile */ +"osm_profile" = "OpenStreetMap 個人資料"; +"osm_profile_promt" = "建立 OpenStreetMap 帳戶或登入以向全世界發布您的地圖編輯。"; +"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!"; +"osm_profile_login" = "登錄 OpenStreetMap"; +"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app"; +"osm_profile_reauthorize" = "Reconnect with OpenStreetMap"; +"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app"; +"osm_profile_remove" = "Remove OpenStreetMap account"; +"osm_profile_register_promt" = "沒有 OpenStreetMap 帳戶嗎？"; +"osm_profile_register" = "註冊 OpenStreetMap 帳戶"; +"osm_profile_verfied_changes" = "已驗證的變更"; +"osm_profile_view_edit_history" = "View Edit History"; +"osm_profile_view_notes" = "View Notes"; +"osm_profile_logout" = "Logout of OpenStreetMap account"; +"osm_profile_delete" = "Delete OpenStreetMap account"; /* Information text: "Last upload 11.01.2016" */ "last_upload" = "最後上傳"; @@ -582,10 +595,6 @@ "dialog_incorrect_feature_position" = "更改位置"; "message_invalid_feature_position" = "地點無法放置在這裡"; -/* Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. */ -"osm_presentation" = "截至 %@ 的社群創建的 OpenStreetMap 資料。請訪問 OpenStreetMap.org 以了解有關如何編輯和更新地圖的更多資訊"; -"login_to_make_edits_visible" = "建立 OpenStreetMap 帳戶或登入以向全世界發布您的地圖編輯。"; - /* Error dialog no space */ "migration_no_space_message" = "為了下載，您需要更多的儲存空間。請刪除不必要的檔案。"; "editor_sharing_title" = "我改進了 CoMaps 地圖"; @@ -936,12 +945,9 @@ /* Instagram account url for the "?" About page */ "instagram_url" = "https://www.instagram.com/comaps.app/"; -/* Translated CoMaps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */ +/* Translated CoMaps site */ "translated_om_site_url" = "https://www.comaps.app/zh-Hant/"; -/* Link to OSM wiki for Editor, Profile and About pages */ -"osm_wiki_about_url" = "https://wiki.openstreetmap.org/wiki/Zh-hant:關於OpenStreetMap"; - /* App Tip #00 */ "app_tip_00" = "感謝您使用我們社區構建的地圖！"; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 4317cfb37..8da5cd473 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -10,7 +10,12 @@ 039371B62C5B68CD00708377 /* UIFont+monospaced.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039371B52C5B68CD00708377 /* UIFont+monospaced.swift */; }; 165953742CB1D85500CFED7C /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 165953732CB1D83700CFED7C /* fonts */; }; 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; }; - 275830E92E0ACABA00EF4883 /* Bridging.mm in Sources */ = {isa = PBXBuildFile; fileRef = 275830E82E0ACAB800EF4883 /* Bridging.mm */; }; + 270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 270C9C252E16AB6300ABA688 /* Profile.swift */; }; + 272F1F392E0EE09000FA52EF /* ExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */; }; + 272F1F3B2E0EE0A300FA52EF /* NoExistingProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */; }; + 272F1F3D2E0EE0C800FA52EF /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */; }; + 272F1F462E0EEF9400FA52EF /* SafariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 272F1F452E0EEF8B00FA52EF /* SafariView.swift */; }; + 2765D1D02E13F9C20005CA2B /* BridgeControllers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2765D1CD2E13F9BC0005CA2B /* BridgeControllers.swift */; }; 3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; }; 33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; }; 337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */; }; @@ -42,13 +47,11 @@ 340708651F2905A500029ECC /* NavigationInfoArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708631F2905A500029ECC /* NavigationInfoArea.swift */; }; 340708781F2B5D6C00029ECC /* DimBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340708761F2B5D6C00029ECC /* DimBackground.swift */; }; 340B33C61F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340B33C41F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm */; }; - 340E1EEC1E2F614400CE49BF /* Authorization.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE41E2F614400CE49BF /* Authorization.storyboard */; }; 340E1EEF1E2F614400CE49BF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE51E2F614400CE49BF /* LaunchScreen.storyboard */; }; 340E1EF21E2F614400CE49BF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE61E2F614400CE49BF /* Main.storyboard */; }; 340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EE81E2F614400CE49BF /* Settings.storyboard */; }; 340E1EFB1E2F614400CE49BF /* Storyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340E1EE91E2F614400CE49BF /* Storyboard.swift */; }; 340E1EFE1E2F614400CE49BF /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 340E1EEA1E2F614400CE49BF /* Welcome.storyboard */; }; - 342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */; }; 343064411E9FDC7300DC7665 /* SearchIndex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3430643F1E9FDC7300DC7665 /* SearchIndex.swift */; }; 343E75981E5B1EE20041226A /* MWMCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 343E75961E5B1EE20041226A /* MWMCollectionViewController.m */; }; 3444DFCD1F1760B900E73099 /* WidgetsArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3444DFCB1F1760B900E73099 /* WidgetsArea.swift */; }; @@ -132,14 +135,12 @@ 34AB66861FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66011FC5AA320078E451 /* MWMNavigationInfoView.mm */; }; 34AB66891FC5AA330078E451 /* NavigationControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66021FC5AA320078E451 /* NavigationControlView.swift */; }; 34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AB66031FC5AA320078E451 /* NavigationStreetNameView.swift */; }; - 34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */; }; 34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */; }; 34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */; }; 34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34B127E81FBDD410008713D9 /* MWMRouterTransitStepInfo.mm */; }; 34B846A12029DCC10081ECCD /* BMCCategoriesHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B846A02029DCC10081ECCD /* BMCCategoriesHeader.swift */; }; 34B846A82029E8110081ECCD /* BMCDefaultViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B846A72029E8110081ECCD /* BMCDefaultViewModel.swift */; }; 34B924431DC8A29C0008D971 /* MWMMailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B924411DC8A29C0008D971 /* MWMMailViewController.m */; }; - 34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */; }; 34C9BD031C6DB693000DC38D /* MWMTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.m */; }; 34C9BD051C6DB693000DC38D /* MWMViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD011C6DB693000DC38D /* MWMViewController.m */; }; 34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BD081C6DBCDA000DC38D /* MWMNavigationController.m */; }; @@ -182,8 +183,6 @@ 408645FC21495EB1000A4A1D /* categories_cuisines.txt in Resources */ = {isa = PBXBuildFile; fileRef = 408645FB21495EB1000A4A1D /* categories_cuisines.txt */; }; 44360A0D2A7D34990016F412 /* TransportRuler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44360A0C2A7D34990016F412 /* TransportRuler.swift */; }; 44360A112A7D35440016F412 /* TransportRuler.xib in Resources */ = {isa = PBXBuildFile; fileRef = 44360A102A7D35440016F412 /* TransportRuler.xib */; }; - 447DB4BC2BA78282000DF4C2 /* MWMOsmReauthAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 447DB4BB2BA78282000DF4C2 /* MWMOsmReauthAlert.mm */; }; - 447DB4C42BA78665000DF4C2 /* MWMOsmReauthAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 447DB4C12BA78665000DF4C2 /* MWMOsmReauthAlert.xib */; }; 4501B1942077C35A001B9173 /* resources-xxxhdpi_light in Resources */ = {isa = PBXBuildFile; fileRef = 4501B1922077C35A001B9173 /* resources-xxxhdpi_light */; }; 4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */; }; 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_light.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4554B6E81E55F02B0084017F /* drules_proto_vehicle_light.bin */; }; @@ -561,8 +560,6 @@ F69018BD1E9F7CB600B3C10B /* MWMAutoupdateController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F69018BB1E9F7CB600B3C10B /* MWMAutoupdateController.xib */; }; F692F3831EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F69018B71E9E601400B3C10B /* MWMAutoupdateController.mm */; }; F6A2184A1CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A218481CA3F26800BE2CC6 /* MWMEditorViralActivityItem.mm */; }; - F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6BD1D1F1CA412920047B8E8 /* MWMOsmAuthAlert.mm */; }; - F6BD1D241CA412E40047B8E8 /* MWMOsmAuthAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BD1D221CA412E30047B8E8 /* MWMOsmAuthAlert.xib */; }; F6C3A1B221AC22810060EEC8 /* Alert 5.m4a in Resources */ = {isa = PBXBuildFile; fileRef = F6C3A1B121AC22810060EEC8 /* Alert 5.m4a */; }; F6D67CDC2062B9C00032FD38 /* BCCreateCategoryAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6D67CDB2062B9C00032FD38 /* BCCreateCategoryAlert.swift */; }; F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6D67CDD2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib */; }; @@ -781,8 +778,12 @@ 1DFA2F6820D3B52F00FB2C66 /* UIColor+PartnerColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIColor+PartnerColor.h"; sourceTree = ""; }; 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; lineEnding = 0; path = "UIColor+PartnerColor.m"; sourceTree = ""; }; 1DFA2F6E20D3CA9200FB2C66 /* UIColorRoutines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIColorRoutines.h; sourceTree = ""; }; - 275830E72E0ACAAB00EF4883 /* Bridging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Bridging.h; sourceTree = ""; }; - 275830E82E0ACAB800EF4883 /* Bridging.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Bridging.mm; sourceTree = ""; }; + 270C9C252E16AB6300ABA688 /* Profile.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = Profile.swift; sourceTree = ""; tabWidth = 4; }; + 272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = ExistingProfileView.swift; sourceTree = ""; tabWidth = 4; }; + 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = NoExistingProfileView.swift; sourceTree = ""; tabWidth = 4; }; + 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = ""; tabWidth = 4; }; + 272F1F452E0EEF8B00FA52EF /* SafariView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = SafariView.swift; sourceTree = ""; tabWidth = 4; }; + 2765D1CD2E13F9BC0005CA2B /* BridgeControllers.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = BridgeControllers.swift; sourceTree = ""; tabWidth = 4; }; 28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = ""; }; 30034C5C2B3F0B74005D961A /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/Localizable.strings; sourceTree = ""; }; @@ -842,7 +843,6 @@ 340837141B72451A00B5C185 /* MWMShareActivityItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMShareActivityItem.h; sourceTree = ""; }; 340837151B72451A00B5C185 /* MWMShareActivityItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMShareActivityItem.mm; sourceTree = ""; }; 340B33C41F3AEFDB00A8C1B4 /* MWMRouter+RouteManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMRouter+RouteManager.mm"; sourceTree = ""; }; - 340E1EE41E2F614400CE49BF /* Authorization.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Authorization.storyboard; sourceTree = ""; }; 340E1EE51E2F614400CE49BF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; 340E1EE61E2F614400CE49BF /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; 340E1EE81E2F614400CE49BF /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = ""; }; @@ -851,8 +851,6 @@ 3426DEB11F45AE2800D1C43C /* MWMRouterType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterType.h; sourceTree = ""; }; 3426DEB21F45AE5100D1C43C /* MWMRouterRecommendation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMRouterRecommendation.h; sourceTree = ""; }; 3427AF0B1E49E3A500D466DB /* MWMConsts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMConsts.h; sourceTree = ""; }; - 342CC5EF1C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationLoginViewController.h; sourceTree = ""; }; - 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationLoginViewController.mm; sourceTree = ""; }; 3430643F1E9FDC7300DC7665 /* SearchIndex.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchIndex.swift; sourceTree = ""; }; 343E75951E5B1EE20041226A /* MWMCollectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCollectionViewController.h; sourceTree = ""; }; 343E75961E5B1EE20041226A /* MWMCollectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMCollectionViewController.m; sourceTree = ""; }; @@ -979,8 +977,6 @@ 34AB66011FC5AA320078E451 /* MWMNavigationInfoView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationInfoView.mm; sourceTree = ""; }; 34AB66021FC5AA320078E451 /* NavigationControlView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationControlView.swift; sourceTree = ""; }; 34AB66031FC5AA320078E451 /* NavigationStreetNameView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationStreetNameView.swift; sourceTree = ""; }; - 34ABA6141C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationOSMLoginViewController.h; sourceTree = ""; }; - 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationOSMLoginViewController.mm; sourceTree = ""; }; 34AC8FC71EFC01F500E7F910 /* MWMRoutePoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMRoutePoint.mm; sourceTree = ""; }; 34AC8FC81EFC01F500E7F910 /* MWMRoutePoint+CPP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MWMRoutePoint+CPP.h"; sourceTree = ""; }; 34AC8FD91EFC062400E7F910 /* UILabel+NumberOfVisibleLines.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UILabel+NumberOfVisibleLines.swift"; sourceTree = ""; }; @@ -993,8 +989,6 @@ 34B924411DC8A29C0008D971 /* MWMMailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMMailViewController.m; sourceTree = ""; }; 34BC72101B0DECAE0012A34B /* MWMMapViewControlsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapViewControlsManager.h; sourceTree = ""; }; 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMMapViewControlsManager.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationCommon.mm; sourceTree = ""; }; - 34BF0CC81C31306300D097EB /* MWMAuthorizationCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationCommon.h; sourceTree = ""; }; 34C9BCFE1C6DB693000DC38D /* MWMTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTableViewController.h; sourceTree = ""; }; 34C9BCFF1C6DB693000DC38D /* MWMTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMTableViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 34C9BD001C6DB693000DC38D /* MWMViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMViewController.h; sourceTree = ""; }; @@ -1116,9 +1110,6 @@ 408645FB21495EB1000A4A1D /* categories_cuisines.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = categories_cuisines.txt; path = ../../data/categories_cuisines.txt; sourceTree = ""; }; 44360A0C2A7D34990016F412 /* TransportRuler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransportRuler.swift; sourceTree = ""; }; 44360A102A7D35440016F412 /* TransportRuler.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TransportRuler.xib; sourceTree = ""; }; - 447DB4BA2BA78282000DF4C2 /* MWMOsmReauthAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMOsmReauthAlert.h; path = Classes/CustomAlert/MWMOsmReauthAlert.h; sourceTree = SOURCE_ROOT; }; - 447DB4BB2BA78282000DF4C2 /* MWMOsmReauthAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMOsmReauthAlert.mm; path = Classes/CustomAlert/MWMOsmReauthAlert.mm; sourceTree = SOURCE_ROOT; }; - 447DB4C12BA78665000DF4C2 /* MWMOsmReauthAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MWMOsmReauthAlert.xib; path = Classes/CustomAlert/MWMOsmReauthAlert.xib; sourceTree = SOURCE_ROOT; }; 4501B1922077C35A001B9173 /* resources-xxxhdpi_light */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxxhdpi_light"; path = "../../data/resources-xxxhdpi_light"; sourceTree = ""; }; 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxxhdpi_dark"; path = "../../data/resources-xxxhdpi_dark"; sourceTree = ""; }; 451950391B7A3E070085DA05 /* patterns.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = patterns.txt; path = ../../data/patterns.txt; sourceTree = ""; }; @@ -1616,9 +1607,6 @@ F6BBF2C41B4FFB72000CF8E2 /* MWMLocationAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMLocationAlert.h; sourceTree = ""; }; F6BBF2C51B4FFB72000CF8E2 /* MWMLocationAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MWMLocationAlert.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMLocationAlert.xib; sourceTree = ""; }; - F6BD1D1E1CA412920047B8E8 /* MWMOsmAuthAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMOsmAuthAlert.h; sourceTree = ""; }; - F6BD1D1F1CA412920047B8E8 /* MWMOsmAuthAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMOsmAuthAlert.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - F6BD1D221CA412E30047B8E8 /* MWMOsmAuthAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMOsmAuthAlert.xib; sourceTree = ""; }; F6C3A1B121AC22810060EEC8 /* Alert 5.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Alert 5.m4a"; sourceTree = ""; }; F6D67CDB2062B9C00032FD38 /* BCCreateCategoryAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BCCreateCategoryAlert.swift; sourceTree = ""; }; F6D67CDD2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMBCCreateCategoryAlert.xib; sourceTree = ""; }; @@ -1954,18 +1942,45 @@ name = Products; sourceTree = ""; }; + 272F1F342E0ED92E00FA52EF /* Bridging */ = { + isa = PBXGroup; + children = ( + 2765D1CD2E13F9BC0005CA2B /* BridgeControllers.swift */, + 272F1F452E0EEF8B00FA52EF /* SafariView.swift */, + ); + path = Bridging; + sourceTree = ""; + }; + 272F1F352E0EE00B00FA52EF /* Profile */ = { + isa = PBXGroup; + children = ( + 272F1F3C2E0EE0C400FA52EF /* ProfileView.swift */, + 272F1F382E0EE08A00FA52EF /* ExistingProfileView.swift */, + 272F1F3A2E0EE09500FA52EF /* NoExistingProfileView.swift */, + ); + path = Profile; + sourceTree = ""; + }; + 2749E5C32E17F736006E73EC /* Model */ = { + isa = PBXGroup; + children = ( + 270C9C252E16AB6300ABA688 /* Profile.swift */, + ); + path = Model; + sourceTree = ""; + }; 29B97314FDCFA39411CA2CEA /* Maps */ = { isa = PBXGroup; children = ( - 275830E72E0ACAAB00EF4883 /* Bridging.h */, - 275830E82E0ACAB800EF4883 /* Bridging.mm */, FA456C4026BDCC8E00B83C20 /* shaders.xcodeproj */, + 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */, + 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */, + 272F1F342E0ED92E00FA52EF /* Bridging */, + 2749E5C32E17F736006E73EC /* Model */, FA36B8011540388B004560CC /* Bookmarks */, 3454D7981E07F045004AF2AD /* Categories */, 080E96DDFE201D6D7F000001 /* Classes */, 340475141E081A4600C92850 /* Common */, - 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */, - 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */, 340475281E081A4600C92850 /* Core */, FA065FC61286143F00FEA989 /* External Resources */, 29B97323FDCFA39411CA2CEA /* Frameworks */, @@ -2221,7 +2236,6 @@ 340E1EE31E2F614400CE49BF /* Storyboard */ = { isa = PBXGroup; children = ( - 340E1EE41E2F614400CE49BF /* Authorization.storyboard */, 340E1EE51E2F614400CE49BF /* LaunchScreen.storyboard */, 340E1EE61E2F614400CE49BF /* Main.storyboard */, 340E1EE81E2F614400CE49BF /* Settings.storyboard */, @@ -2590,20 +2604,6 @@ path = TransportTransitSteps; sourceTree = ""; }; - 34ABA60F1C2D17C200FE1BEC /* Login */ = { - isa = PBXGroup; - children = ( - 342CC5EF1C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.h */, - 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */, - 34ABA6141C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.h */, - 34ABA6151C2D185B00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm */, - 34BF0CC81C31306300D097EB /* MWMAuthorizationCommon.h */, - 34BF0CC51C31304A00D097EB /* MWMAuthorizationCommon.mm */, - ); - name = Login; - path = CustomViews/Login; - sourceTree = ""; - }; 34BC72091B0DECAE0012A34B /* MapViewControls */ = { isa = PBXGroup; children = ( @@ -2696,16 +2696,6 @@ path = Widgets; sourceTree = ""; }; - 447DB4B72BA7826D000DF4C2 /* ReauthAlert */ = { - isa = PBXGroup; - children = ( - 447DB4C12BA78665000DF4C2 /* MWMOsmReauthAlert.xib */, - 447DB4BA2BA78282000DF4C2 /* MWMOsmReauthAlert.h */, - 447DB4BB2BA78282000DF4C2 /* MWMOsmReauthAlert.mm */, - ); - path = ReauthAlert; - sourceTree = ""; - }; 470F0B7B238842AD006AEC94 /* Views */ = { isa = PBXGroup; children = ( @@ -2843,7 +2833,6 @@ ED48BBB817C2B1E2003E7E92 /* CircleView.h */, ED48BBB917C2B1E2003E7E92 /* CircleView.m */, 349A35741B53D4C9009677EE /* CircularProgress */, - 34ABA60F1C2D17C200FE1BEC /* Login */, 34BC72091B0DECAE0012A34B /* MapViewControls */, 34AB65C41FC5AA320078E451 /* NavigationDashboard */, 479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */, @@ -3526,13 +3515,11 @@ isa = PBXGroup; children = ( EDFE1A462DF1986900FDEA38 /* UnknownCurrentPositionAlert */, - 447DB4B72BA7826D000DF4C2 /* ReauthAlert */, F62607FB207B78E300176C5A /* SpinnerAlert */, F6D67CDA2062B9810032FD38 /* CreateBookmarkCategory */, 349B92691DF0516C007779DD /* Toast */, 349A137E1DEC138C00C7DB60 /* MobileInternetAlert */, F6FE3C351CC50FDF00A73196 /* PlaceDoesntExist */, - F6BD1D1D1CA412700047B8E8 /* AuthAlert */, F64D9C9C1C899BEA0063FA30 /* EditorAlert */, F63774E51B59374F00BCF54D /* RoutingDisclaimerAlert */, F6BBF2C31B4FFB56000CF8E2 /* LocationAlert */, @@ -3634,16 +3621,6 @@ path = LocationAlert; sourceTree = ""; }; - F6BD1D1D1CA412700047B8E8 /* AuthAlert */ = { - isa = PBXGroup; - children = ( - F6BD1D221CA412E30047B8E8 /* MWMOsmAuthAlert.xib */, - F6BD1D1E1CA412920047B8E8 /* MWMOsmAuthAlert.h */, - F6BD1D1F1CA412920047B8E8 /* MWMOsmAuthAlert.mm */, - ); - name = AuthAlert; - sourceTree = ""; - }; F6D67CDA2062B9810032FD38 /* CreateBookmarkCategory */ = { isa = PBXGroup; children = ( @@ -3980,6 +3957,7 @@ F6E2FD361E097BA00083EBEC /* Settings */ = { isa = PBXGroup; children = ( + 272F1F352E0EE00B00FA52EF /* Profile */, F6E2FD371E097BA00083EBEC /* Cells */, F6E2FD401E097BA00083EBEC /* MWMMobileInternetViewController.h */, F6E2FD411E097BA00083EBEC /* MWMMobileInternetViewController.m */, @@ -4301,7 +4279,6 @@ 4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */, 47CA68D22500435E00671019 /* BookmarksListViewController.xib in Resources */, 34AB66141FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */, - 340E1EEC1E2F614400CE49BF /* Authorization.storyboard in Resources */, 6741A95C1BF340DE002C974C /* categories.txt in Resources */, 6741A9451BF340DE002C974C /* classificator.txt in Resources */, 676507611C10559B00830BB3 /* colors.txt in Resources */, @@ -4377,7 +4354,6 @@ F6E2FE161E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.xib in Resources */, ED8A91E02D759B50009E063B /* LocalizableTypes.strings in Resources */, F6E2FE1C1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.xib in Resources */, - F6BD1D241CA412E40047B8E8 /* MWMOsmAuthAlert.xib in Resources */, F6FE3C3C1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */, 470E1675252AD7F2002D201A /* BookmarksListInfoViewController.xib in Resources */, F6E2FE7F1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */, @@ -4402,7 +4378,6 @@ F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */, 3463BA691DE81DB90082417F /* MWMTrafficButtonViewController.xib in Resources */, F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */, - 447DB4C42BA78665000DF4C2 /* MWMOsmReauthAlert.xib in Resources */, 6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */, 676507601C10559800830BB3 /* patterns.txt in Resources */, 6741A94A1BF340DE002C974C /* resources-6plus_light in Resources */, @@ -4531,6 +4506,7 @@ ED2D745E2D1433DE00660FBF /* TrackRecordingActivityManager.swift in Sources */, 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */, 9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */, + 272F1F392E0EE09000FA52EF /* ExistingProfileView.swift in Sources */, 3454D7D11E07F045004AF2AD /* UIImage+RGBAData.m in Sources */, 6741A9B71BF340DE002C974C /* EAGLView.mm in Sources */, 6741A9B81BF340DE002C974C /* MapViewController.mm in Sources */, @@ -4538,7 +4514,6 @@ 3404F48B202894EA0090E401 /* BMCViewController.swift in Sources */, F6E2FDE01E097BA00083EBEC /* MWMEditorViewController.mm in Sources */, 6741A9C01BF340DE002C974C /* MWMTextView.m in Sources */, - 275830E92E0ACABA00EF4883 /* Bridging.mm in Sources */, F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.m in Sources */, F6E2FDC81E097BA00083EBEC /* MWMEditorNotesFooter.m in Sources */, F6E2FD651E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.m in Sources */, @@ -4594,7 +4569,6 @@ EDC4E34D2C5D1BEF009286A2 /* RecentlyDeletedTableViewCell.swift in Sources */, 34AB66051FC5AA320078E451 /* MWMNavigationDashboardManager+Entity.mm in Sources */, 993DF12A23F6BDB100AC231A /* Style.swift in Sources */, - 34ABA6171C2D185C00FE1BEC /* MWMAuthorizationOSMLoginViewController.mm in Sources */, ED9966802B94FBC20083CE55 /* ColorPicker.swift in Sources */, 993DF10423F6BDB100AC231A /* UIView+SetStyle.swift in Sources */, 998927302449DE1500260CE2 /* TabBarArea.swift in Sources */, @@ -4651,7 +4625,6 @@ 471AB98923AA8A3500F56D49 /* IDownloaderDataSource.swift in Sources */, EDE243E72B6D55610057369B /* InfoView.swift in Sources */, F692F3831EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */, - 34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */, 34AB664D1FC5AA330078E451 /* RouteManagerFooterView.swift in Sources */, 6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */, ED4DC7772CAEDECC0029B338 /* ProductsViewModel.swift in Sources */, @@ -4688,7 +4661,7 @@ 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.m in Sources */, 6741A9EC1BF340DE002C974C /* MWMCircularProgress.m in Sources */, 993DF11923F6BDB100AC231A /* UITextFieldRenderer.swift in Sources */, - 342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */, + 272F1F462E0EEF9400FA52EF /* SafariView.swift in Sources */, 340475591E081A4600C92850 /* WebViewController.m in Sources */, 3404F4992028A20D0090E401 /* BMCCategoryCell.swift in Sources */, EDC4E34C2C5D1BEF009286A2 /* RecentlyDeletedCategoriesViewModel.swift in Sources */, @@ -4717,6 +4690,7 @@ 993DF11623F6BDB100AC231A /* UIWindowRenderer.swift in Sources */, F660DEE51EAF4F59004DC056 /* MWMLocationManager+SpeedAndAltitude.swift in Sources */, F6E2FDF21E097BA00083EBEC /* MWMOpeningHoursAddScheduleTableViewCell.mm in Sources */, + 272F1F3D2E0EE0C800FA52EF /* ProfileView.swift in Sources */, 3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */, ED79A5AB2BD7AA9C00952D1F /* LoadingOverlayViewController.swift in Sources */, 34AB66111FC5AA320078E451 /* NavigationTurnsView.swift in Sources */, @@ -4756,6 +4730,7 @@ EDA1EAA42CC7ECAD00DBDCAA /* ElevationProfileFormatter.swift in Sources */, 996D108A24E3DBF2002DD0E2 /* BookmarksCoordinator.swift in Sources */, 3454D7CE1E07F045004AF2AD /* UIFont+MapsMeFonts.m in Sources */, + 2765D1D02E13F9C20005CA2B /* BridgeControllers.swift in Sources */, 99A906E123F6F7030005872B /* PlacePageButtonsViewController.swift in Sources */, 998927382449E60200260CE2 /* BottomMenuPresenter.swift in Sources */, F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */, @@ -4795,6 +4770,7 @@ ED70D58C2D539A2500738C1E /* SearchOnMapPresenter.swift in Sources */, ED70D58D2D539A2500738C1E /* ModalPresentationStep.swift in Sources */, ED70D58F2D539A2500738C1E /* SearchOnMapInteractor.swift in Sources */, + 272F1F3B2E0EE0A300FA52EF /* NoExistingProfileView.swift in Sources */, ED70D5922D539A2500738C1E /* PlaceholderView.swift in Sources */, ED70D5932D539A2500738C1E /* SearchOnMapManager.swift in Sources */, 3454D7BC1E07F045004AF2AD /* CLLocation+Mercator.mm in Sources */, @@ -4804,7 +4780,6 @@ 6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */, EDFDFB4C2B722C9C0013A44C /* InfoTableViewCell.swift in Sources */, 47CA68F8250F8AB700671019 /* BookmarksListSectionHeader.swift in Sources */, - F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */, 47CF2E6323BA0DD500D11C30 /* CopyLabel.swift in Sources */, 47CA68D12500435E00671019 /* BookmarksListViewController.swift in Sources */, 34AB66321FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */, @@ -4837,6 +4812,7 @@ 3404164C1E7BF42E00E2B6D6 /* UIView+Coordinates.swift in Sources */, 99F3EB0323F4178200C713F8 /* PlacePageCommonLayout.swift in Sources */, 99C6532223F2F506004322F3 /* IPlacePageLayout.swift in Sources */, + 270C9C282E16AB6F00ABA688 /* Profile.swift in Sources */, ED9857082C4ED02D00694F6C /* MailComposer.swift in Sources */, 99F8B4C623B644A6009FF0B4 /* MapStyleSheet.swift in Sources */, 99012851244732DB00C72B10 /* BottomTabBarViewController.swift in Sources */, @@ -4857,7 +4833,6 @@ 993DF10523F6BDB100AC231A /* UINavigationItem+StyleStyle.swift in Sources */, 4726254921C27D4B00C7BAAD /* PlacePageDescriptionViewController.swift in Sources */, 039371B62C5B68CD00708377 /* UIFont+monospaced.swift in Sources */, - 447DB4BC2BA78282000DF4C2 /* MWMOsmReauthAlert.mm in Sources */, 340475711E081A4600C92850 /* MWMSettings.mm in Sources */, 33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */, 3404756E1E081A4600C92850 /* MWMSearch.mm in Sources */, @@ -5210,6 +5185,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CODE_SIGN_ENTITLEMENTS = "CoMaps-Debug.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -5244,6 +5220,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CODE_SIGN_ENTITLEMENTS = "CoMaps-Release.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; @@ -5373,6 +5350,7 @@ baseConfigurationReference = 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; BUNDLE_IDENTIFIER = app.comaps.debug; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; DEVELOPMENT_TEAM = 534D2KJBUK; @@ -5414,6 +5392,7 @@ baseConfigurationReference = 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; BUNDLE_IDENTIFIER = app.comaps; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; DEVELOPMENT_TEAM = 534D2KJBUK; diff --git a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme index fa87d91d8..25ddb6fbf 100644 --- a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme +++ b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/CoMaps.xcscheme @@ -1,6 +1,6 @@ osm.UserPreferences? { + var userPreferences: osm.UserPreferences? = nil + userPreferences = osm.ServerApi06(osm.OsmOAuth.ServerAuth(std.string(authorizationToken ?? ""))).GetUserPreferences() + if let userPreferences, userPreferences.m_id == 0 { + return nil + } + return userPreferences + } + + + /// Reload the OpenStreetMap profile + static func reload() async { + // Could be done in nicer way, but that would require iOS 17+ + await withCheckedContinuation { continuation in + let networkPathMonitor: NWPathMonitor = NWPathMonitor() + networkPathMonitor.pathUpdateHandler = { path in + Task { + if path.status != .unsatisfied { + let userDefaults = UserDefaults.standard + if let userPreferences = await reloadUserPreferences() { + userDefaults.set(String(describing: userPreferences.m_displayName), forKey: userDefaultsKeyName) + userDefaults.set(Int(userPreferences.m_changesets), forKey: userDefaultsKeyNumberOfEdits) + } else if path.status == .satisfied { + userDefaults.set(true, forKey: userDefaultsNeedsReauthorization) + } + } + networkPathMonitor.cancel() + continuation.resume() + } + } + networkPathMonitor.start(queue: .main) + } + } + + + /// Logout of the OpenStreetMap profile + static func logout() { + if isExisting { + let userDefaults = UserDefaults.standard + userDefaults.removeObject(forKey: userDefaultsKeyAuthorizationToken) + userDefaults.removeObject(forKey: userDefaultsKeyName) + userDefaults.removeObject(forKey: userDefaultsKeyNumberOfEdits) + userDefaults.removeObject(forKey: userDefaultsNeedsReauthorization) + } + } +} diff --git a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m index 3bce0d23d..a5d1b1b49 100644 --- a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m +++ b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.m @@ -22,7 +22,7 @@ - (IBAction)osmTap { - [self.controller openUrl:L(@"osm_wiki_about_url")]; + [self.controller openUrl:L(@"osm_more_about_url")]; } @end diff --git a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib index 5e9864fa8..adca5f352 100644 --- a/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib +++ b/iphone/Maps/UI/Editor/MWMEditorNotesFooter.xib @@ -2,6 +2,7 @@ + @@ -36,7 +37,7 @@ - + diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 191e6c7bd..e11d49df2 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -1,6 +1,5 @@ #import "MWMEditorViewController.h" #import "MWMAlertViewController.h" -#import "MWMAuthorizationCommon.h" #import "MWMButtonCell.h" #import "MWMCuisineEditorViewController.h" #import "MWMEditorAddAdditionalNameTableViewCell.h" @@ -244,7 +243,7 @@ void registerCellsForTableView(std::vector const & cells, UITab [self showNotesQueuedToast]; break; case osm::Editor::SaveResult::SavedSuccessfully: - osm_auth_ios::AuthorizationSetNeedCheck(YES); + [Profile requestReauthorizationWithShouldReauthorize:YES]; f.UpdatePlacePageInfoForCurrentSelection(); [self.navigationController popToRootViewControllerAnimated:YES]; break; diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm index 91e42b9c9..812f0d16a 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm @@ -1,5 +1,4 @@ #import "MWMObjectsCategorySelectorController.h" -#import "MWMAuthorizationCommon.h" #import "MWMObjectsCategorySelectorDataSource.h" #import "MWMEditorViewController.h" #import "MWMKeyboard.h" diff --git a/iphone/Maps/UI/Help/AboutController/Views/OSMView.swift b/iphone/Maps/UI/Help/AboutController/Views/OSMView.swift index 8fc496be8..93f476a27 100644 --- a/iphone/Maps/UI/Help/AboutController/Views/OSMView.swift +++ b/iphone/Maps/UI/Help/AboutController/Views/OSMView.swift @@ -75,7 +75,7 @@ final class OSMView: UIView { private func attributedString(for date: String) -> NSAttributedString { let osmLink = "OpenStreetMap.org" - let attributedString = NSMutableAttributedString(string: String(format: L("osm_presentation"), date.trimmingCharacters(in: .punctuationCharacters)), + let attributedString = NSMutableAttributedString(string: String(format: L("osm_explanation"), date.trimmingCharacters(in: .punctuationCharacters)), attributes: [.font: UIFont.regular14(), .foregroundColor: StyleManager.shared.theme!.colors.blackPrimaryText] ) diff --git a/iphone/Maps/UI/Settings/MWMSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMSettingsViewController.mm index 9a6e14e47..ada765a8a 100644 --- a/iphone/Maps/UI/Settings/MWMSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMSettingsViewController.mm @@ -1,5 +1,4 @@ #import "MWMSettingsViewController.h" -#import "MWMAuthorizationCommon.h" #import "MWMTextToSpeech+CPP.h" #import "SwiftBridge.h" #import "MWMActivityViewController.h" @@ -81,8 +80,11 @@ static NSString * const kUDDidShowICloudSynchronizationEnablingAlert = @"kUDDidS } - (void)configProfileSection { - NSString * userName = osm_auth_ios::OSMUserName(); - [self.profileCell configWithTitle:L(@"profile") info:userName.length != 0 ? userName : @""]; + NSString *userName = Profile.name; + if (userName == nil) { + userName = @""; + } + [self.profileCell configWithTitle:L(@"osm_profile") info:userName.length != 0 ? userName : @""]; } - (void)configCommonSection { @@ -343,9 +345,7 @@ static NSString * const kUDDidShowICloudSynchronizationEnablingAlert = @"kUDDidS - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:true]; auto cell = [tableView cellForRowAtIndexPath:indexPath]; - if (cell == self.profileCell) { - [self performSegueWithIdentifier:@"SettingsToProfileSegue" sender:nil]; - } else if (cell == self.unitsCell) { + if (cell == self.unitsCell) { [self performSegueWithIdentifier:@"SettingsToUnits" sender:nil]; } else if (cell == self.mobileInternetCell) { [self performSegueWithIdentifier:@"SettingsToMobileInternetSegue" sender:nil]; diff --git a/iphone/Maps/UI/Settings/Profile/ExistingProfileView.swift b/iphone/Maps/UI/Settings/Profile/ExistingProfileView.swift new file mode 100644 index 000000000..6b0a64883 --- /dev/null +++ b/iphone/Maps/UI/Settings/Profile/ExistingProfileView.swift @@ -0,0 +1,152 @@ +import SwiftUI + + +/// View for the OpenStreetMapp profile +struct ExistingProfileView: View { + // MARK: - Properties + + /// The open url action of the environment + @Environment(\.openURL) private var openUrl + + + /// The date the profile information was last updated (this is necessary for automatically refreshing the view) + @Binding var lastUpdated: Date + + + /// If the login form should be shown in the Safari view + @State private var showLogin: Bool = false + + + /// If the edit history should be shown in the Safari view + @State private var showEditHistory: Bool = false + + + /// If the map notes should be shown in the Safari view + @State private var showNotes: Bool = false + + + /// If the profile is being presented as an alert + var isPresentedAsAlert: Bool = false + + + /// The actual view + var body: some View { + VStack(alignment: .leading) { + if Profile.needsReauthorization { + ScrollView { + Text("osm_profile_reauthorize_promt") + .font(.headline) + .frame(maxWidth: .infinity, alignment: .leading) + .padding() + } + } else if !isPresentedAsAlert { + ScrollView { + VStack { + VStack { + Text(Profile.numberOfEdits ?? 0, format: .number) + .font(.largeTitle) + .bold() + .frame(maxWidth: .infinity) + + Text("osm_profile_verfied_changes") + } + .padding() + .frame(maxWidth: .infinity) + .background { + RoundedRectangle(cornerRadius: 10) + .stroke(Color.secondary.opacity(0.3), lineWidth: 1) + } + + if let editHistoryUrl = Profile.editHistoryUrl { + Button { + showEditHistory = true + } label: { + Text("osm_profile_view_edit_history") + .frame(maxWidth: .infinity) + } + .buttonStyle(BorderedProminentButtonStyle()) + .controlSize(.large) + .font(.headline) + .sheet(isPresented: $showEditHistory) { + SafariView(url: editHistoryUrl, dismissButton: .close) + } + } + + if let notesUrl = Profile.notesUrl { + Button { + showNotes = true + } label: { + Text("osm_profile_view_notes") + .frame(maxWidth: .infinity) + } + .buttonStyle(BorderedProminentButtonStyle()) + .controlSize(.large) + .font(.headline) + .padding(.top) + .sheet(isPresented: $showNotes) { + SafariView(url: notesUrl, dismissButton: .close) + } + } + } + .padding() + } + .refreshable { + await Profile.reload() + withAnimation { + lastUpdated = Date.now + } + } + } + + Spacer(minLength: 0) + + VStack { + if Profile.needsReauthorization { + Button { + showLogin = true + } label: { + Text("osm_profile_reauthorize") + .frame(maxWidth: .infinity) + } + .buttonStyle(BorderedProminentButtonStyle()) + .controlSize(.large) + .font(.headline) + .sheet(isPresented: $showLogin) { + SafariView(url: Profile.authorizationUrl, dismissButton: .cancel) + } + + Divider() + .padding([.top, .bottom]) + + VStack(alignment: .leading) { + Text("osm_profile_remove_promt") + + Button { + Profile.logout() + lastUpdated = Date.now + } label: { + Text("osm_profile_remove") + .frame(maxWidth: .infinity) + } + .buttonStyle(BorderedButtonStyle()) + .controlSize(.large) + .font(.headline) + } + } else if !isPresentedAsAlert { + Button { + if let wikiUrl = URL(string: String(localized: "osm_more_about_url")) { + openUrl(wikiUrl) + } + } label: { + Text("osm_more_about") + .frame(maxWidth: .infinity) + } + .buttonStyle(BorderedButtonStyle()) + .controlSize(.large) + .font(.headline) + } + } + .padding([.bottom, .leading, .trailing]) + } + } +} diff --git a/iphone/Maps/UI/Settings/Profile/NoExistingProfileView.swift b/iphone/Maps/UI/Settings/Profile/NoExistingProfileView.swift new file mode 100644 index 000000000..29ab9508c --- /dev/null +++ b/iphone/Maps/UI/Settings/Profile/NoExistingProfileView.swift @@ -0,0 +1,75 @@ +import SwiftUI + + +/// View for the OpenStreetMapp profile +struct NoExistingProfileView: View { + // MARK: - Properties + + /// The open url action of the environment + @Environment(\.openURL) private var openUrl + + + /// If the login form should be shown in the Safari view + @State private var showLogin: Bool = false + + + /// The actual view + var body: some View { + VStack(alignment: .leading) { + ScrollView { + VStack(alignment: .leading) { + Text("osm_profile_promt") + .font(.headline) + + HStack(alignment: .top) { + Image(.osmLogo) + .resizable() + .aspectRatio(1, contentMode: .fit) + .frame(maxWidth: 50) + .padding(.top, 6) + + Text("osm_profile_explanation") + } + } + .padding() + } + + Spacer(minLength: 0) + + VStack { + VStack { + Button { + showLogin = true + } label: { + Text("osm_profile_login") + .frame(maxWidth: .infinity) + } + .buttonStyle(BorderedProminentButtonStyle()) + .controlSize(.large) + .font(.headline) + .sheet(isPresented: $showLogin) { + SafariView(url: Profile.authorizationUrl, dismissButton: .cancel) + } + } + + Divider() + .padding([.top, .bottom]) + + VStack(alignment: .leading) { + Text("osm_profile_register_promt") + + Button { + openUrl(Profile.registrationUrl) + } label: { + Text("osm_profile_register") + .frame(maxWidth: .infinity) + } + .buttonStyle(BorderedButtonStyle()) + .controlSize(.large) + .font(.headline) + } + } + .padding([.bottom, .leading, .trailing]) + } + } +} diff --git a/iphone/Maps/UI/Settings/Profile/ProfileView.swift b/iphone/Maps/UI/Settings/Profile/ProfileView.swift new file mode 100644 index 000000000..d8291f808 --- /dev/null +++ b/iphone/Maps/UI/Settings/Profile/ProfileView.swift @@ -0,0 +1,75 @@ +import SwiftUI + + +/// View for the OpenStreetMap profile +struct ProfileView: View { + // MARK: - Properties + + /// The dismiss action of the environment + @Environment(\.dismiss) private var dismiss + + + /// The open url action of the environment + @Environment(\.openURL) private var openUrl + + + /// The date the profile information was last updated (this is necessary for automatically refreshing the view) + @State private var lastUpdated: Date = Date.now + + + /// If the profile is being presented as an alert + var isPresentedAsAlert: Bool = false + + + /// The actual view + var body: some View { + NavigationView { + VStack(spacing: 0) { + if isPresentedAsAlert { + Button { + dismiss() + } label: { + Label { + Text("close") + } icon: { + Image(systemName: "xmark.circle.fill") + .font(.title) + } + } + .labelStyle(.iconOnly) + .buttonStyle(PlainButtonStyle()) + .foregroundStyle(.primary) + .padding([.top, .leading, .trailing]) + .frame(maxWidth: .infinity, alignment: .trailing) + } + + if Profile.isExisting { + ExistingProfileView(lastUpdated: $lastUpdated, isPresentedAsAlert: isPresentedAsAlert) + } else { + NoExistingProfileView() + } + } + } + .navigationViewStyle(StackNavigationViewStyle()) + .navigationTitle(Profile.name ?? String(localized: "osm_profile")) + .toolbar { + ToolbarItem(placement: .destructiveAction) { + if !isPresentedAsAlert, Profile.isExisting, !Profile.needsReauthorization { + Button { + Profile.logout() + lastUpdated = Date.now + } label: { + Label("osm_profile_logout", systemImage: "rectangle.portrait.and.arrow.forward") + } + } + } + } + .task { + await Profile.reload() + withAnimation { + lastUpdated = Date.now + } + } + .tag(lastUpdated) + } +} diff --git a/iphone/Maps/UI/Storyboard/Authorization.storyboard b/iphone/Maps/UI/Storyboard/Authorization.storyboard deleted file mode 100644 index 6c80ef590..000000000 --- a/iphone/Maps/UI/Storyboard/Authorization.storyboard +++ /dev/null @@ -1,408 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/UI/Storyboard/Settings.storyboard b/iphone/Maps/UI/Storyboard/Settings.storyboard index eebb4c0c6..ced5dccb7 100644 --- a/iphone/Maps/UI/Storyboard/Settings.storyboard +++ b/iphone/Maps/UI/Storyboard/Settings.storyboard @@ -1,9 +1,9 @@ - + - + @@ -41,6 +41,9 @@ + + + @@ -378,19 +381,19 @@ - + -