X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7c19fcdc94e44170c44b2a75267a8fe7cffcd7b1..244f3bd4e4d4dcb09be4eede2750cf2bd7670321:/res/values/strings.xml
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cd1fd3f2..00058946 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,6 +28,7 @@
Settings
Logs
Close
+ Open
General
More
Accounts
@@ -207,9 +208,9 @@
"Do you really want to remove %1$s?"
"Do you really want to remove %1$s and its contents?"
Local only
- Local contents only
- Remove from server
- Remote and local
+ Local only
+ From server
+ Remote & local
"Removal succeeded"
"Removal failed"
Enter a new name
@@ -268,8 +269,8 @@
File conflict
Which files do you want to keep? If you select both versions, the local file will have a number added to its name.
Keep both
- Use local version
- Use server version
+ local version
+ server version
Image preview
This image cannot be shown
@@ -301,9 +302,9 @@
to upload in this folder
The file is no longer available on the server
- Accounts
- Add account
- Secure connection is redirected to an unsecured route.
+ Accounts
+ Add account
+ Secure connection is redirected through an unsecured route.
Logs
Send History
@@ -323,6 +324,7 @@
An error occurred while trying to move this file or folder
to move this file
+
Unable to copy. Please check whether the file exists
It is not possible to copy a folder into a descendant
The file exists already in the destination folder