From: purigarcia <pgarcia@solidgear.es>
Date: Mon, 11 May 2015 06:16:43 +0000 (+0200)
Subject: Merge branch 'develop' into automationTest
X-Git-Tag: oc-android-1.7.2~1^2~32^2~23
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2d95a83959c77a0c4820c6668b439f8e1b0d038a?hp=-c

Merge branch 'develop' into automationTest
---

2d95a83959c77a0c4820c6668b439f8e1b0d038a
diff --combined res/values/strings.xml
index 771c9569,a85beafe..c8c1ad71
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -24,7 -24,7 +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_passcode">Pass code lock</string>
+     <string name="prefs_passcode">Passcode 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>
@@@ -78,7 -78,6 +78,7 @@@
      <string name="filedetails_download">Download</string>
      <string name="filedetails_sync_file">Refresh file</string>
      <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
 +    <string name="list_layout">List Layout</string>
      <string name="action_share_file">Share link</string>
      <string name="action_unshare_file">Unshare link</string>
      <string name="common_yes">Yes</string>
@@@ -131,16 -130,16 +131,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="pass_code_enter_pass_code">Please, insert your pass code</string>
+     <string name="pass_code_enter_pass_code">Please, insert your passcode</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="pass_code_configure_your_pass_code">Enter your passcode</string>
+     <string name="pass_code_configure_your_pass_code_explanation">The passcode will be requested every time the app is started</string>
+     <string name="pass_code_reenter_your_pass_code">Please, reenter your passcode</string>
+     <string name="pass_code_remove_your_pass_code">Remove your passcode</string>
+     <string name="pass_code_mismatch">The passcodes are not the same</string>
+     <string name="pass_code_wrong">Incorrect passcode</string>
+     <string name="pass_code_removed">Passcode removed</string>
+     <string name="pass_code_stored">Passcode stored</string>
      
      <string name="media_notif_ticker">"%1$s music player"</string>
      <string name="media_state_playing">"%1$s (playing)"</string>