Răsfoiți Sursa

changes due to CR

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
tobiaskaminsky 7 ani în urmă
părinte
comite
45b9f9f7c7

+ 0 - 1
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -76,7 +76,6 @@ import com.owncloud.android.lib.resources.files.ToggleEncryptionOperation;
 import com.owncloud.android.lib.resources.files.ToggleFavoriteOperation;
 import com.owncloud.android.lib.resources.shares.GetRemoteSharesOperation;
 import com.owncloud.android.lib.resources.status.OCCapability;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.FolderPickerActivity;

+ 1 - 1
src/main/res/values/strings.xml

@@ -763,7 +763,7 @@
     <string name="end_to_end_encryption_title">Set up encryption</string>
     <string name="end_to_end_encryption_passphrase_title">Make note of your 12 word encryption password</string>
     <string name="end_to_end_encryption_not_supported">Encryption only works on KitKat(4.4) and beyond.</string>
-    <string name="end_to_end_encryption_not_enabled">End to end encryption not enabled on server.</string>
+    <string name="end_to_end_encryption_not_enabled">End to end encryption disabled on server.</string>
     <string name="end_to_end_encryption_confirm_button">Set up encryption</string>
     <string name="end_to_end_encryption_password">Password&#8230;</string>
     <string name="end_to_end_encryption_unsuccessful">Could not save keys, please try again.</string>