Browse Source

remove old Strings

Marino Faggiana 7 years ago
parent
commit
2eef0759b7

+ 1 - 1
iOSClient/Create/CCCreateCloud.swift

@@ -127,7 +127,7 @@ class CreateMenuAdd: NSObject {
             appDelegate.activeMain.returnCreate(Int(k_returnCreateFolderEncrypted))
         })
 
-        actionSheet.addButton(withTitle: NSLocalizedString("_upload_plain_mode", comment: ""), image: UIImage(named: "menuUploadPlainMode"), backgroundColor: colorLightGray, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
+        actionSheet.addButton(withTitle: NSLocalizedString("_upload_plain_mode_", comment: ""), image: UIImage(named: "menuUploadPlainMode"), backgroundColor: colorLightGray, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
             self.createMenuPlain(view: view)
         })
         

+ 1 - 63
iOSClient/Main/CCMain.m

@@ -3242,23 +3242,6 @@
             [self moveOpenWindow:[self.tableView indexPathsForSelectedRows]];
     }];
     
-    /*
-    if (app.isCryptoCloudMode) {
-    
-        // ITEM ENCRYPTED ------------------------------------------------------------------------------------------------------
-    
-        app.encryptItem = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_encrypted_selected_files_", nil) subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"encryptedSelectedFiles"] color:[NCBrandColor sharedInstance].brand] highlightedImage:nil action:^(REMenuItem *item) {
-                [self performSelector:@selector(encryptedSelectedFiles) withObject:nil];
-        }];
-    
-        // ITEM DECRYPTED ----------------------------------------------------------------------------------------------------
-    
-        app.decryptItem = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_decrypted_selected_files_", nil) subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"decryptedSelectedFiles"] color:[NCBrandColor sharedInstance].brand] highlightedImage:nil action:^(REMenuItem *item) {
-                [self performSelector:@selector(decryptedSelectedFiles) withObject:nil];
-        }];
-    }
-    */
-    
     // ITEM DOWNLOAD ----------------------------------------------------------------------------------------------------
     
     app.downloadItem = [[REMenuItem alloc] initWithTitle:NSLocalizedString(@"_download_selected_files_folders_", nil) subtitle:@"" image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"downloadSelectedFiles"] color:[NCBrandColor sharedInstance].brand] highlightedImage:nil action:^(REMenuItem *item) {
@@ -3271,16 +3254,6 @@
             [self saveSelectedFiles];
     }];
 
-    // REMENU --------------------------------------------------------------------------------------------------------------
-    
-    /*
-    if (app.isCryptoCloudMode) {
-        app.reSelectMenu = [[REMenu alloc] initWithItems:@[app.deleteItem,app.moveItem, app.encryptItem, app.decryptItem, app.downloadItem, app.saveItem]];
-    } else {
-        app.reSelectMenu = [[REMenu alloc] initWithItems:@[app.deleteItem,app.moveItem, app.downloadItem, app.saveItem]];
-    }
-    */
-    
     app.reSelectMenu = [[REMenu alloc] initWithItems:@[app.deleteItem,app.moveItem, app.downloadItem, app.saveItem]];
 
     app.reSelectMenu.imageOffset = CGSizeMake(5, -1);
@@ -3872,9 +3845,7 @@
     NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID];
     if (!serverUrl) return;
     
-    NSString *titoloCriptaDecripta, *titoloLock, *titleFavorite;
-    
-    titoloCriptaDecripta = [NSString stringWithFormat:NSLocalizedString(@"_encrypt_", nil)];
+    NSString *titoloLock, *titleFavorite;
     
     if (_metadata.favorite) {
         
@@ -4177,39 +4148,6 @@
                                     }];
         }
         
-        /*
-        if (app.isCryptoCloudMode) {
-            
-            [actionSheet addButtonWithTitle:titoloCriptaDecripta
-                                      image:[UIImage imageNamed:@"actionSheetCrypto"]
-                            backgroundColor:[UIColor whiteColor]
-                                     height: 50.0
-                                       type:AHKActionSheetButtonTypeEncrypted
-                                    handler:^(AHKActionSheet *as) {
-                                        
-                                        [self performSelector:@selector(cmdEncryptedDecryptedFile) withObject:nil];
-                                    }];
-        }
-        */
-        
-#ifdef DEBUG
-        
-        /*
-        [actionSheet addButtonWithTitle:@"Hide file"
-                                  image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"admin"] color:[NCBrandColor sharedInstance].brand]
-                        backgroundColor:[UIColor whiteColor]
-                                 height: 50.0
-                                   type:AHKActionSheetButtonTypeDefault
-                                handler:^(AHKActionSheet *as) {
-                                    
-                                    [[NCManageDatabase sharedInstance] setMetadataStatusWithFileID:_metadata.fileID status:k_metadataStatusHide];
-                                    
-                                    [self reloadDatasource];
-                                }];
-        */ 
-        
-#endif
-
         [actionSheet show];
     }
 }

+ 1 - 1
iOSClient/Settings/NCManageEndToEndEncryption.m

@@ -283,7 +283,7 @@
     [aViewController dismissViewControllerAnimated:YES completion:nil];
     
     NSString *e2ePassphrase = [CCUtility getEndToEndPassphrase:app.activeAccount];
-    NSLog(@"Passphrase: %@", e2ePassphrase);
+    NSLog(@"[LOG] Passphrase: %@", e2ePassphrase);
     
     NSString *message = [NSString stringWithFormat:@"\n%@\n\n\n%@", NSLocalizedString(@"_e2e_settings_the_passphrase_is_", nil), e2ePassphrase];
     

+ 2 - 104
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -11,7 +11,6 @@
 "_cancel_"                  = "Cancel";
 "_upload_file_"             = "Upload file";
 "_download_file_"           = "Download file";
-"_upload_encrypted_file_"   = "Upload encrypted file";
 "_loading_"                 = "Loading";
 "_loading_with_points_"     = "Loading…";
 "_loading_num_"             = "Loading file %i";
@@ -29,13 +28,12 @@
 "_add_"                     = "Add";
 "_login_"                   = "Login";
 "_save_"                    = "Save";
-"_save_encrypted_"          = "Save encrypted";
 "_warning_"                 = "Warning";
 "_error_"                   = "Error";
 "_no_"                      = "No";
 "_yes_"                     = "Yes";
 "_select_"                  = "Select";
-"_crypto_cloud_upload_"     = "Upload";
+"_upload_"                  = "Upload";
 "_home_"                    = "Files";
 "_file_to_upload_"          = "File to upload";
 "_destination_"             = "Destination";
@@ -48,6 +46,7 @@
 "_scan_fingerprint_"        = "Scan fingerprint to authenticate";
 "_no_active_account_"       = "No account found";
 "_info_"                    = "Info";
+"_email_"                   = "Email";
 "_save_exit_"               = "Do you want to exit without saving?";
 "_video_"                   = "Video";
 "_overwrite_"               = "Overwrite";
@@ -72,7 +71,6 @@
 
 // App
 
-"_synchronization_header_"  = "Synchronization of encrypted header in progress…";
 "_network_available_"       = "Network available";
 "_network_not_available_"   = "Network not available";
 
@@ -135,11 +133,6 @@
 "_optimizations_"           = "Optimizations";
 "_synchronizations_"        = "Synchronized folders";
 "_version_server_"          = "Server version";
-"_check_key_aes_256_"       = "Manage encryption key passcode";
-"_encryptpass_by_email_"    = "Send by email";
-"_title_mail_encryptpass_"  = "Encryption Key Passcode Nextcloud";
-"_text1_mail_encryptpass_"  = "Your encryption key passcode is";
-"_text2_mail_encryptpass_"  = "store it securely and away from prying eyes.";
 "_help_"                    = "Help";
 "_lock_protection_simply_"  = "Weak password protection";
 "_change_simply_passcode_"  = "Change password type";
@@ -186,15 +179,6 @@
 "_autoupload_format_compatibility_" = "Most Compatible";
 "_autoupload_format_compatibility_footer_" = "\"Most compatible\" will always save photos as JPEG";
 
-// Manage Crypto Cloud
-
-"_crypto_cloud_system_"             = "Crypto Cloud System";
-"_alert_activation_crypto_cloud_"   = "Crypto Cloud System activated";
-"_alert_deactivation_crypto_cloud_" = "Crypto Cloud System deactivated";
-"_activation_crypto_cloud_"         = "Activation of Crypto Cloud System";
-"_deactivation_crypto_cloud_"       = "Deactivation of 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 Help
 
 "_help_tutorial_"               = "Tutorial";
@@ -217,14 +201,7 @@
 "_connect_server_anyway_"       = "Do you want to connect to the server anyway?";
 "_connection_error_"            = "Connection error";
 "_add_your_nextcloud_"          = "Add your Nextcloud account";
-"_key_aes_256_"                 = "Encryption key passcode";
 "_login_url_"                   = "Server address https://…";
-
-"_security_init_required_hint_" = "Hint for encryption key passcode (recommended)";
-"_hint_"                        = "Hint";
-"_security_init_required_mail_" = "Enter your email address to receive the encryption key passcode (recommended).";
-"_email_"                       = "Email";
-"_title_form_security_init_"    = "Security options";
 "_login_bottom_label_"          = "Don't have a server yet?\nChoose one of the providers.";
 "_error_multidomain_"           = "Address not allowed, only the following domains are valid:";
 "_account_already_exists_"      = "The account %@ already exists";
@@ -261,55 +238,6 @@
 "_error_createsubfolders_upload_"           = "Error creating subfolders";
 "_activate_autoupload_"                     = "Enable auto upload";
 
-// Template
-
-"_title_"                       = "Title";
-"_web_account_data_"            = "Web account data";
-"_url:_"                        = "URL:";
-"_login:_"                      = "Login:";
-"_password:_"                   = "Password:";
-"_notes_"                       = "Notes";
-"_web_account_"                 = "Web account";
-"_enter_title_"                 = "Enter title";
-"_add_folder_"                  = "Add folder";
-"_add_photos_videos_"           = "Add photos or videos";
-"_add_folder_encryptated_"      = "Add folder with encrypted name";
-"_add_encrypted_photo_video_"   = "Add encrypted photos or videos";
-"_add_credit_card_"             = "Add template for payment card";
-"_add_atm_"                     = "Add template for ATM card";
-"_add_bank_account_"            = "Add template for bank account";
-"_add_web_account_"             = "Add web account";
-"_add_notes_"                   = "Add notes";
-"_add_driving_license_"         = "Add driving license template";
-"_add_id_card_"                 = "Add ID card template";
-"_add_passport_"                = "Add passport template";
-"_add_atm_card_"                = "ATM card data";
-"_bank_name:_"                  = "Bank name:";
-"_code:_"                       = "Code:";
-"_security_code:_"              = "Security code:";
-"_pin:_"                        = "PIN:";
-"_atm_card_"                    = "ATM card";
-"_credi_card_data_"             = "Payment card data";
-"_name_surname:_"               = "Name Surname:";
-"_expiry_date:_"                = "Expiry date:";
-"_credit_card_"                 = "Payment card";
-"_id_card_"                     = "ID Card";
-"_number:_"                     = "Number:";
-"_place_of_birth:_"             = "Place of birth:";
-"_date_of_birth:_"              = "Date of birth:";
-"_date_of_issue:_"              = "Date of issue:";
-"_date_of_expiry:_"             = "Date of expiry:";
-"_bank_account_data_"           = "Bank account data";
-"_account_n:_"                  = "Account N.:";
-"_iban:_"                       = "IBAN:";
-"_swift:_"                      = "SWIFT:";
-"_agency:_"                     = "Agency:";
-"_bank_account_"                = "Bank account";
-"_passport_"                    = "Passport";
-"_driving_license_"             = "Driving license";
-"_license_number:_"             = "License number:";
-"_vehicle_types:_"              = "Vehicle types:";
-
 // Utility
 
 "_never_"                       = "never";
@@ -341,16 +269,11 @@
 "_current_sort_descending_"     = "(currently sorted descending)";
 "_delete_selected_files_"       = "Delete files";
 "_move_selected_files_"         = "Move files";
-"_encrypted_selected_files_"    = "Encrypted files";
-"_decrypted_selected_files_"    = "Decrypted files";
 "_download_selected_files_"     = "Download files";
 "_download_selected_files_folders_" = "Download files and folders";
-"_error_passcode_"              = "Error: Wrong passcode for encryption key.";
 "_error_operation_canc_"        = "Error: Operation canceled.";
 "_only_lock_passcode_"          = "Available only with Lock password activated. Activate it in the \"Settings\".";
 "_passcode_protection_"         = "Password protection";
-"_encrypt_"                     = "Encrypt";
-"_decrypt_"                     = "Decrypt";
 "_remove_favorites_"            = "Remove from favorites";
 "_remove_offline_"              = "Remove from offline";
 "_add_favorites_"               = "Add to favorites";
@@ -371,16 +294,12 @@
 "_file_"                        = "file";
 "_folder_blocked_"              = "Folder blocked";
 "_downloading_progress_"        = "Initiating download of files…";
-"_encrypted_progress_"          = "Encrypted…";
-"_decrypted_progress_"          = "Decrypted…";
 "_no_file_pull_down_"           = "Upload a file or pull down to refresh";
 "_browse_images_"               = "Browse images";
 "_synchronized_folder_"         = "Keep the folder synchronized";
 "_remove_synchronized_folder_"  = "Remove the synchronization";
 "_synchronized_confirm_"        = "After enabling the synchronization, all files in the folder will be synchronized with the server, continue?";
 "_offline_folder_confirm_"      = "After enabling the offline folder, all files in it will be synchronized with the server, continue?";
-"_same_device_different_passcode_"  = "The file was encrypted on the same device but with different passcode. Keep in mind that if the old passcode is entered, files encrypted with the new passcode will not be readable.";
-"_file_encrypted_another_device_"   = "The file was encrypted on another device [%@], enter the passcode to decrypt its content.";
 "_file_not_found_reload_"       = "File not found, pull down to refresh";
 "_title_section_download_"      = "DOWNLOAD";
 "_title_section_upload_"        = "UPLOAD";
@@ -397,8 +316,6 @@
 "_tite_footer_download_wwan_"   = "  Wi-Fi network required, %lu %@ to download";
 "_tite_footer_download_"        = "%lu %@ to download";
 "_limited_dimension_"           = "Maximum size reached";
-"_same_device_different_passcode_hint_" = "The file was encrypted by the same device but with different passcode key encryption. Attention: If the old passcode is entered, files encrypted with the new passcode will not be readable. \n\n Hint: %@";
-"_file_encrypted_another_device_hint_" = "The file was encrypted by another device [%@], enter the passcode key encryption to read its contents. \n\n Hint: %@";
 "_save_selected_files_"         = "Save images and videos to Photo Album";
 "_file_not_saved_cameraroll_"   = "Error: File not saved in Photo Album";
 "_file_saved_cameraroll_"       = "File saved in Photo Album";
@@ -419,16 +336,12 @@
 "unknow"                        = "UNKNOWN";
 "video"                         = "VIDEO";
 
-"_no_plist_pull_down_"          = "Encrypted files not updated, pull down to refresh";
 "_file_del_only_local_"         = "File not present on the server";
 
 "_copy_file_"                   = "Copy file";
 "_copy_files_"                  = "Copy files";
 "_paste_file_"                  = "Paste file";
-"_paste_file_encrypted_"        = "Paste encrypted file";
 "_paste_files_"                 = "Paste files";
-"_paste_files_encrypted_"       = "Paste encrypted files";
-"_paste_cryptated_"             = "Paste encrypted file";
 
 "_search_this_folder_"          = "Search in this folder";
 "_search_all_folders_"          = "Search in all folders";
@@ -436,18 +349,6 @@
 
 "_theming_is_light_"            = "Server theming too brightly coloured, not applicable";
 
-// Security
-
-"_reload_folder_"               = "Please reload folder";
-"_encrypt_error_"               = "During the encryption of file %@ an error occurred. [%@]";
-"_decrypt_error_"               = "During the decryption of file %@ an error occurred. [%@]";
-"_encryption_"                  = "Encrypting…";
-"_decryption_"                  = "Decrypting…";
-
-// CoreData
-
-"_required_new_database_"       = "Upgrade ready: Log in again in order to get a new version of the database.";
-
 // Files Preview
 
 "_insert_password_pfd_"         = "Secured PDF. Enter password";
@@ -536,9 +437,6 @@
 
 "_upload_photos_videos_"            = "Upload photos or videos";
 "_upload_file_"                     = "Upload file";
-"_upload_encrypted_mode"            = "Switch to encrypted mode";
-"_upload_template_"                 = "Upload template";
-"_upload_plain_mode"                = "Switch to plain mode";
 "_upload_file_text_"                = "Create text file";
 
 // Document Picker

+ 1 - 1
iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -39,7 +39,7 @@
     [super viewDidLoad];
     
     self.navigationItem.rightBarButtonItem.title = NSLocalizedString(@"_cancel_", nil);
-    self.title = NSLocalizedString(@"_crypto_cloud_upload_", nil);
+    self.title = NSLocalizedString(@"_upload_", nil);
     
     serverUrlLocal= [CCUtility getHomeServerUrlActiveUrl:app.activeUrl];
     destinationTitle = NSLocalizedString(@"_home_", nil);