Merge branch 'release/v3.0.0-11'

Author: jnavarrom

MEGA.xcodeproj/project.pbxproj

@@ -0,0 +1,93 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "B29DB52C58D4DBF94A2D8B6DF807BA0284E98CA5",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "DD091C5D03D23C2F1EC054BC9C018DF9A9125FD6" : 0,
+    "1945E551F17CC8F4796C756EF87EADA8A3EADD91" : 0,
+    "3E02169055262138F7D692446C25677927AC13EE" : 0,
+    "C16576B571172538D95183F9515DC5DB064EAF7F" : 0,
+    "9E1ECC80773D1F4F22D03CB4DEA298B3CB57FAF5" : 0,
+    "00DEE37500E6C7998F4D113C875F3996AE26D5BE" : 0,
+    "9F9B14DA276794D9192F387F0CC62561009373D0" : 0,
+    "FFD45562D681BCF3154B3744FD74B029E1BBF63E" : 0,
+    "7070BA961BCA286ED2393408B1E3D78393C99B33" : 0,
+    "2AADEAED908340583C88E195E0B330D50D5EFB2E" : 0,
+    "B29DB52C58D4DBF94A2D8B6DF807BA0284E98CA5" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "E0E59F3C-ECC8-4B12-BC45-F37C2054C81B",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "DD091C5D03D23C2F1EC054BC9C018DF9A9125FD6" : "meganz:iOS3iMEGA\/Vendor\/DZNEmptyDataSet",
+    "1945E551F17CC8F4796C756EF87EADA8A3EADD91" : "meganz:iOS3iMEGA\/Vendor\/AMLocalizedString",
+    "3E02169055262138F7D692446C25677927AC13EE" : "meganz:iOS3iMEGA\/Vendor\/LTHPasscodeViewController",
+    "C16576B571172538D95183F9515DC5DB064EAF7F" : "meganz:iOS3iMEGA\/Vendor\/sskeychain",
+    "9E1ECC80773D1F4F22D03CB4DEA298B3CB57FAF5" : "meganz:iOS3iMEGA\/Vendor\/SVProgressHUD",
+    "00DEE37500E6C7998F4D113C875F3996AE26D5BE" : "meganz:iOS3iMEGA\/Vendor\/SVWebViewController",
+    "9F9B14DA276794D9192F387F0CC62561009373D0" : "meganz:iOS3iMEGA\/Vendor\/MWPhotoBrowser",
+    "FFD45562D681BCF3154B3744FD74B029E1BBF63E" : "meganz:iOS3iMEGA\/Vendor\/GKContactImage",
+    "7070BA961BCA286ED2393408B1E3D78393C99B33" : "meganz:iOS3iMEGA\/Vendor\/Reachability",
+    "2AADEAED908340583C88E195E0B330D50D5EFB2E" : "meganz:iOS3iMEGA\/Vendor\/SDK",
+    "B29DB52C58D4DBF94A2D8B6DF807BA0284E98CA5" : "meganz:iOS3"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "iMEGA",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "iMEGA.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/SVWebViewController.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "00DEE37500E6C7998F4D113C875F3996AE26D5BE"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/tagyro\/AMLocalizedString.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "1945E551F17CC8F4796C756EF87EADA8A3EADD91"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/sdk.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2AADEAED908340583C88E195E0B330D50D5EFB2E"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/jnavarrom\/LTHPasscodeViewController.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "3E02169055262138F7D692446C25677927AC13EE"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/Reachability.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "7070BA961BCA286ED2393408B1E3D78393C99B33"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/SVProgressHUD.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9E1ECC80773D1F4F22D03CB4DEA298B3CB57FAF5"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/MWPhotoBrowser.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "9F9B14DA276794D9192F387F0CC62561009373D0"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/iOS3.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "B29DB52C58D4DBF94A2D8B6DF807BA0284E98CA5"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/sskeychain.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C16576B571172538D95183F9515DC5DB064EAF7F"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/DZNEmptyDataSet.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "DD091C5D03D23C2F1EC054BC9C018DF9A9125FD6"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/meganz\/GKContactImage.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "FFD45562D681BCF3154B3744FD74B029E1BBF63E"
+    }
+  ]
+}

iMEGA.xcworkspace/xcshareddata/iMEGA.xcscmblueprint

@@ -56,10 +56,14 @@
 "megaAccessText"="Get fully encrypted access anywhere, anytime.";
 /* Button title which triggers the action to login in your MEGA account */
 "login"="Login";
+/* Question to focus the user to the zone of the app where he/she can go to the section to create an account */
+"doNotHaveAnAccount" = "Don't have an account?";
+/* Button that bring you to section where you can create an account */
+"createOne" = "Create one";
 /* Button title which triggers the action to create a MEGA account */
 "createAccount"="Create Account";
-/* Text shown next to a switch button on login, which if it's enabled keeps you logged after the app is closed. Otherwise you will be logged out as soon as the app's gets out of the memory */
-"remainLoggedIn"="Remain logged in";
+/* Question to focus the user to the zone of the app where he/she can go to login */
+"alreadyHaveAnAccount" = "Already have an account?";
 /* Message shown when the user writes a wrong email or password on login */
 "invalidMailOrPassword"="Invalid e-mail and/or password. Please try again";
 /* Message shown when the user writes an invalid format in the email field  */
@@ -613,4 +617,46 @@
 /* Alert message shown when the restoring process has stopped for some reason */
 "failedRestore_message" = "Either you cancelled the request or your prior purchase could not be restored. Please try again later, or contact with [email protected].";
 
-
+// WRITE THE NAME OF YOUR OWN LANGUAGE, IN YOUR LANGUAGE
+"af"="Afrikaans";
+"ar"="Arabic";
+"bg"="Bulgarian";
+"bs"="Bosnian";
+"ca"="Català";
+"cs"="Čeština";
+"da"="Danish";
+"de"="German";
+"ee"="Ewe";
+// DO NOT TRANSLATE. Already translated
+"en"="English";
+"es"="Español";
+"et"="Eesti";
+"eu"="Basque";
+"fi"="Suomi";
+"fr"="French";
+"gl"="Galician";
+"he"="Hebrew";
+"hr"="Croatian";
+"hu"="Magyar";
+"id"="Indonesian";
+"it"="Italiano";
+"ja"="Japanese";
+"ko"="Korean";
+"lt"="Lithuanian";
+"lv"="Latvian";
+"ms"="Malay";
+"nb"="Norwegian";
+"nl"="Nederlands";
+"pl"="Polish";
+"pt-br"="Português Brasil";
+"pt"="Português";
+"ro"="Română";
+"ru"="Pусский";
+"sk"="Slovak";
+"sl"="Slovenian";
+"sv"="Svenska";
+"th"="Thai";
+"tr"="Turkish";
+"uk"="Ukrainian";
+"zh-Hans"="Simplified Chinese";
+"zh-Hant"="中文繁體";

iMEGA/Base.lproj/Localizable.strings

@@ -391,7 +391,7 @@ - (IBAction)moveCopyAction:(UIBarButtonItem *)sender {
 - (IBAction)deleteAction:(UIBarButtonItem *)sender {
     NSString *message = (self.selectedItemsDictionary.count > 1) ? [NSString stringWithFormat:AMLocalizedString(@"moveMultipleNodesToRubbishBinMessage", nil), self.selectedItemsDictionary.count] : [NSString stringWithString:AMLocalizedString(@"moveNodeToRubbishBinMessage", nil)];
 
-    UIAlertView *removeAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"moveNodeToRubbishBinTitle", @"Remove node from rubbish bin") message:message delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"ok", nil), nil];
+    UIAlertView *removeAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"moveToTheRubbishBin", nil) message:message delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"ok", nil), nil];
     removeAlertView.tag = 1;
     [removeAlertView show];
 }

iMEGA/Camera uploads/PhotosViewController.m

@@ -242,9 +242,9 @@ - (IBAction)copyNode:(UIBarButtonItem *)sender {
 }
 
 - (IBAction)newFolder:(UIBarButtonItem *)sender {
-    folderAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"newFolder", @"New Folder") message:AMLocalizedString(@"newFolderMessage", @"Name for the new folder") delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"createFolderButton", @"Create"), nil];
+    folderAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"newFolder", @"New Folder") message:nil delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"createFolderButton", @"Create"), nil];
     [folderAlertView setAlertViewStyle:UIAlertViewStylePlainTextInput];
-    [folderAlertView textFieldAtIndex:0].text = @"";
+    [folderAlertView textFieldAtIndex:0].text = AMLocalizedString(@"newFolderMessage", nil);
     [folderAlertView show];
     [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillResignActiveNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notification) {
         [folderAlertView dismissWithClickedButtonIndex:0 animated:NO];

iMEGA/Cloud drive/BrowserViewController.m

@@ -513,10 +513,10 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                     [self presentViewController:previewController animated:YES completion:nil];
                 } else {
                     if ([[[[MEGASdkManager sharedMEGASdk] transfers] size] integerValue] > 0) {
-                        UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"There are pending downloads"
-                                                                            message:@"Try later or cancel the pending downloads"
+                        UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"documentOpening_alertTitle", nil)
+                                                                            message:AMLocalizedString(@"documentOpening_alertMessage", nil)
                                                                            delegate:nil
-                                                                  cancelButtonTitle:@"ok"
+                                                                  cancelButtonTitle:AMLocalizedString(@"ok", nil)
                                                                   otherButtonTitles:nil, nil];
                         [alertView show];
                     } else {
@@ -774,7 +774,7 @@ - (NSAttributedString *)descriptionForEmptyDataSet:(UIScrollView *)scrollView {
 
             case DisplayModeRubbishBin:
                 if ([self.parentNode type] == MEGANodeTypeRubbish) {
-                    text = AMLocalizedString(@"cloudDriveEmptyState_textRubbishBin",  @"Awesome!");
+                    text = AMLocalizedString(@"awesome",  nil);
                 } else {
                     text = @"";
                 }
@@ -854,12 +854,12 @@ - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger
         //New folder
         case 0:
             folderAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"newFolder", @"New Folder")
-                                                         message:AMLocalizedString(@"newFolderMessage", @"Name for the new folder")
+                                                         message:nil
                                                         delegate:self
                                                cancelButtonTitle:AMLocalizedString(@"cancel", nil)
                                                otherButtonTitles:AMLocalizedString(@"createFolderButton", @"Create"), nil];
             [folderAlertView setAlertViewStyle:UIAlertViewStylePlainTextInput];
-            [folderAlertView textFieldAtIndex:0].text = @"";
+            [folderAlertView textFieldAtIndex:0].text = AMLocalizedString(@"newFolderMessage", nil);
             folderAlertView.tag = 1;
             [folderAlertView show];
             break;
@@ -1456,8 +1456,7 @@ - (IBAction)optionAdd:(id)sender {
                                                   delegate:self
                                          cancelButtonTitle:AMLocalizedString(@"cancel", nil)
                                     destructiveButtonTitle:nil
-                                         otherButtonTitles:AMLocalizedString(@"newFolder", @"New Folder"), AMLocalizedString(@"choosePhotoVideo", @"Choose"), AMLocalizedString(@"capturePhotoVideo", @"Capture"), @"Upload a file", nil];
-    
+                                         otherButtonTitles:AMLocalizedString(@"newFolder", @"New Folder"), AMLocalizedString(@"choosePhotoVideo", @"Choose"), AMLocalizedString(@"capturePhotoVideo", @"Capture"), AMLocalizedString(@"uploadFrom", @"Option given on the `Add` section to allow the user upload something from another cloud storage provider."), nil];
     } else {
         actionSheet = [[UIActionSheet alloc] initWithTitle:nil
                                                   delegate:self
@@ -1569,7 +1568,7 @@ - (IBAction)deleteAction:(UIBarButtonItem *)sender {
                 }
             }
 
-            removeAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"moveNodeToRubbishBinTitle", @"Remove node from rubbish bin") message:message delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"ok", nil), nil];
+            removeAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"moveToTheRubbishBin", nil) message:message delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"ok", nil), nil];
         } else {
             NSString *message;
             if (files == 0) {

iMEGA/Cloud drive/CloudDriveTableViewController.m

@@ -241,7 +241,7 @@ - (void)delete {
 
             //Move to rubbish bin
             if (self.displayMode == DisplayModeCloudDrive) {
-                removeAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"moveNodeToRubbishBinTitle", @"Remove node") message:AMLocalizedString(@"moveNodeToRubbishBinMessage", @"Are you sure?") delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"ok", nil), nil];
+                removeAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"moveToTheRubbishBin", nil) message:AMLocalizedString(@"moveNodeToRubbishBinMessage", @"Are you sure?") delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"ok", nil), nil];
             }
 
             [removeAlertView setTag:1];

iMEGA/Cloud drive/DetailsNodeInfoViewController.m

@@ -464,9 +464,9 @@ - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger
     switch (actionSheet.tag) {
         case 0: {
             if (buttonIndex == 0) {
-                emailAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"contactTitle", nil) message:AMLocalizedString(@"contactMessage", nil) delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"addContactButton", nil), nil];
+                emailAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"contactTitle", nil) message:nil delegate:self cancelButtonTitle:AMLocalizedString(@"cancel", nil) otherButtonTitles:AMLocalizedString(@"addContactButton", nil), nil];
                 [emailAlertView setAlertViewStyle:UIAlertViewStylePlainTextInput];
-                [emailAlertView textFieldAtIndex:0].text = @"";
+                [emailAlertView textFieldAtIndex:0].placeholder = AMLocalizedString(@"contactEmail", nil);
                 emailAlertView.tag = 0;
                 [emailAlertView show];
             } else if (buttonIndex == 1) {
@@ -540,7 +540,7 @@ - (BOOL)peoplePickerNavigationController:(ABPeoplePickerNavigationController *)p
     if (email) {
         [[MEGASdkManager sharedMEGASdk] addContactWithEmail:email delegate:self];
     } else {
-        UIAlertView *noEmailAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"contactWithoutEmailTitle", nil) message:AMLocalizedString(@"contactWithoutEmailMessage", nil) delegate:self cancelButtonTitle:AMLocalizedString(@"ok", nil) otherButtonTitles:nil, nil];
+        UIAlertView *noEmailAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"contactWithoutEmail", nil) message:nil delegate:self cancelButtonTitle:AMLocalizedString(@"ok", nil) otherButtonTitles:nil, nil];
         noEmailAlertView.tag = 2;
         [noEmailAlertView show];
     }
@@ -568,7 +568,7 @@ - (void)peoplePickerNavigationController:(ABPeoplePickerNavigationController *)p
     if (email) {
         [[MEGASdkManager sharedMEGASdk] addContactWithEmail:email delegate:self];
     } else {
-        UIAlertView *noEmailAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"contactWithoutEmailTitle", nil) message:AMLocalizedString(@"contactWithoutEmailMessage", nil) delegate:self cancelButtonTitle:AMLocalizedString(@"ok", nil) otherButtonTitles:nil, nil];
+        UIAlertView *noEmailAlertView = [[UIAlertView alloc] initWithTitle:AMLocalizedString(@"contactWithoutEmail", nil) message:nil delegate:self cancelButtonTitle:AMLocalizedString(@"ok", nil) otherButtonTitles:nil, nil];
         noEmailAlertView.tag = 2;
         [noEmailAlertView show];
     }
@@ -652,7 +652,7 @@ - (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView {
 - (void)onRequestStart:(MEGASdk *)api request:(MEGARequest *)request {
     switch ([request type]) {
         case MEGARequestTypeAddContact:
-            [SVProgressHUD showWithStatus:AMLocalizedString(@"adding", nil)];
+            [SVProgressHUD show];
             break;
 
         default:
@@ -689,7 +689,7 @@ - (void)onRequestFinish:(MEGASdk *)api request:(MEGARequest *)request error:(MEG
         }
 
         case MEGARequestTypeAddContact:
-            [SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"added", nil)];
+            [SVProgressHUD showSuccessWithStatus:AMLocalizedString(@"contactAdded", nil)];
             break;
 
         case MEGARequestTypeRemoveContact: {

iMEGA/Contacts/ContactsViewController.m

@@ -2,17 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "checkBoxOff.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "[email protected]"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "checkboxNull.pdf"
     }
   ],
   "info" : {