change string language auto upload

iOSClient/Create/CCCreateCloud.swift

@@ -266,7 +266,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         row.value = 0
         section.addFormRow(row)
         
-        row = XLFormRowDescriptor(tag: "useSubFolder", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_upload_camera_create_subfolder_", comment: ""))
+        row = XLFormRowDescriptor(tag: "useSubFolder", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_autoupload_create_subfolder_", comment: ""))
         row.hidden = "$\("useFolderPhoto") == 0"
         
         let tableAccount = NCManageDatabase.sharedInstance.getAccountActive()

iOSClient/PhotosCameraUpload/CCPhotos.m

@@ -273,7 +273,7 @@
     if (account.autoUpload)
         text = [NSString stringWithFormat:@"%@", @"\n\n\n\n"];
     else
-        text = [NSString stringWithFormat:@"\n%@\n", NSLocalizedString(@"_tutorial_camera_upload_view_", nil)];
+        text = [NSString stringWithFormat:@"\n%@\n", NSLocalizedString(@"_tutorial_autoupload_view_", nil)];
     
     NSDictionary *attributes = @{NSFontAttributeName: [UIFont systemFontOfSize:14.0], NSForegroundColorAttributeName: [UIColor lightGrayColor], NSParagraphStyleAttributeName: paragraph};
 
@@ -288,7 +288,7 @@
     
         UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"button"] color:[NCBrandColor sharedInstance].brand];
         
-        return [CCUtility drawText:NSLocalizedString(@"_activate_camera_upload_", nil) inImage:buttonImage colorText:[UIColor whiteColor]];
+        return [CCUtility drawText:NSLocalizedString(@"_activate_autoupload_", nil) inImage:buttonImage colorText:[UIColor whiteColor]];
         
     } else return nil;
 }

iOSClient/Settings/CCManageAutoUpload.m

@@ -64,7 +64,7 @@
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeTheming) name:@"changeTheming" object:nil];
     
-    form = [XLFormDescriptor formDescriptorWithTitle:NSLocalizedString(@"_uploading_from_camera_", nil)];
+    form = [XLFormDescriptor formDescriptorWithTitle:NSLocalizedString(@"_settings_autoupload_", nil)];
     
     // Auto Upload
     
@@ -72,7 +72,7 @@
     [form addFormSection:section];
     section.footerTitle = NSLocalizedString(@"_photo_folder_photocamera_", nil);
 
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUpload" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_camera_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUpload" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_autoupload_", nil)];
     
     if (tableAccount.autoUpload) row.value = @1;
     else row.value = @0;
@@ -84,7 +84,7 @@
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadPhoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_foto_camera_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadPhoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_autoupload_photos_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
     if (tableAccount.autoUploadPhoto) row.value = @1;
     else row.value = @0;
@@ -103,7 +103,7 @@
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadVideo" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_video_camera_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadVideo" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_autoupload_videos_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
     if (tableAccount.autoUploadVideo) row.value = @1;
     else row.value = @0;
@@ -122,7 +122,7 @@
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
 
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadBackground" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_camera_background_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadBackground" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_autoupload_background_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
     if (tableAccount.autoUploadBackground) row.value = @1;
     else row.value = @0;
@@ -133,7 +133,7 @@
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
-    NSString *title = NSLocalizedString(@"_upload_camera_fullphotos_", nil);
+    NSString *title = NSLocalizedString(@"_autoupload_fullphotos_", nil);
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadFull" rowType:XLFormRowDescriptorTypeBooleanSwitch title:title];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
     row.value = 0;
@@ -147,7 +147,7 @@
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadCreateSubfolder" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_camera_create_subfolder_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadCreateSubfolder" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_autoupload_create_subfolder_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
     if (tableAccount.autoUploadCreateSubfolder) row.value = @1;
     else row.value = @0;
@@ -254,7 +254,7 @@
                 
             if(isLocationIsEnabled == YES) {
                     
-                UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_cameraupload_background_title_", nil) message:[CCUtility localizableBrand:@"_cameraupload_background_msg_" table:nil] delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"_ok_", nil), nil];
+                UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_autoupload_background_title_", nil) message:[CCUtility localizableBrand:@"_autoupload_background_msg_" table:nil] delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"_ok_", nil), nil];
                 [alertView show];
                     
                 [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:YES];
@@ -410,26 +410,26 @@
     switch (section)
     {
         case 0:
-            sectionName = NSLocalizedString(@"_uploading_from_camera_", nil);
+            sectionName = NSLocalizedString(@"_settings_autoupload_", nil);
             break;
         case 1:
-            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_upload_automatic_photos_", nil);
+            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_autoupload_photos_", nil);
             else sectionName = @"";
             break;
         case 2:
-            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_upload_automatic_videos_", nil);
+            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_autoupload_videos_", nil);
             else sectionName = @"";
             break;
         case 3:
-            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_upload_camera_background_", nil);
+            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_autoupload_background_", nil);
             else sectionName = @"";
             break;
         case 4:
-            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_upload_camera_fullphotos_", nil);
+            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_autoupload_fullphotos_", nil);
             else sectionName = @"";
             break;
         case 5:
-            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_upload_camera_create_subfolder_", nil);
+            if (tableAccount.autoUpload) sectionName = NSLocalizedString(@"_autoupload_create_subfolder_", nil);
             else sectionName = @"";
             break;
     }
@@ -451,11 +451,11 @@
             else sectionName = @"";
             break;
         case 4:
-            if (tableAccount.autoUpload) sectionName =  [CCUtility localizableBrand:@"_upload_camera_fullphotos_footer_" table:nil];
+            if (tableAccount.autoUpload) sectionName =  [CCUtility localizableBrand:@"_autoupload_fullphotos_footer_" table:nil];
             else sectionName = @"";
             break;
         case 5:
-            if (tableAccount.autoUpload) sectionName =  [CCUtility localizableBrand:@"_upload_camera_create_subfolder_footer_" table:nil];
+            if (tableAccount.autoUpload) sectionName =  [CCUtility localizableBrand:@"_autoupload_create_subfolder_footer_" table:nil];
             else sectionName = @"";
             break;
     }

iOSClient/Settings/CCSettings.m

@@ -66,7 +66,7 @@
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUpload" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_uploading_from_camera_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUpload" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_settings_autoupload_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:@"settingsCameraUpload"] forKey:@"imageView.image"];
     row.action.formSegueIdentifier = @"CCManageAutoUploadSegue";

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -14,7 +14,7 @@
 "_upload_encrypted_file_"   = "Upload encrypted file";
 "_loading_"                 = "Loading";
 "_loading_num_"             = "Loading file %i";
-"_loading_camera_upload_"   = "Automatic uploading";
+"_loading_autoupload_"      = "Auto uploading";
 "_uploading_"               = "Uploading";
 "_synchronization_"         = "Synchronization";
 "_delete_"                  = "Delete";
@@ -95,7 +95,7 @@
 "_username_"                = "Username";
 "_change_credentials_"      = "Change your credentials";
 "_wifi_only_"               = "Only use Wi-Fi connection";
-"_uploading_from_camera_"   = "Automatic upload of camera images";
+"_settings_autoupload_"     = "Auto upload";
 "_app_version_"             = "Application version";
 "_app_in_use_"              = "Application in use";
 "_contact_by_email_"        = "Contact us by email";
@@ -150,30 +150,27 @@
 "_favorite_offline_footer_" = "Making all favorites available offline may take a long time with a high memory occupation.";
 "_advanced_"                = "Advanced";
 
-// Manage Camera Upload
-
-"_upload_camera_"           = "Upload camera photos/videos";
-"_upload_camera_background_"= "Upload images in the background";
-"_upload_foto_camera_"      = "Upload camera photos";
-"_upload_encry_camup_"      = "Upload encrypted files";
-"_upload_video_camera_"     = "Upload camera videos";
-"_upload_automatic_photos_" = "Upload camera photos automatically";
-"_upload_automatic_videos_" = "Upload camera videos automatically";
-"_photo_folder_photocamera_"= "The photos will be uploaded to the folder 'photos' in your Cloud";
-"_photo_folder_background_"         = "This option requires the use of GPS to trigger the detection of new photos in the camera roll once the location changes significantly";
-"_cameraupload_background_title_"   = "Limitations";
-"_cameraupload_background_msg_"     = "Due to IOS restrictions, it is not yet possible to perform background processes, unless GPS services are activated. Once the cell in the cellular network is changed, the system wakes up _brand_ for a short time and checks for new photos to upload to the cloud.";
-"_upload_camera_change_location_"   = "Change folder";
-"_upload_camera_location_now_"      = "Folder";
-"_upload_camera_location_default_"  = "Restore default folder";
-"_upload_camera_change_location_footer_" = "Change Photos folder that is used for 'Automatic upload of camera photos' (if the option is enabled)";
-"_camera_upload_not_select_home_"   = "Select a folder";
-"_upload_camera_save_album_"        = "Copy photo or video in the photo album";
-"_upload_camera_save_album_footer_" = "After the automatic sending of the photo or video, a copy is saved in the photo album : _brand_ (does not require more space in the camera roll)";
-"_upload_camera_fullphotos_"        = "Upload all camera photos/videos";
-"_upload_camera_fullphotos_footer_" = "Select the options above before uploading";
-"_upload_camera_create_subfolder_" = "Use subfolders";
-"_upload_camera_create_subfolder_footer_" = "Store in subfolders based on year and month";
+// Manage AutoUpload
+
+"_autoupload_"                  = "Auto upload photos/videos";
+"_autoupload_background_"       = "Auto upload in the background";
+"_autoupload_photos_"           = "Auto upload photos";
+"_autoupload_videos_"           = "Auto upload videos";
+"_photo_folder_photocamera_"    = "The news photos/videos will be uploaded in your Cloud";
+"_photo_folder_background_"     = "This option requires the use of GPS to trigger the detection of new photos/videos in the camera roll once the location changes significantly";
+"_autoupload_background_title_" = "Limitations";
+"_autoupload_background_msg_"   = "Due to IOS restrictions, it is not yet possible to perform background processes, unless GPS services are activated. Once the cell in the cellular network is changed, the system wakes up _brand_ for a short time and checks for new photos to upload to the cloud.";
+"_autoupload_change_location_"  = "Change folder";
+"_autoupload_location_now_"     = "Folder";
+"_autoupload_location_default_" = "Restore default folder";
+"_autoupload_change_location_footer_" = "Change Photos folder that is used for 'Automatic upload of camera photos' (if the option is enabled)";
+"_autoupload_not_select_home_"  = "Select a folder";
+"_autoupload_save_album_"       = "Copy photo or video in the photo album";
+"_autoupload_save_album_footer_" = "After the automatic sending of the photo or video, a copy is saved in the photo album : _brand_ (does not require more space in the camera roll)";
+"_autoupload_fullphotos_"        = "Upload all camera roll";
+"_autoupload_fullphotos_footer_" = "Select the options above before uploading";
+"_autoupload_create_subfolder_" = "Use subfolders";
+"_autoupload_create_subfolder_footer_" = "Store in subfolders based on year and month";
 
 // Manage Crypto Cloud
 
@@ -184,10 +181,6 @@
 "_deactivation_crypto_cloud_"       = "Deactivation Crypto Cloud System";
 "_footer_crypto_cloud_"             = "Based on the encryption AES-256, Crypto Cloud System will enable you to store all your private data (documents, templates, photos, videos, etc…) in your Cloud, thus keeping them safe from possible 'prying eyes'.\n\nYou will be asked to enter a encryption key (minimum 4 characters, maximum 64 characters). You will never be able to retrieve it and your files will remain encrypted. Should you re-install Nextcloud or access to your data from another iOS system, use the same combination.\n\nAny file can be encrypted or decrypted. The name of folders containing your files can be encrypted as well (so as to hide any possible hint at their contents).\n\nAny kind of document, either in standard or in encrypted format, can be uploaded from Nextcloud onto your Cloud. All encrypted files and folders will be marked in orange colour. If they are in preview mode, they will be identified by a 3 bullets orange label instead.\n\nTemplates for recording your confidential data (note, payment card, ATM card, bank accounts, passwords to websites, etc…) are available and they can be saved in your Cloud in encrypted mode as well.\n\nActive/Disactive whenever you want, but remember to always use the same encryption key.\n\nAt the moment the encrypted files with Crypto Cloud System can be viewed only with iOS system.";
 
-// Manage Photos
-
-"_change_folder_photos_"        = "Change folder Photos";
-
 // Manage Help
 
 "_help_tutorial_"               = "Tutorial";
@@ -233,25 +226,24 @@
 "_favorite_no_files_"           = "No favorites yet";
 
 
-// Camera Upload
+// Auto Upload
 
 "_pull_down_"                               = "Pull down to refresh";
 "_no_photo_load_"                           = "No Photo or Video";
-"_tutorial_camera_upload_view_"             = "You can enable camera upload from the settings";
+"_tutorial_autoupload_view_"                = "You can enable auto upload from the settings";
 "_no_date_"                                 = "No date";
 "_today_"                                   = "Today";
 "_time_"                                    = "Time : %@\n\n%@";
 "_location_not_enabled_"                    = "Location Services not enabled";
-"_location_not_enabled_msg_"                = "Please go to Settings and turn on Location Services to allow automatic camera photo/video uploads.";
+"_location_not_enabled_msg_"                = "Please go to Settings and turn on Location Services to allow automatic photo/video uploads.";
 "_access_photo_not_enabled_"                = "Access to Photos not enabled";
-"_access_photo_not_enabled_msg_"            = "Please go to Settings and turn on Photo Access to allow automatic camera photo/video uploads.";
+"_access_photo_not_enabled_msg_"            = "Please go to Settings and turn on Photo Access to allow automatic photo/video uploads.";
 "_access_photo_location_not_enabled_"       = "Access to Photos and Location not enabled";
-"_access_photo_location_not_enabled_msg_"   = "Please go to Setting and turn on Photo Access and Location Services to allow automatic camera photo/video uploads.";
-"_processing_send_camera_upload_"           = "Uploading camera photo ...";
+"_access_photo_location_not_enabled_msg_"   = "Please go to Setting and turn on Photo Access and Location Services to allow automatic photo/video uploads.";
 "_tutorial_photo_view_"                     = "No photos or videos uploaded yet";
 "_create_full_upload_"                      = "Creating archive .. may take a long time, please wait";
 "_error_createsubfolders_upload_"           = "Error creating subfolders";
-"_activate_camera_upload_"                  = "Enable camera upload";
+"_activate_autoupload_"                     = "Enable auto upload";
 
 // Template