Merge branch 'master' of github.com:owncloud/android

Conflicts:
	CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 219ff2a..099a445 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,15 @@
 - Preview the full file/folder name from the long press menu
 - Set a file as FAVORITE (kept-in-sync) from the CONTEXT MENU
 - Updated CONFLICT RESOLUTION dialog (wording)
-- Images with TRANSPARENT background are previewed correctly
-- Hidden files are not taken into account for enforcing or not the list VIEW
-- Several bugs fixed
-
+- Updated background for images with TRANSPARENCY in GALLERY
+- Hidden files will not enforce list view instead of GRID VIEW (folders from Picasa & others)
+- Security:
+  + Updated network stack with security fixes (Jackrabbit 2.10.1)
+- Bugs fixed:
+  + Fixed crash when ETag is lost
+  + Passcode creation not restarted on device rotation
+  + Recovered share icon shown on folders 'shared with me'
+  + User name added to subject when sending a share link through e-mail (fixed on SAMLed apps)
 
 ## 1.7.2 (July 2015)
 - New navigation drawer

diff --git a/res/values-en_DE/strings.xml b/res/values-en_DE/strings.xml
deleted file mode 100644 (file)
index 37e6152..0000000
--- a/res/values-en_DE/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <!--TODO re-enable when server-side folder size calculation is available   
-       <item>Biggest - Smallest</item>-->
-  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
-  <!--<string name="drawer_item_accounts">Accounts</string>-->
-  <!--TODO re-enable when "On Device" is available
-    <string name="drawer_item_on_device">On device</string>-->
-  <string name="empty"></string>
-</resources>