Merge remote-tracking branch 'upstream/cm-10.1' into ics

Conflicts: AndroidManifest.xml src/com/cyanogenmod/filemanager/util/FileHelper.java tests/AndroidManifest.xml themes/AndroidManifest.xml themes/res/values-pt-rBR/strings.xml
CyanogenMod · Dec 26, 2012 · 625d43a · 625d43a
2 parents e2c06b2 + 5b85c6c
commit 625d43a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/res/raw/mime_types.properties b/res/raw/mime_types.properties
@@ -260,6 +260,7 @@ ra    = AUDIO    | audio/x-pn-realaudio             | fso_type_audio_drawable
 ram   = AUDIO    | audio/x-pn-realaudio             | fso_type_audio_drawable
 rmp   = AUDIO    | audio/x-pn-realaudio-plugin      | fso_type_audio_drawable
 wav   = AUDIO    | audio/x-wav                      | fso_type_audio_drawable
+mka   = AUDIO    | audio/x-matroska                 | fso_type_audio_drawable
 
 # Video
 3gp   = VIDEO    | video/3gpp                       | fso_type_video_drawable
@@ -303,6 +304,8 @@ wmv   = VIDEO    | video/x-ms-wmv                   | fso_type_video_drawable
 wmx   = VIDEO    | video/x-ms-wmx                   | fso_type_video_drawable
 wvx   = VIDEO    | video/x-ms-wvx                   | fso_type_video_drawable
 movie = VIDEO    | video/x-sgi-movie                | fso_type_video_drawable
+rmvb  = VIDEO    | video/rmvb                       | fso_type_video_drawable
+mkv   = VIDEO    | video/x-matroska                 | fso_type_video_drawable
 
 # Security
 asc   = SECURITY | application/pgp-signature        | fso_type_security_drawable

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -557,7 +557,7 @@
   <!-- Preferences * General * Disk usage warning level summary -->
   <!-- FIXME Use "percent" instead of "%" symbol, because it make crash the app on getSummary
        of ListPreference. This should be fixed in frameworks base prior to be added here. -->
-  <string name="pref_disk_usage_warning_level_summary" formatted="false">Eine andere Farbe verwenden, wenn nur noch <xliff:g id="level">%1$s</xliff:g> Prozent des Speichers frei sind.</string>
+  <string name="pref_disk_usage_warning_level_summary" formatted="false">Eine andere Farbe verwenden, wenn mehr als <xliff:g id="level">%1$s</xliff:g> Prozent des Speichers belegt sind.</string>
   <!-- Preferences * General * Compute folder statistics title -->
   <string name="pref_compute_folder_statistics">Verzeichnisstatistiken</string>
   <!-- Preferences * General * Compute folder statistics summary on -->