From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 12 Mar 2013 12:03:15 +0000 (+0100)
Subject: Merge branch 'details' into feature_previews
X-Git-Tag: oc-android-1.4.3~39^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dc08386401b326ebd7818973e68198943c7b7d88?hp=-c

Merge branch 'details' into feature_previews
---

dc08386401b326ebd7818973e68198943c7b7d88
diff --combined res/values/strings.xml
index 5b834a9b,1cab0b5e..b246dd42
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -24,7 -24,7 +24,7 @@@
      <string name="actionbar_mkdir">Create directory</string>
      <string name="actionbar_search">Search</string>
      <string name="actionbar_settings">Settings</string>
-     <string name="actionbar_see_details">See details</string>
+     <string name="actionbar_see_details">Details</string>
      
      <string name="prefs_category_general">General</string>
      <string name="prefs_category_trackmydevice">Device tracking</string>
@@@ -89,7 -89,7 +89,7 @@@
      <string name="common_exit">Leave %1$s</string>
      <string name="common_error">Error</string>
      <string name="common_loading">Loading &#8230;</string>
 -    <string name="common_error_unknown">Unkown error</string>
 +    <string name="common_error_unknown">Unknown error</string>
      <string name="about_title">About</string>
      
      <string name="delete_account">Delete account</string>
@@@ -162,12 -162,7 +162,12 @@@
      <string name="media_err_security_ex">Security error trying to play %1$s</string>
  	<string name="media_err_io_ex">Input error trying to play %1$s</string>
  	<string name="media_err_unexpected">Unexpected error tryung to playe %1$s</string>
 -            
 +	<string name="media_previous_description">Previous track button</string>
 +	<string name="media_rewind_description">Rewind button</string>
 +	<string name="media_play_pause_description">Play or pause button</string>
 +	<string name="media_forward_description">Fast forward button</string>
 +	<string name="media_next_description">Next track button</string>
 +	
      <string-array name="prefs_trackmydevice_intervall_keys">
      	<item>15 Minutes</item>
      	<item>30 Minutes</item>
@@@ -272,7 -267,6 +272,7 @@@
      <string name="placeholder_filetype">PNG Image</string>
      <string name="placeholder_filesize">389 KB</string>
      <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
 +    <string name="placeholder_media_time">12:23:45</string>
      
      <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
  	<string name="instant_upload_path">/InstantUpload</string>