diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt
index 5bb29643d8..07b2f49055 100644
--- a/scripts/lint/lint-results.txt
+++ b/scripts/lint/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 3 errors and 646 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 632 warnings</span>
diff --git a/scripts/lint/lint-up.rb b/scripts/lint/lint-up.rb
index 9fdfb26aee..f18d2a272d 100644
--- a/scripts/lint/lint-up.rb
+++ b/scripts/lint/lint-up.rb
@@ -1,6 +1,9 @@
 ## Script from https://github.com/tir38/android-lint-entropy-reducer at 07.05.2017
 # adapts to drone, use git username / token as parameter
 
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 puts "=================== starting Android Lint Entropy Reducer ===================="
 
 # get args
@@ -73,17 +76,23 @@ lint_report = String.new(lint_reports[0])
 # find error/warning count string in HTML report
 error_warning_string = ""
 File.open lint_report do |file|
-  error_warning_string = file.find { |line| line =~ /[0-9]* errors and [0-9]* warnings/ }
+  error_warning_string = file.find { |line| line =~ /([0-9]* error[s]? and )?[0-9]* warning[s]?/ }
 end
 
 # find number of errors
-error_string = error_warning_string.match(/[0-9]* errors/)[0]
-current_error_count = error_string.match(/[0-9]*/)[0].to_i
+error_string = error_warning_string.match(/[0-9]* error[s]?/)
+
+if (error_string.nil?)
+    current_error_count = 0
+else
+    current_error_count = error_string[0].match(/[0-9]*/)[0].to_i
+end
+
 puts "found errors: " + current_error_count.to_s
 
 # find number of warnings
 if CHECK_WARNINGS == true
-    warning_string = error_warning_string.match(/[0-9]* warnings/)[0]
+    warning_string = error_warning_string.match(/[0-9]* warning[s]?/)[0]
     current_warning_count = warning_string.match(/[0-9]*/)[0].to_i
     puts "found warnings: " + current_warning_count.to_s
 end
diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 102058bc42..2dda8f3c7f 100644
--- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -486,7 +486,7 @@ public class FileDisplayActivity extends HookActivity
             if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)) {
                 int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
                 boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true);
-                secondFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay);
+                secondFragment = PreviewMediaFragment.newInstance(file, getAccount(), startPlaybackPosition, autoplay);
             } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) {
                 secondFragment = null;
             } else {
@@ -1996,8 +1996,7 @@ public class FileDisplayActivity extends HookActivity
      *                              interactions.
      */
     public void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay) {
-        Fragment mediaFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition,
-                autoplay);
+        Fragment mediaFragment = PreviewMediaFragment.newInstance(file, getAccount(), startPlaybackPosition, autoplay);
         setSecondFragment(mediaFragment);
         updateFragmentsVisibility(true);
         updateActionBarTitleAndHomeButton(file);
diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java
index cacfa2d443..88404a10e8 100644
--- a/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java
+++ b/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java
@@ -22,6 +22,8 @@ package com.owncloud.android.ui.fragment;
 
 import android.accounts.Account;
 import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 
 import com.owncloud.android.datamodel.OCFile;
@@ -29,6 +31,8 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 
+import static com.owncloud.android.ui.activity.FileActivity.EXTRA_FILE;
+
 
 /**
  * Common methods for {@link Fragment}s containing {@link OCFile}s
@@ -49,14 +53,28 @@ public class FileFragment extends Fragment {
     public FileFragment() {
         mFile = null;
     }
-    
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle bundle = getArguments();
+        setFile((OCFile) bundle.getParcelable(EXTRA_FILE));
+    }
+
     /**
      * Creates an instance for a given {@OCFile}.
      * 
      * @param file
      */
-    public FileFragment(OCFile file) {
-        mFile = file;
+    public static FileFragment newInstance(OCFile file) {
+        FileFragment fileFragment = new FileFragment();
+        Bundle bundle = new Bundle();
+
+        bundle.putParcelable(EXTRA_FILE, file);
+        fileFragment.setArguments(bundle);
+
+        return fileFragment;
     }
 
     /**
@@ -111,7 +129,7 @@ public class FileFragment extends Fragment {
          * 
          * @param file      File to show details
          */
-        public void showDetails(OCFile file);
+        void showDetails(OCFile file);
 
         
         ///// TO UNIFY IN A SINGLE CALLBACK METHOD - EVENT NOTIFICATIONs  -> something happened
@@ -122,7 +140,7 @@ public class FileFragment extends Fragment {
          *  
          * @param folder
          */
-        public void onBrowsedDownTo(OCFile folder);                 
+        void onBrowsedDownTo(OCFile folder);
 
         /**
          * Callback method invoked when a the 'transfer state' of a file changes.
@@ -141,7 +159,7 @@ public class FileFragment extends Fragment {
          * @param downloading   Flag signaling if the file is now downloading.
          * @param uploading     Flag signaling if the file is now uploading.
          */
-        public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading);
+        void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading);
 
     }
 
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 76bb1a08e2..932da18038 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -1,4 +1,4 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   @author David A. Velasco
@@ -113,6 +113,11 @@ public class PreviewMediaFragment extends FileFragment implements
 
     private static final String SCREEN_NAME = "Audio/Video Preview";
 
+    private static final String FILE = "FILE";
+    private static final String ACCOUNT = "ACCOUNT";
+    private static final String PLAYBACK_POSITION = "PLAYBACK_POSITION";
+    private static final String AUTOPLAY = "AUTOPLAY";
+
     /**
      * Creates a fragment to preview a file.
      * <p/>
@@ -121,16 +126,19 @@ public class PreviewMediaFragment extends FileFragment implements
      * @param fileToDetail An {@link OCFile} to preview in the fragment
      * @param ocAccount    An ownCloud account; needed to start downloads
      */
-    public PreviewMediaFragment(
-            OCFile fileToDetail,
-            Account ocAccount,
-            int startPlaybackPosition,
-            boolean autoplay) {
+    public static PreviewMediaFragment newInstance(OCFile fileToDetail, Account ocAccount, int startPlaybackPosition,
+                                                   boolean autoplay) {
+        PreviewMediaFragment previewMediaFragment = new PreviewMediaFragment();
 
-        super(fileToDetail);
-        mAccount = ocAccount;
-        mSavedPlaybackPosition = startPlaybackPosition;
-        mAutoplay = autoplay;
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(FILE, fileToDetail);
+        bundle.putParcelable(ACCOUNT, ocAccount);
+        bundle.putInt(PLAYBACK_POSITION, startPlaybackPosition);
+        bundle.putBoolean(AUTOPLAY, autoplay);
+
+        previewMediaFragment.setArguments(bundle);
+
+        return previewMediaFragment;
     }
 
     /**
@@ -157,6 +165,13 @@ public class PreviewMediaFragment extends FileFragment implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+
+        Bundle bundle = getArguments();
+
+        setFile((OCFile) bundle.getParcelable(FILE));
+        mAccount = bundle.getParcelable(ACCOUNT);
+        mSavedPlaybackPosition = bundle.getInt(PLAYBACK_POSITION);
+        mAutoplay = bundle.getBoolean(AUTOPLAY);
     }
 
 
diff --git a/src/main/res/layout/alert_dialog_list_view.xml b/src/main/res/layout/alert_dialog_list_view.xml
deleted file mode 100644
index ce5a569e1f..0000000000
--- a/src/main/res/layout/alert_dialog_list_view.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <ListView
-        android:id="@+id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</LinearLayout>
diff --git a/src/main/res/layout/notification_with_progress_bar.xml b/src/main/res/layout/notification_with_progress_bar.xml
deleted file mode 100644
index 79588e6e89..0000000000
--- a/src/main/res/layout/notification_with_progress_bar.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-    ownCloud Android client application
-    Copyright (C) 2015 ownCloud Inc.
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2,
-    as published by the Free Software Foundation.
-  
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <ImageView android:id="@+id/icon"
-        android:layout_width="@android:dimen/notification_large_icon_width"
-        android:layout_height="@android:dimen/notification_large_icon_height"
-        android:scaleType="center"
-        />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:minHeight="@dimen/notification_with_progress_bar_layout_height"
-        android:orientation="vertical"
-        android:paddingRight="@dimen/notification_with_progress_bar_layout"
-        android:paddingLeft="@dimen/notification_with_progress_bar_layout"
-        >
-		<TextView android:id="@+id/title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            style="@style/Theme.ownCloud.NotificationText.Title"
-        	/>
-        <TextView android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/standard_eighth_margin_negative"
-            android:layout_marginBottom="@dimen/standard_eighth_margin_negative"
-			android:singleLine="true"
-            android:fadingEdge="horizontal"
-            android:ellipsize="marquee"
-            style="@style/Theme.ownCloud.NotificationText.Content"
-            />
-        <FrameLayout android:id="@+id/progressHolder"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/notification_with_progress_bar_layout"
-            >
-            <!--  the FrameLayout is needed to change visibility of the
-            	progress bar in Android 2.2, even though 
-            	https://code.google.com/p/android/issues/detail?id=11040 -->
-	        <ProgressBar
-	            android:id="@+id/progress"
-	            android:layout_width="match_parent"
-	            android:layout_height="match_parent"
-	            style="?android:attr/progressBarStyleHorizontal"
-	            />
-        </FrameLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/participate_layout.xml b/src/main/res/layout/participate_layout.xml
index e130a64590..0ffe85876e 100755
--- a/src/main/res/layout/participate_layout.xml
+++ b/src/main/res/layout/participate_layout.xml
@@ -101,7 +101,8 @@
                         android:background="@color/white"
                         android:onClick="onGetRCPlayStoreClick"
                         android:padding="@dimen/zero"
-                        android:src="@drawable/playstore"/>
+                        android:src="@drawable/playstore"
+                        android:contentDescription="@string/participate_rc_play_store"/>
 
                     <ImageButton
                         android:id="@+id/participate_release_candidate_fdroid"
@@ -110,7 +111,8 @@
                         android:background="@color/white"
                         android:onClick="onGetRCFDroidClick"
                         android:padding="@dimen/zero"
-                        android:src="@drawable/fdroid"/>
+                        android:src="@drawable/fdroid"
+                        android:contentDescription="@string/participate_rc_fdroid"/>
 
                 </LinearLayout>
 
@@ -139,7 +141,8 @@
                     android:background="@color/white"
                     android:onClick="onGetBetaFDroidClick"
                     android:padding="@dimen/zero"
-                    android:src="@drawable/fdroid"/>
+                    android:src="@drawable/fdroid"
+                    android:contentDescription="@string/participate_dev_fdroid"/>
 
                 <ImageButton
                     android:id="@+id/participate_beta_apk"
@@ -148,7 +151,8 @@
                     android:background="@color/white"
                     android:onClick="onGetBetaApkClick"
                     android:padding="@dimen/zero"
-                    android:src="@drawable/apk"/>
+                    android:src="@drawable/apk"
+                    android:contentDescription="@string/participate_dev_direct_download"/>
 
                 </LinearLayout>
 
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 85291c430a..cf1c22ef45 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">تفاصيل</string>
     <string name="actionbar_send_file">أرسل</string>
     <string name="actionbar_sort">ترتيب</string>
-    <string name="actionbar_sort_title">ترتيب بـ</string>
     <string name="sort_by">ترتيب</string>
     <string name="menu_item_sort_by_name_a_z">أ - ى</string>
     <string name="menu_item_sort_by_name_z_a">ى -أ</string>
diff --git a/src/main/res/values-ast/strings.xml b/src/main/res/values-ast/strings.xml
index 1a2ab7e9aa..51e7bc6606 100644
--- a/src/main/res/values-ast/strings.xml
+++ b/src/main/res/values-ast/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detalles</string>
     <string name="actionbar_send_file">Unviar</string>
     <string name="actionbar_sort">Ordenar</string>
-    <string name="actionbar_sort_title">Ordenar per</string>
     <string name="sort_by">Ordenar per</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 4af82965b1..780330b48c 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Детайли</string>
     <string name="actionbar_send_file">Изпращане</string>
     <string name="actionbar_sort">Сортирай</string>
-    <string name="actionbar_sort_title">Сортиране по</string>
     <string name="sort_by">Сортиране по</string>
     <string name="menu_item_sort_by_name_a_z">А - Я</string>
     <string name="menu_item_sort_by_name_z_a">Я - А</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index fcc69c3e93..f575dd3425 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detalls</string>
     <string name="actionbar_send_file">Envia</string>
     <string name="actionbar_sort">Ordena</string>
-    <string name="actionbar_sort_title">Ordena per</string>
     <string name="sort_by">Ordena per</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml
index 9ee1bd1348..1df7a61830 100644
--- a/src/main/res/values-cs-rCZ/strings.xml
+++ b/src/main/res/values-cs-rCZ/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Podrobnosti</string>
     <string name="actionbar_send_file">Odeslat</string>
     <string name="actionbar_sort">Seřadit</string>
-    <string name="actionbar_sort_title">Seřadit podle</string>
     <string name="sort_by">Řadit podle</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 57808b014b..273ea3f038 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detaljer</string>
     <string name="actionbar_send_file">Send</string>
     <string name="actionbar_sort">Sortér</string>
-    <string name="actionbar_sort_title">Sortér efter</string>
     <string name="sort_by">Sortér efter</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml
index 462448375f..0720468bc5 100644
--- a/src/main/res/values-de-rDE/strings.xml
+++ b/src/main/res/values-de-rDE/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Details</string>
     <string name="actionbar_send_file">Senden</string>
     <string name="actionbar_sort">Sortieren</string>
-    <string name="actionbar_sort_title">Sortiere nach</string>
     <string name="sort_by">Sortiere nach</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 57c8dc822e..92fc7199b4 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Details</string>
     <string name="actionbar_send_file">Senden</string>
     <string name="actionbar_sort">Sortieren</string>
-    <string name="actionbar_sort_title">Sortieren nach</string>
     <string name="sort_by">Sortieren nach</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 9c85cad7b8..145e15ee28 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Λεπτομέρειες</string>
     <string name="actionbar_send_file">Αποστολή</string>
     <string name="actionbar_sort">Ταξινόμηση</string>
-    <string name="actionbar_sort_title">Ταξινόμηση κατά</string>
     <string name="sort_by">Ταξινόμηση κατά</string>
     <string name="menu_item_sort_by_name_a_z">Α - Ω</string>
     <string name="menu_item_sort_by_name_z_a">Ω - Α</string>
diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml
index 307923ea8a..4c4e3517a7 100644
--- a/src/main/res/values-en-rGB/strings.xml
+++ b/src/main/res/values-en-rGB/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Details</string>
     <string name="actionbar_send_file">Send</string>
     <string name="actionbar_sort">Sort</string>
-    <string name="actionbar_sort_title">Sort by</string>
     <string name="sort_by">Sort by</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml
index 7fdd28d847..dd3365a05d 100644
--- a/src/main/res/values-es-rAR/strings.xml
+++ b/src/main/res/values-es-rAR/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detalles</string>
     <string name="actionbar_send_file">Enviar</string>
     <string name="actionbar_sort">Ordenar</string>
-    <string name="actionbar_sort_title">Ordenar por</string>
     <string name="sort_by">Ordenar por</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index 6597d35df6..4379ea0d1c 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detalles</string>
     <string name="actionbar_send_file">Enviar</string>
     <string name="actionbar_sort">Ordenar</string>
-    <string name="actionbar_sort_title">Ordenar por</string>
     <string name="sort_by">Ordenar por</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 4220053ebf..4ac5d85279 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detalles</string>
     <string name="actionbar_send_file">Enviar</string>
     <string name="actionbar_sort">Ordenar</string>
-    <string name="actionbar_sort_title">Ordenar por</string>
     <string name="sort_by">Ordenar por</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-fi-rFI/strings.xml b/src/main/res/values-fi-rFI/strings.xml
index eb095cfc19..a5bb1cac77 100644
--- a/src/main/res/values-fi-rFI/strings.xml
+++ b/src/main/res/values-fi-rFI/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Tiedot</string>
     <string name="actionbar_send_file">Lähetä</string>
     <string name="actionbar_sort">Lajittele</string>
-    <string name="actionbar_sort_title">Lajittelujärjestys</string>
     <string name="sort_by">Lajittelujärjestys</string>
     <string name="menu_item_sort_by_name_a_z">A - Ö</string>
     <string name="menu_item_sort_by_name_z_a">Ö - A</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 59ae239fff..22df0f5e15 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Propriétés</string>
     <string name="actionbar_send_file">Exporter</string>
     <string name="actionbar_sort">Trier</string>
-    <string name="actionbar_sort_title">Trier par</string>
     <string name="sort_by">Trier par</string>
     <string name="menu_item_sort_by_name_a_z">De A à Z</string>
     <string name="menu_item_sort_by_name_z_a"> De Z à A</string>
diff --git a/src/main/res/values-he/strings.xml b/src/main/res/values-he/strings.xml
index e59222b443..3f93c20004 100644
--- a/src/main/res/values-he/strings.xml
+++ b/src/main/res/values-he/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">פרטים</string>
     <string name="actionbar_send_file">שליחה</string>
     <string name="actionbar_sort">מיון</string>
-    <string name="actionbar_sort_title">מיון על בסיס</string>
     <string name="drawer_item_all_files">כל הקבצים</string>
     <string name="drawer_item_settings">הגדרות</string>
     <string name="drawer_item_uploads_list">העלאות</string>
diff --git a/src/main/res/values-hu-rHU/strings.xml b/src/main/res/values-hu-rHU/strings.xml
index 06be7afe8b..fb54a87194 100644
--- a/src/main/res/values-hu-rHU/strings.xml
+++ b/src/main/res/values-hu-rHU/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Részletek</string>
     <string name="actionbar_send_file">Küldés</string>
     <string name="actionbar_sort">Rendezés</string>
-    <string name="actionbar_sort_title">Rendezés elve</string>
     <string name="sort_by">Rendezés elve</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 28976164c3..b8beb6c27f 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Rincian</string>
     <string name="actionbar_send_file">Kirim</string>
     <string name="actionbar_sort">Urutkan</string>
-    <string name="actionbar_sort_title">Urutan</string>
     <string name="drawer_item_all_files">Semua berkas</string>
     <string name="drawer_item_on_device">Dalam perangkat</string>
     <string name="drawer_item_settings">Pengaturan</string>
diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml
index 16183a7a03..038c8b6ac1 100644
--- a/src/main/res/values-is/strings.xml
+++ b/src/main/res/values-is/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Nánar</string>
     <string name="actionbar_send_file">Senda</string>
     <string name="actionbar_sort">Raða</string>
-    <string name="actionbar_sort_title">Raða sem</string>
     <string name="sort_by">Raða eftir</string>
     <string name="menu_item_sort_by_name_a_z">A - Ö</string>
     <string name="menu_item_sort_by_name_z_a">Ö - A</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 46b7d3261d..14c4db251e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Dettagli</string>
     <string name="actionbar_send_file">Invia</string>
     <string name="actionbar_sort">Ordina</string>
-    <string name="actionbar_sort_title">Ordina per</string>
     <string name="sort_by">Ordina per</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-ja-rJP/strings.xml b/src/main/res/values-ja-rJP/strings.xml
index af1d53a0b8..55ff7dcde8 100644
--- a/src/main/res/values-ja-rJP/strings.xml
+++ b/src/main/res/values-ja-rJP/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">詳細</string>
     <string name="actionbar_send_file">送信</string>
     <string name="actionbar_sort">ソート</string>
-    <string name="actionbar_sort_title">ソート: </string>
     <string name="sort_by">ソート</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index eff50b4356..a0d2bb4e68 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">자세한 정보</string>
     <string name="actionbar_send_file">보내기</string>
     <string name="actionbar_sort">정렬</string>
-    <string name="actionbar_sort_title">정렬 순서</string>
     <string name="sort_by">정렬</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
index 46c11fec43..7651f0ef37 100644
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detaļas</string>
     <string name="actionbar_send_file">Sūtīt</string>
     <string name="actionbar_sort">Kārtot</string>
-    <string name="actionbar_sort_title">Kārtot pēc</string>
     <string name="sort_by">Kārtot pēc</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 0b01bdfed7..ddd9ca3e00 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detaljer</string>
     <string name="actionbar_send_file">Send</string>
     <string name="actionbar_sort">Sorter</string>
-    <string name="actionbar_sort_title">Sorter etter</string>
     <string name="sort_by">Sorter etter</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index c8a7be4792..b91913a6ed 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Details</string>
     <string name="actionbar_send_file">Versturen</string>
     <string name="actionbar_sort">Sorteren</string>
-    <string name="actionbar_sort_title">Sorteer op</string>
     <string name="sort_by">Sorteer op</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index d3088a6895..a7d830e092 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Szczegóły</string>
     <string name="actionbar_send_file">Wyślij</string>
     <string name="actionbar_sort">Sortuj</string>
-    <string name="actionbar_sort_title">Sortuj według</string>
     <string name="sort_by">Sortuj po</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index f40b210d8e..d20b752b28 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detalhes</string>
     <string name="actionbar_send_file">Enviar</string>
     <string name="actionbar_sort">Classificar</string>
-    <string name="actionbar_sort_title">Classificar por</string>
     <string name="sort_by">Classificado por</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
index 2dbb729854..fc9682a235 100644
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detalhes</string>
     <string name="actionbar_send_file">Enviar</string>
     <string name="actionbar_sort">Ordenar</string>
-    <string name="actionbar_sort_title">Ordenar por</string>
     <string name="drawer_item_all_files">Todos os ficheiros</string>
     <string name="drawer_item_on_device">No dispositivo</string>
     <string name="drawer_item_settings">Definições</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 5afda33a55..5047443d91 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detalii</string>
     <string name="actionbar_send_file">Expediază</string>
     <string name="actionbar_sort">Sortează</string>
-    <string name="actionbar_sort_title">Sortare după</string>
     <string name="sort_by">Sortare după</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index d1e0e3bad5..e97a3f635d 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -13,7 +13,6 @@
     <string name="actionbar_see_details">Подробно</string>
     <string name="actionbar_send_file">Отправить</string>
     <string name="actionbar_sort">Сортировка</string>
-    <string name="actionbar_sort_title">Сортировать по</string>
     <string name="sort_by">Порядок сортировки</string>
     <string name="menu_item_sort_by_name_a_z">А–Я</string>
     <string name="menu_item_sort_by_name_z_a">Я–A</string>
diff --git a/src/main/res/values-sk-rSK/strings.xml b/src/main/res/values-sk-rSK/strings.xml
index ecea22d82e..a1d9546b51 100644
--- a/src/main/res/values-sk-rSK/strings.xml
+++ b/src/main/res/values-sk-rSK/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Podrobnosti</string>
     <string name="actionbar_send_file">Odoslať</string>
     <string name="actionbar_sort">Zoradiť</string>
-    <string name="actionbar_sort_title">Zoradiť podľa</string>
     <string name="sort_by">Zoradiť podľa</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index 75fe60af92..6dce2d912f 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Podrobnosti</string>
     <string name="actionbar_send_file">Pošlji</string>
     <string name="actionbar_sort">Razvrsti</string>
-    <string name="actionbar_sort_title">Razvrsti ...</string>
     <string name="sort_by">Razvrsti po</string>
     <string name="menu_item_sort_by_name_a_z">A - Ž</string>
     <string name="menu_item_sort_by_name_z_a">Ž - A</string>
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index acb596d8cd..091e8bed24 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Hollësi</string>
     <string name="actionbar_send_file">Dërgojeni</string>
     <string name="actionbar_sort">Renditni</string>
-    <string name="actionbar_sort_title">Renditni sipas</string>
     <string name="sort_by">Rendit sipas</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 4b177add9d..9f0f8d3afd 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Детаљи</string>
     <string name="actionbar_send_file">Пошаљи</string>
     <string name="actionbar_sort">Сортирање по</string>
-    <string name="actionbar_sort_title">Сортирање</string>
     <string name="sort_by">Сортирај по</string>
     <string name="menu_item_sort_by_name_a_z">А - Ш</string>
     <string name="menu_item_sort_by_name_z_a">Ш - А</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index c7d2d065c3..ab3fbe3856 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Detaljer</string>
     <string name="actionbar_send_file">Skicka</string>
     <string name="actionbar_sort">Sortera</string>
-    <string name="actionbar_sort_title">Sortera efter</string>
     <string name="sort_by">Sortera efter</string>
     <string name="menu_item_sort_by_name_a_z">A - Ö</string>
     <string name="menu_item_sort_by_name_z_a">Ö - A</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 56363e828f..76f2f89644 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Ayrıntılar</string>
     <string name="actionbar_send_file">Gönder</string>
     <string name="actionbar_sort">Sırala</string>
-    <string name="actionbar_sort_title">Şuna göre sırala</string>
     <string name="sort_by">Sıralama</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 2efd5f8c81..5a0c5ecb22 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Деталі</string>
     <string name="actionbar_send_file">Надіслати</string>
     <string name="actionbar_sort">Сортувати</string>
-    <string name="actionbar_sort_title">Сортувати за</string>
     <string name="sort_by">Сортувати по</string>
     <string name="menu_item_sort_by_name_a_z">А - Я</string>
     <string name="menu_item_sort_by_name_z_a">Я - А</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index f669392214..c6c6a1f600 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">详细信息</string>
     <string name="actionbar_send_file">发送</string>
     <string name="actionbar_sort">排序</string>
-    <string name="actionbar_sort_title">排序方式</string>
     <string name="sort_by">排序方式</string>
     <string name="menu_item_sort_by_name_a_z">按名称顺序</string>
     <string name="menu_item_sort_by_name_z_a">按名称倒序</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 3a26faf309..ac46b8cbf9 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">詳細資料</string>
     <string name="actionbar_send_file">寄出</string>
     <string name="actionbar_sort">排序</string>
-    <string name="actionbar_sort_title">排序依照</string>
     <string name="sort_by">排列方式</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
diff --git a/src/main/res/values/dims.xml b/src/main/res/values/dims.xml
index a3556ead6c..4a2aad0f2d 100644
--- a/src/main/res/values/dims.xml
+++ b/src/main/res/values/dims.xml
@@ -41,7 +41,6 @@
     <dimen name="standard_half_margin">8dp</dimen>
     <dimen name="standard_quarter_margin">4dp</dimen>
     <dimen name="standard_eighth_margin">2dp</dimen>
-    <dimen name="standard_eighth_margin_negative">-2dp</dimen>
     <dimen name="min_list_item_size">56dp</dimen>
     <dimen name="standard_list_item_size">72dp</dimen>
     <dimen name="two_line_primary_text_size">16sp</dimen>
@@ -60,7 +59,6 @@
     <dimen name="display_text_min_height">32dp</dimen>
     <dimen name="divider_height_independent">1dip</dimen>
     <dimen name="alternate_padding_independent">10dip</dimen>
-    <dimen name="alternate_half_padding_independent">5dip</dimen>
     <dimen name="standard_padding_independent">16dip</dimen>
     <dimen name="standard_half_padding_independent">8dip</dimen>
     <dimen name="activity_row_layout_min_width_independent">196dip</dimen>
@@ -76,10 +74,7 @@
     <dimen name="grid_item_text_size">16dip</dimen>
     <dimen name="list_fragment_column_width">100dp</dimen>
     <dimen name="list_fragment_spacing">2dp</dimen>
-    <dimen name="listrow_group_text_size">16dp</dimen>
     <dimen name="seek_bar_height">32dp</dimen>
-    <dimen name="notification_with_progress_bar_layout">12dp</dimen>
-    <dimen name="notification_with_progress_bar_layout_height">64dp</dimen>
     <dimen name="search_users_groups_layout_width">200dp</dimen>
     <dimen name="search_users_groups_layout_list_view_margin">20dp</dimen>
     <dimen name="share_file_layout_text_size">12sp</dimen>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4795513d98..67e2e15dc6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <string name="actionbar_see_details">Details</string>
     <string name="actionbar_send_file">Send</string>
     <string name="actionbar_sort">Sort</string>
-    <string name="actionbar_sort_title">Sort by</string>
     <string name="sort_by">Sort by</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
@@ -589,6 +588,10 @@
     <string name="participate_contribute_translate_link" translatable="false">&lt;font color=\"%1$s\">&lt;a href=\"%2$s\">%3$s&lt;/a>&lt;/font></string>
     <string name="participate_contribute_github_text">Review, amend and write code, see %1$s for details</string>
     <string name="participate_contribute_github_text_link" translatable="false">&lt;font color=\"%1$s\">&lt;a href=\"%2$s\">CONTRIBUTING.md&lt;/a>&lt;/font></string>
+    <string name="participate_rc_play_store">Get release candidate via Google Play store</string>
+    <string name="participate_rc_fdroid">Get release candidate via f-droid app store</string>
+    <string name="participate_dev_fdroid">Get development release via f-droid app store</string>
+    <string name="participate_dev_direct_download">Get development release via direct download</string>
     <string name="move_to">Move to&#8230;</string>
     <string name="copy_to">Copy to&#8230;</string>
     <string name="choose_remote_folder">Choose remote folder&#8230;</string>