From: masensio <masensio@solidgear.es>
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 @@@
      <string name="prefs_category_more">More</string>
      <string name="prefs_accounts">Accounts</string>
      <string name="prefs_manage_accounts">Manage Accounts</string>
 -    <string name="prefs_pincode">App PIN</string>
 -    <string name="prefs_pincode_summary">Protect your client</string>
 +    <string name="prefs_passcode">Pass code lock</string>
      <string name="prefs_instant_upload">Instant picture uploads</string>
      <string name="prefs_instant_upload_summary">Instantly upload pictures taken by camera</string>
      <string name="prefs_instant_video_upload">Instant video uploads</string>
@@@ -130,16 -131,16 +130,16 @@@
      <string name="foreign_files_local_text">"Local: %1$s"</string>
      <string name="foreign_files_remote_text">"Remote: %1$s"</string>
      <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would you like to move them instead? </string>
 -    <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
 +    <string name="pass_code_enter_pass_code">Please, insert your pass code</string>
      
 -    <string name="pincode_configure_your_pin">Enter your App PIN</string>
 -    <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string>
 -    <string name="pincode_reenter_your_pincode">Please, reenter your App PIN</string>
 -    <string name="pincode_remove_your_pincode">Remove your App PIN</string>
 -    <string name="pincode_mismatch">The App PINs are not the same</string>
 -    <string name="pincode_wrong">Incorrect App PIN</string>
 -    <string name="pincode_removed">App PIN removed</string>
 -    <string name="pincode_stored">App PIN stored</string>
 +    <string name="pass_code_configure_your_pass_code">Enter your pass code</string>
 +    <string name="pass_code_configure_your_pass_code_explanation">The pass code will be requested every time the app is started</string>
 +    <string name="pass_code_reenter_your_pass_code">Please, reenter your pass code</string>
 +    <string name="pass_code_remove_your_pass_code">Remove your pass code</string>
 +    <string name="pass_code_mismatch">The pass codes are not the same</string>
 +    <string name="pass_code_wrong">Incorrect pass code</string>
 +    <string name="pass_code_removed">Pass code removed</string>
 +    <string name="pass_code_stored">Pass code stored</string>
      
      <string name="media_notif_ticker">"%1$s music player"</string>
      <string name="media_state_playing">"%1$s (playing)"</string>
@@@ -218,6 -219,7 +218,7 @@@
      <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
      <string name="filedisplay_no_file_selected">No file was selected</string>
      <string name="activity_chooser_title">Send link to &#8230;</string>
+     <string name="wait_for_tmp_copy_from_private_storage">Copying file from private storage</string>
      
      <string name="oauth_check_onoff">Login with oAuth2</string> 
      <string name="oauth_login_connection">Connecting to oAuth2 server…</string>