change strings

Picker/DocumentPickerViewController.swift

@@ -186,7 +186,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         }
         
         if CCUtility.getOnlyLockDir() == false && parameterPasscodeCorrect == false {
-            openBKPasscode("Nextcloud")
+            openBKPasscode(_brand_)
         }
     }
     

Picker/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.17</string>
 	<key>CFBundleVersion</key>
-	<string>00028</string>
+	<string>00029</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

PickerFileProvider/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.17</string>
 	<key>CFBundleVersion</key>
-	<string>00028</string>
+	<string>00029</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionFileProviderDocumentGroup</key>

Share Ext/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>00028</string>
+	<string>00029</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

Share Ext/ShareViewController.m

@@ -197,7 +197,7 @@
     // Title
     [self.navigationController.navigationBar setTitleTextAttributes: @{NSForegroundColorAttributeName:self.navigationController.navigationBar.tintColor}];
     
-    self.navigationItem.title = @"Nextcloud";
+    self.navigationItem.title = _brand_;
     self.navigationItem.leftBarButtonItem = leftButtonCancel;
     self.navigationItem.rightBarButtonItems = [[NSArray alloc] initWithObjects:rightButtonUpload, rightButtonEncrypt, nil];
     self.navigationItem.hidesBackButton = YES;
@@ -373,7 +373,7 @@
     BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:BKPasscodeKeychainServiceName];
     touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
     viewController.touchIDManager = touchIDManager;
-    viewController.title = @"Nextcloud";
+    viewController.title = _brand_;
     viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
     viewController.navigationItem.leftBarButtonItem.tintColor = COLOR_CRYPTOCLOUD;
     

iOSClient/Info.plist

@@ -69,7 +69,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>00028</string>
+	<string>00029</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>

iOSClient/Login/CCLogin.storyboard

@@ -75,7 +75,7 @@
                                     <constraint firstAttribute="width" constant="25" id="glL-CW-aF0"/>
                                 </constraints>
                             </imageView>
-                            <textField opaque="NO" clipsSubviews="YES" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="https://nextcloud.yourdomain.com" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="szn-G7-5sK">
+                            <textField opaque="NO" clipsSubviews="YES" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="https://www.yourdomain.com" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="szn-G7-5sK">
                                 <rect key="frame" x="50" y="158" width="273" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="I2v-Zr-IWf"/>

iOSClient/Networking/OCNetworking.m

@@ -1260,7 +1260,7 @@
         } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
            
 #if !defined(EXTENSION) && defined(DEBUG)
-            [app messageNotification:@"Subscribing Nextcloud Server Proxy Push Error" description:[error.userInfo valueForKey:@"NSLocalizedDescription"] visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
+            [app messageNotification:@"Subscribing Server Proxy Push Error" description:[error.userInfo valueForKey:@"NSLocalizedDescription"] visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
 
             NSInteger errorCode = response.statusCode;
@@ -1277,7 +1277,7 @@
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
 #if !defined(EXTENSION) && defined(DEBUG)
-        [app messageNotification:@"Subscribing Nextcloud Server Push Error" description:[error.userInfo valueForKey:@"NSLocalizedDescription"] visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"Subscribing Server Push Error" description:[error.userInfo valueForKey:@"NSLocalizedDescription"] visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
         
         NSInteger errorCode = response.statusCode;

iOSClient/Settings/CCSettings.m

@@ -697,7 +697,7 @@
     // Email Recipents
     NSArray *toRecipents;
     
-    messageBody = [NSString stringWithFormat:@"\n\n\nNextcloud Version %@ (%@)", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"], [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
+    messageBody = [NSString stringWithFormat:@"\n\n\n%@ Version %@ (%@)", _brand_,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"], [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
     toRecipents = [NSArray arrayWithObject:_mail_me_];
     
     MFMailComposeViewController *mc = [[MFMailComposeViewController alloc] init];

iOSClient/en.lproj/Intro.strings

@@ -12,7 +12,7 @@
 "_intro_1_text_"    = "Access, share and protect your files at home and in your enterprise";
 
 "_intro_2_title_"   = "Multi account";
-"_intro_2_text_"    = "Connect to all your clouds and touch Nextcloud logo to quickly switch";
+"_intro_2_text_"    = "Connect to all your clouds and touch _brand_ logo to quickly switch";
 
 "_intro_3_title_"   = "Control Center";
 "_intro_3_text_"    = "Slide your finger from the title bar downwards to see all the upload and download underway and swipe left to see the last Activities";

iOSClient/pt-BR.lproj/BKPasscodeView.strings

@@ -0,0 +1,47 @@
+/*
+  BKPasscodeView.strings
+  Crypto Cloud - Nextcloud
+
+  Created by Marino Faggiana on 25/11/14.
+  Copyright (c) 2016 TWS. All rights reserved.
+*/
+
+"%d Failed Passcode Attempts" = "%d failed passcode attempts";
+"%d Failed Password Attempts" = "%d failed password attempts";
+
+"1 Failed Passcode Attempt" = "1 failed passcode attempt";
+"1 Failed Password Attempt" = "1 failed password attempt";
+
+"Do you want to use Touch ID for authentication?" = "Do you want to use Touch ID for authentication?";
+
+"Done" = "Done";
+
+"Enable Touch ID" = "Enable Touch ID";
+
+"Enter a different passcode. Cannot re-use the same passcode." = "Enter a different passcode. Cannot re-use the same passcode.";
+"Enter a different password. Cannot re-use the same password." = "Enter a different password. Cannot re-use the same password.";
+
+"Enter a passcode" = "Enter a passcode";
+"Enter a password" = "Enter a password";
+
+"Enter your new passcode" = "Enter your new passcode";
+"Enter your new password" = "Enter your new password";
+
+"Enter your old passcode" = "Enter your old passcode";
+"Enter your old password" = "Enter your old password";
+
+"Enter your passcode" = "Enter your passcode";
+"Enter your password" = "Enter your password";
+
+"Invalid Passcode" = "Invalid passcode";
+"Invalid Password" = "Invalid password";
+
+"Passcodes did not match.\nTry again." = "Passcodes did not match.\nTry again.";
+"Password did not match.\nTry again." = "Password did not match.\nTry again.";
+
+"Re-enter your passcode" = "Re-enter your passcode";
+"Re-enter your password" = "Re-enter your password";
+
+"Try again in %d minutes" = "Try again in %d minutes";
+
+"Try again in 1 minute" = "Try again in 1 minute";