From: masensio Date: Tue, 5 May 2015 11:56:57 +0000 (+0200) Subject: Merge branch 'develop' into pinEnhancement X-Git-Tag: test~19^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7d82231809c5073a598e6aab8c582bac63ecbf53?ds=inline;hp=-c Merge branch 'develop' into pinEnhancement --- 7d82231809c5073a598e6aab8c582bac63ecbf53 diff --combined res/values/strings.xml index b6502646,5c0843b1..a0294413 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@@ -24,7 -24,8 +24,7 @@@ More Accounts Manage Accounts - App PIN - Protect your client + Pass code lock Instant picture uploads Instantly upload pictures taken by camera Instant video uploads @@@ -130,16 -131,16 +130,16 @@@ "Local: %1$s" "Remote: %1$s" There is not space enough to copy the selected files into the %1$s folder. Would you like to move them instead? - Please, insert your App PIN + Please, insert your pass code - Enter your App PIN - The PIN will be requested every time the app is started - Please, reenter your App PIN - Remove your App PIN - The App PINs are not the same - Incorrect App PIN - App PIN removed - App PIN stored + Enter your pass code + The pass code will be requested every time the app is started + Please, reenter your pass code + Remove your pass code + The pass codes are not the same + Incorrect pass code + Pass code removed + Pass code stored "%1$s music player" "%1$s (playing)" @@@ -218,6 -219,7 +218,7 @@@ "Unexpected problem ; please select the file from a different app" No file was selected Send link to … + Copying file from private storage Login with oAuth2 Connecting to oAuth2 server…