From e547f37b07f733514def6a07e7f16c0e5efd9ebd Mon Sep 17 00:00:00 2001
From: tobiaskaminsky <tobias@kaminsky.me>
Date: Mon, 20 Nov 2017 08:04:57 +0100
Subject: [PATCH] set content description minor type errors

---
 .../android/ui/activity/DrawerActivity.java   |  2 +-
 src/main/res/layout/activity_list_item.xml    |  8 +-
 src/main/res/layout/contactlist_list_item.xml |  4 +-
 src/main/res/layout/drawer_header.xml         | 16 ++--
 src/main/res/layout/file_details_fragment.xml | 96 ++++++++++---------
 .../layout/file_details_share_user_item.xml   |  3 +-
 src/main/res/layout/fingerprintlock.xml       |  3 +-
 src/main/res/layout/grid_image.xml            | 24 +++--
 src/main/res/layout/grid_sync_item.xml        |  2 +-
 src/main/res/layout/list_item.xml             | 29 ++++--
 src/main/res/layout/share_file_layout.xml     |  7 +-
 src/main/res/layout/share_user_item.xml       |  6 +-
 .../res/layout/sorting_order_fragment.xml     | 26 +++--
 .../res/layout/synced_folders_item_header.xml | 22 ++++-
 src/main/res/layout/synced_folders_layout.xml |  5 +-
 src/main/res/layout/upload_files_layout.xml   |  6 +-
 src/main/res/layout/upload_list_item.xml      | 11 ++-
 src/main/res/layout/uploader_layout.xml       | 26 ++---
 .../res/layout/uploader_list_item_layout.xml  |  2 +-
 src/main/res/layout/whats_new_activity.xml    |  3 +-
 src/main/res/layout/whats_new_element.xml     |  3 +-
 src/main/res/values-ar/strings.xml            |  2 +-
 src/main/res/values-ast/strings.xml           |  2 +-
 src/main/res/values-bg-rBG/strings.xml        |  2 +-
 src/main/res/values-ca/strings.xml            |  2 +-
 src/main/res/values-cs-rCZ/strings.xml        |  2 +-
 src/main/res/values-da/strings.xml            |  2 +-
 src/main/res/values-de-rDE/strings.xml        |  2 +-
 src/main/res/values-de/strings.xml            |  2 +-
 src/main/res/values-el/strings.xml            |  2 +-
 src/main/res/values-en-rGB/strings.xml        |  2 +-
 src/main/res/values-es-rAR/strings.xml        |  2 +-
 src/main/res/values-es-rCL/strings.xml        |  2 +-
 src/main/res/values-es-rCO/strings.xml        |  2 +-
 src/main/res/values-es-rCR/strings.xml        |  2 +-
 src/main/res/values-es-rDO/strings.xml        |  2 +-
 src/main/res/values-es-rEC/strings.xml        |  2 +-
 src/main/res/values-es-rGT/strings.xml        |  2 +-
 src/main/res/values-es-rHN/strings.xml        |  2 +-
 src/main/res/values-es-rMX/strings.xml        |  2 +-
 src/main/res/values-es-rNI/strings.xml        |  2 +-
 src/main/res/values-es-rPA/strings.xml        |  2 +-
 src/main/res/values-es-rPE/strings.xml        |  2 +-
 src/main/res/values-es-rPR/strings.xml        |  2 +-
 src/main/res/values-es-rPY/strings.xml        |  2 +-
 src/main/res/values-es-rSV/strings.xml        |  2 +-
 src/main/res/values-es-rUY/strings.xml        |  2 +-
 src/main/res/values-es/strings.xml            |  2 +-
 src/main/res/values-eu/strings.xml            |  2 +-
 src/main/res/values-fa/strings.xml            |  2 +-
 src/main/res/values-fi-rFI/strings.xml        |  2 +-
 src/main/res/values-fr/strings.xml            |  2 +-
 src/main/res/values-he/strings.xml            |  2 +-
 src/main/res/values-hu-rHU/strings.xml        |  2 +-
 src/main/res/values-id/strings.xml            |  2 +-
 src/main/res/values-is/strings.xml            |  2 +-
 src/main/res/values-it/strings.xml            |  2 +-
 src/main/res/values-ja-rJP/strings.xml        |  2 +-
 src/main/res/values-ka-rGE/strings.xml        |  2 +-
 src/main/res/values-ko/strings.xml            |  2 +-
 src/main/res/values-lt-rLT/strings.xml        |  2 +-
 src/main/res/values-lv/strings.xml            |  2 +-
 src/main/res/values-nb-rNO/strings.xml        |  2 +-
 src/main/res/values-nl/strings.xml            |  2 +-
 src/main/res/values-pl/strings.xml            |  2 +-
 src/main/res/values-pt-rBR/strings.xml        |  2 +-
 src/main/res/values-ro/strings.xml            |  2 +-
 src/main/res/values-ru/strings.xml            |  2 +-
 src/main/res/values-sk-rSK/strings.xml        |  2 +-
 src/main/res/values-sl/strings.xml            |  2 +-
 src/main/res/values-sq/strings.xml            |  2 +-
 src/main/res/values-sr/strings.xml            |  2 +-
 src/main/res/values-sv/strings.xml            |  2 +-
 src/main/res/values-tr/strings.xml            |  2 +-
 src/main/res/values-zh-rCN/strings.xml        |  2 +-
 src/main/res/values-zh-rTW/strings.xml        |  2 +-
 src/main/res/values/strings.xml               | 35 ++++++-
 77 files changed, 278 insertions(+), 171 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
index 4410f8d7cf..3044f0b88d 100644
--- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -268,7 +268,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
         mAccountMiddleAccountAvatar = (ImageView) findNavigationViewChildById(R.id.drawer_account_middle);
         mAccountEndAccountAvatar = (ImageView) findNavigationViewChildById(R.id.drawer_account_end);
 
-        mAccountChooserToggle = (ImageView) findNavigationViewChildById(R.id.drawer_account_chooser_toogle);
+        mAccountChooserToggle = (ImageView) findNavigationViewChildById(R.id.drawer_account_chooser_toggle);
         mAccountChooserToggle.setColorFilter(ThemeUtils.fontColor());
 
         if (getResources().getBoolean(R.bool.allow_profile_click)) {
diff --git a/src/main/res/layout/activity_list_item.xml b/src/main/res/layout/activity_list_item.xml
index e6ec5b89a4..9b48fab4b3 100644
--- a/src/main/res/layout/activity_list_item.xml
+++ b/src/main/res/layout/activity_list_item.xml
@@ -35,14 +35,16 @@
         android:layout_alignParentTop="true"
         android:layout_marginRight="@dimen/standard_padding"
         android:alpha="0.5"
-        android:src="@drawable/ic_activity"/>
+        android:src="@drawable/ic_activity"
+        android:contentDescription="@string/activity_icon"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_alignTop="@id/activity_icon"
-        android:layout_toRightOf="@id/activity_icon">
+        android:layout_toRightOf="@id/activity_icon"
+        android:layout_toEndOf="@id/activity_icon">
 
         <TextView
             android:id="@+id/activity_subject"
@@ -74,7 +76,7 @@
             android:id="@+id/activity_datetime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
+            android:layout_gravity="end"
             android:ellipsize="end"
             android:text="@string/placeholder_sentence"
             android:textColor="?android:attr/textColorSecondary"/>
diff --git a/src/main/res/layout/contactlist_list_item.xml b/src/main/res/layout/contactlist_list_item.xml
index 48a6e1e16e..aff6106f32 100644
--- a/src/main/res/layout/contactlist_list_item.xml
+++ b/src/main/res/layout/contactlist_list_item.xml
@@ -28,13 +28,15 @@
         android:layout_height="40dp"
         android:layout_margin="16dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_user"/>
+        android:src="@drawable/ic_user"
+        android:contentDescription="@string/contactlist_item_icon"/>
 
     <CheckedTextView
         android:id="@+id/contactlist_item_name"
         android:layout_width="0dp"
         android:layout_height="@dimen/standard_list_item_size"
         android:layout_marginRight="@dimen/standard_margin"
+        android:layout_marginEnd="@dimen/standard_margin"
         android:layout_weight="1"
         android:checkMark="?android:attr/listChoiceIndicatorMultiple"
         android:ellipsize="marquee"
diff --git a/src/main/res/layout/drawer_header.xml b/src/main/res/layout/drawer_header.xml
index 95b7f5e447..fc1fb25038 100644
--- a/src/main/res/layout/drawer_header.xml
+++ b/src/main/res/layout/drawer_header.xml
@@ -43,25 +43,28 @@
                 android:id="@+id/drawer_current_account"
                 android:layout_width="@dimen/nav_drawer_header_avatar"
                 android:layout_height="@dimen/nav_drawer_header_avatar"
-                android:src="@drawable/ic_account_circle"/>
+                android:src="@drawable/ic_account_circle"
+                android:contentDescription="@string/drawer_current_account"/>
 
             <ImageView
                 android:id="@+id/drawer_account_middle"
                 android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:layout_marginEnd="@dimen/nav_drawer_header_avatar_second_account_margin"
                 android:layout_marginRight="@dimen/nav_drawer_header_avatar_second_account_margin"
                 android:src="@drawable/ic_account_circle"
-                android:onClick="onAccountDrawerClick"/>
+                android:onClick="onAccountDrawerClick"
+                android:contentDescription="@string/drawer_middle_account"/>
 
             <ImageView
                 android:id="@+id/drawer_account_end"
                 android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:src="@drawable/ic_account_circle"
-                android:onClick="onAccountDrawerClick"/>
+                android:onClick="onAccountDrawerClick"
+                android:contentDescription="@string/drawer_end_account"/>
 
         </FrameLayout>
 
@@ -77,6 +80,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_weight="1"
                 android:orientation="vertical"
+                android:paddingEnd="@dimen/standard_half_padding"
                 android:paddingRight="@dimen/standard_half_padding">
 
                 <TextView
@@ -112,7 +116,7 @@
             </LinearLayout>
 
             <ImageView
-                android:id="@+id/drawer_account_chooser_toogle"
+                android:id="@+id/drawer_account_chooser_toggle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
diff --git a/src/main/res/layout/file_details_fragment.xml b/src/main/res/layout/file_details_fragment.xml
index ace0dee14b..d492992ed3 100644
--- a/src/main/res/layout/file_details_fragment.xml
+++ b/src/main/res/layout/file_details_fragment.xml
@@ -35,18 +35,21 @@
 			android:layout_margin="@dimen/standard_margin">
 
 			<ImageView
-				android:id="@+id/fdIcon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/file"/>
+                android:id="@+id/fdIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/file"
+                android:contentDescription="@string/file_icon"/>
 
 			<LinearLayout
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerVertical="true"
-				android:layout_toRightOf="@+id/fdIcon"
-				android:paddingLeft="@dimen/standard_padding"
-				android:orientation="vertical">
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/fdIcon"
+                android:layout_toEndOf="@+id/fdIcon"
+                android:paddingLeft="@dimen/standard_padding"
+                android:paddingStart="@dimen/standard_padding"
+                android:orientation="vertical">
 
 				<TextView
 					android:id="@+id/fdFilename"
@@ -62,31 +65,32 @@
 					android:orientation="horizontal">
 
 					<TextView
-						android:id="@+id/fdSize"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:text="@string/placeholder_filesize"
-						android:textColor="@color/list_item_lastmod_and_filesize_text"
-						android:textSize="@dimen/two_line_secondary_text_size"/>
+                        android:id="@+id/fdSize"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/placeholder_fileSize"
+                        android:textColor="@color/list_item_lastmod_and_filesize_text"
+                        android:textSize="@dimen/two_line_secondary_text_size"/>
 
 					<TextView
-						android:id="@+id/file_separator"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:paddingRight="@dimen/standard_quarter_padding"
-						android:gravity="right"
-						android:text="@string/info_separator"
-						android:textColor="@color/list_item_lastmod_and_filesize_text"
-						android:textSize="@dimen/two_line_secondary_text_size"/>
+                        android:id="@+id/file_separator"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="@dimen/standard_quarter_padding"
+                        android:paddingEnd="@dimen/standard_quarter_padding"
+                        android:gravity="end"
+                        android:text="@string/info_separator"
+                        android:textColor="@color/list_item_lastmod_and_filesize_text"
+                        android:textSize="@dimen/two_line_secondary_text_size"/>
 
 					<TextView
-						android:id="@+id/fdModified"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:gravity="right"
-						android:text="@string/placeholder_media_time"
-						android:textColor="@color/list_item_lastmod_and_filesize_text"
-						android:textSize="@dimen/two_line_secondary_text_size"/>
+                        android:id="@+id/fdModified"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end"
+                        android:text="@string/placeholder_media_time"
+                        android:textColor="@color/list_item_lastmod_and_filesize_text"
+                        android:textSize="@dimen/two_line_secondary_text_size"/>
 
 				</LinearLayout>
 
@@ -152,13 +156,14 @@
 						android:indeterminateOnly="false"/>
 
 					<ImageButton
-						android:id="@+id/fdCancelBtn"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginLeft="@dimen/standard_half_margin"
-						android:background="@android:color/transparent"
-						android:src="@drawable/ic_cancel"
-						android:contentDescription="@string/common_cancel"/>
+                        android:id="@+id/fdCancelBtn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/standard_half_margin"
+                        android:layout_marginStart="@dimen/standard_half_margin"
+                        android:background="@android:color/transparent"
+                        android:src="@drawable/ic_cancel"
+                        android:contentDescription="@string/common_cancel"/>
 
 				</LinearLayout>
 
@@ -196,13 +201,14 @@
 				android:orientation="horizontal">
 
 				<ImageView
-					android:id="@+id/fdShareLinkIcon"
-					android:layout_width="14sp"
-					android:layout_height="14sp"
-					android:layout_gravity="center_vertical"
-					android:layout_marginRight="@dimen/standard_half_margin"
-					android:src="@drawable/shared_via_link"
-					android:visibility="gone"/>
+                    android:id="@+id/fdShareLinkIcon"
+                    android:layout_width="14sp"
+                    android:layout_height="14sp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="@dimen/standard_half_margin"
+                    android:layout_marginEnd="@dimen/standard_half_margin"
+                    android:src="@drawable/shared_via_link"
+                    android:visibility="gone"/>
 
 				<TextView
 					android:id="@+id/fdSharebyLink"
diff --git a/src/main/res/layout/file_details_share_user_item.xml b/src/main/res/layout/file_details_share_user_item.xml
index e824daf277..77024270a9 100644
--- a/src/main/res/layout/file_details_share_user_item.xml
+++ b/src/main/res/layout/file_details_share_user_item.xml
@@ -26,7 +26,8 @@
             android:layout_width="32sp"
             android:layout_height="32sp"
             android:src="@drawable/ic_user"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/user_icon"/>
 
         <TextView
             android:layout_width="match_parent"
diff --git a/src/main/res/layout/fingerprintlock.xml b/src/main/res/layout/fingerprintlock.xml
index 735288aa68..284d72c46c 100644
--- a/src/main/res/layout/fingerprintlock.xml
+++ b/src/main/res/layout/fingerprintlock.xml
@@ -58,7 +58,8 @@
             android:padding="16dp"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_fingerprint"
-            android:tint="@color/primary"/>
+            android:tint="@color/primary"
+            android:contentDescription="@string/fingerprint_icon"/>
 
     </LinearLayout>
 </LinearLayout>
diff --git a/src/main/res/layout/grid_image.xml b/src/main/res/layout/grid_image.xml
index 3e58eb56be..bba3d6b3a3 100644
--- a/src/main/res/layout/grid_image.xml
+++ b/src/main/res/layout/grid_image.xml
@@ -43,38 +43,44 @@
             android:id="@+id/favorite_action"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="top|right"
+            android:layout_gravity="top|end"
             android:layout_margin="@dimen/standard_quarter_margin"
             android:src="@drawable/ic_favorite"
-            />
+            android:contentDescription="@string/favorite_icon"/>
 
         <ImageView
             android:id="@+id/sharedIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="top|right"
+            android:layout_gravity="top|end"
             android:layout_marginTop="24dp"
             android:layout_marginRight="4dp"
-            android:src="@drawable/shared_via_link"/>
+            android:layout_marginEnd="4dp"
+            android:src="@drawable/shared_via_link"
+            android:contentDescription="@string/shared_via_link_icon"/>
 
         <ImageView
             android:id="@+id/localFileIndicator"
             android:layout_width="16dp"
             android:layout_height="16dp"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
             android:layout_marginRight="@dimen/standard_quarter_margin"
+            android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:layout_marginTop="@dimen/standard_quarter_margin"
-            android:src="@drawable/ic_synced"/>
+            android:src="@drawable/ic_synced"
+            android:contentDescription="@string/synced_icon"/>
 
         <ImageView
             android:id="@+id/keptOfflineIcon"
             android:layout_width="16dp"
             android:layout_height="16dp"
-            android:layout_gravity="bottom|right"
+            android:layout_gravity="bottom|end"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
             android:layout_marginRight="24dp"
-            android:src="@drawable/ic_available_offline" />
+            android:layout_marginEnd="24dp"
+            android:src="@drawable/ic_available_offline"
+            android:contentDescription="@string/available_offline_icon"/>
 
         <ImageView
             android:id="@+id/custom_checkbox"
@@ -84,7 +90,7 @@
             android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_gravity="center_vertical|top"
             android:src="@android:drawable/checkbox_off_background"
-            />
+            android:contentDescription="@string/checkbox"/>
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/grid_sync_item.xml b/src/main/res/layout/grid_sync_item.xml
index 127bf7e640..b652e024c6 100644
--- a/src/main/res/layout/grid_sync_item.xml
+++ b/src/main/res/layout/grid_sync_item.xml
@@ -64,7 +64,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@android:drawable/checkbox_off_background"
-            android:text="@string/placeholder_filesize"
+            android:text="@string/placeholder_fileSize"
             android:textColor="#ffffff"
             android:textSize="22sp"
             android:textStyle="bold"/>
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 594b6bba0c..6c61f9783c 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -36,6 +36,7 @@
             android:layout_height="@dimen/standard_list_item_size"
             android:paddingBottom="@dimen/standard_padding"
             android:paddingTop="@dimen/standard_padding"
+            android:paddingEnd="4dp"
             android:paddingRight="4dp">
 
             <ImageView
@@ -44,7 +45,9 @@
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_centerInParent="true"
                 android:layout_marginLeft="8dp"
-                android:src="@drawable/folder" />
+                android:layout_marginStart="8dp"
+                android:src="@drawable/folder"
+                android:contentDescription="@string/thumbnail"/>
 
             <ImageView
                 android:id="@+id/favorite_action"
@@ -52,8 +55,10 @@
                 android:layout_height="16dp"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_marginRight="4dp"
-                android:contentDescription="@string/favorite_switch"
+                android:layout_marginEnd="4dp"
+                android:contentDescription="@string/favorite"
                 android:src="@drawable/ic_favorite" />
 
             <ImageView
@@ -62,8 +67,11 @@
                 android:layout_width="12dp"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:layout_marginRight="20dp"
-                android:src="@drawable/ic_available_offline" />
+                android:layout_marginEnd="20dp"
+                android:src="@drawable/ic_available_offline"
+                android:contentDescription="@string/available_offline_icon"/>
 
             <ImageView
                 android:id="@+id/localFileIndicator"
@@ -72,9 +80,11 @@
                 android:src="@drawable/ic_synced"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
                 android:scaleType="fitCenter"
                 android:contentDescription="@string/downloader_download_succeeded_ticker"
-                android:layout_marginRight="4dp"/>
+                android:layout_marginRight="4dp"
+                android:layout_marginEnd="4dp"/>
 
         </RelativeLayout>
 
@@ -106,7 +116,7 @@
                     android:id="@+id/file_size"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/placeholder_filesize"
+                    android:text="@string/placeholder_fileSize"
                     android:textColor="@color/list_item_lastmod_and_filesize_text"
                     android:textSize="@dimen/two_line_secondary_text_size"/>
 
@@ -156,7 +166,8 @@
                 android:paddingStart="@dimen/standard_half_padding"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_unshared" />
+                android:src="@drawable/ic_unshared"
+                android:contentDescription="@string/shared_icon"/>
 
             <ImageView
                 android:id="@+id/custom_checkbox"
@@ -171,7 +182,8 @@
                 android:layout_toEndOf="@id/sharedIcon"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_checkbox_blank_outline" />
+                android:src="@drawable/ic_checkbox_blank_outline"
+                android:contentDescription="@string/checkbox"/>
 
             <ImageView
                 android:id="@+id/overflow_menu"
@@ -186,7 +198,8 @@
                 android:paddingEnd="@dimen/alternate_padding"
                 android:clickable="true"
                 android:focusable="true"
-                android:src="@drawable/ic_dots_vertical" />
+                android:src="@drawable/ic_dots_vertical"
+                android:contentDescription="@string/overflow_menu"/>
 
         </RelativeLayout>
 
diff --git a/src/main/res/layout/share_file_layout.xml b/src/main/res/layout/share_file_layout.xml
index f99b298096..627637a060 100644
--- a/src/main/res/layout/share_file_layout.xml
+++ b/src/main/res/layout/share_file_layout.xml
@@ -41,6 +41,8 @@
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="@dimen/standard_half_margin"
+                android:layout_marginEnd="@dimen/standard_half_margin"
+                android:contentDescription="@string/share_file_icon"
                 android:src="@drawable/file"/>
 
             <TextView
@@ -66,9 +68,10 @@
                 android:layout_below="@+id/shareFileName"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="@dimen/standard_quarter_margin"
+                android:layout_marginStart="@dimen/standard_quarter_margin"
                 android:layout_toEndOf="@+id/shareFileIcon"
                 android:layout_toRightOf="@+id/shareFileIcon"
-                android:text="@string/placeholder_filesize"
+                android:text="@string/placeholder_fileSize"
                 android:textSize="@dimen/share_file_layout_text_size"/>
 
         </RelativeLayout>
@@ -104,6 +107,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1"
+                android:paddingStart="@dimen/standard_half_padding"
                 android:paddingLeft="@dimen/standard_half_padding"
                 android:scrollbars="vertical"
                 android:visibility="gone"/>
@@ -147,6 +151,7 @@
                 android:layout_marginTop="@dimen/standard_half_margin"
                 android:checked="false"
                 android:paddingRight="@dimen/standard_half_padding"
+                android:paddingEnd="@dimen/standard_half_padding"
                 android:text="@string/share_via_link_section_title"
                 android:textColor="@color/color_accent"/>
 
diff --git a/src/main/res/layout/share_user_item.xml b/src/main/res/layout/share_user_item.xml
index e2eaa866a9..ed78057db2 100644
--- a/src/main/res/layout/share_user_item.xml
+++ b/src/main/res/layout/share_user_item.xml
@@ -31,7 +31,8 @@
             android:layout_height="wrap_content"
             android:id="@+id/icon"
             android:src="@drawable/ic_user"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/user_icon"/>
 
         <TextView
             android:layout_width="0dp"
@@ -64,7 +65,8 @@
             android:id="@+id/editShareButton"
             android:src="@drawable/ic_dots_vertical"
             android:padding="@dimen/standard_half_padding"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/overflow_menu"/>
 
     </LinearLayout>
 
diff --git a/src/main/res/layout/sorting_order_fragment.xml b/src/main/res/layout/sorting_order_fragment.xml
index f70c8ddcda..e2ff5785fe 100644
--- a/src/main/res/layout/sorting_order_fragment.xml
+++ b/src/main/res/layout/sorting_order_fragment.xml
@@ -58,7 +58,8 @@
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
-                    android:src="@drawable/ic_alphabetical_asc"/>
+                    android:src="@drawable/ic_alphabetical_asc"
+                    android:contentDescription="@string/sort_by_name_ascending"/>
 
                 <TextView
                     android:id="@+id/sortByNameAZText"
@@ -70,6 +71,7 @@
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
+                    android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_name_a_z"
                     android:textColor="@color/standard_grey"
@@ -91,7 +93,8 @@
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
-                    android:src="@drawable/ic_alphabetical_desc"/>
+                    android:src="@drawable/ic_alphabetical_desc"
+                    android:contentDescription="@string/sort_by_name_descending"/>
 
                 <TextView
                     android:id="@+id/sortByNameZAText"
@@ -103,6 +106,7 @@
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
+                    android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_name_z_a"
                     android:textColor="@color/standard_grey"
@@ -125,7 +129,8 @@
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
-                    android:src="@drawable/ic_modification_desc"/>
+                    android:src="@drawable/ic_modification_desc"
+                    android:contentDescription="@string/sort_by_modification_date_descending"/>
 
                 <TextView
                     android:id="@+id/sortByModificationDateNewestFirstText"
@@ -137,6 +142,7 @@
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
+                    android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_date_newest_first"
                     android:textColor="@color/standard_grey"
@@ -158,7 +164,8 @@
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
-                    android:src="@drawable/ic_modification_asc"/>
+                    android:src="@drawable/ic_modification_asc"
+                    android:contentDescription="@string/sort_by_modification_date_ascending"/>
 
                 <TextView
                     android:id="@+id/sortByModificationDateOldestFirstText"
@@ -170,6 +177,7 @@
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
+                    android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_date_oldest_first"
                     android:textColor="@color/standard_grey"
@@ -193,7 +201,8 @@
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
-                    android:src="@drawable/ic_size_desc"/>
+                    android:src="@drawable/ic_size_desc"
+                    android:contentDescription="@string/sort_by_size_descending"/>
 
                 <TextView
                     android:id="@+id/sortBySizeBiggestFirstText"
@@ -205,6 +214,7 @@
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
+                    android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_size_biggest_first"
                     android:textColor="@color/standard_grey"
@@ -226,7 +236,8 @@
                     android:paddingLeft="@dimen/standard_padding"
                     android:paddingRight="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
-                    android:src="@drawable/ic_size_asc"/>
+                    android:src="@drawable/ic_size_asc"
+                    android:contentDescription="@string/sort_by_size_ascending"/>
 
                 <TextView
                     android:id="@+id/sortBySizeSmallestFirstText"
@@ -238,6 +249,7 @@
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
+                    android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_size_smallest_first"
                     android:textColor="@color/standard_grey"
@@ -252,7 +264,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="right">
+        android:gravity="end">
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
diff --git a/src/main/res/layout/synced_folders_item_header.xml b/src/main/res/layout/synced_folders_item_header.xml
index a3c9333fad..8547844e06 100644
--- a/src/main/res/layout/synced_folders_item_header.xml
+++ b/src/main/res/layout/synced_folders_item_header.xml
@@ -28,6 +28,7 @@
         android:layout_height="wrap_content"
         android:paddingBottom="@dimen/alternate_half_padding"
         android:paddingLeft="@dimen/standard_padding"
+        android:paddingStart="@dimen/standard_padding"
         android:paddingTop="@dimen/alternate_half_padding">
 
         <LinearLayout
@@ -36,8 +37,10 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/buttonBar"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_alignTop="@+id/buttonBar"
-            android:layout_toLeftOf="@+id/buttonBar">
+            android:layout_toLeftOf="@+id/buttonBar"
+            android:layout_toStartOf="@+id/buttonBar">
 
             <ImageView
                 android:id="@+id/type"
@@ -45,7 +48,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:paddingRight="@dimen/standard_half_padding"
-                android:src="@drawable/ic_image_18dp"/>
+                android:paddingEnd="@dimen/standard_half_padding"
+                android:src="@drawable/ic_image_18dp"
+                android:contentDescription="@string/synced_folders_type"/>
 
             <TextView
                 android:id="@+id/title"
@@ -63,7 +68,8 @@
             android:id="@+id/buttonBar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true">
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true">
 
             <ImageButton
                 android:id="@+id/syncStatusButton"
@@ -72,7 +78,9 @@
                 android:background="@color/transparent"
                 android:clickable="true"
                 android:padding="@dimen/standard_half_padding"
-                android:src="@drawable/ic_cloud_sync_off"/>
+                android:src="@drawable/ic_cloud_sync_off"
+                android:contentDescription="@string/sync_status_button"
+                android:focusable="true"/>
 
             <ImageButton
                 android:id="@+id/settingsButton"
@@ -82,9 +90,13 @@
                 android:clickable="true"
                 android:paddingBottom="@dimen/standard_half_padding"
                 android:paddingLeft="@dimen/standard_half_padding"
+                android:paddingStart="@dimen/standard_half_padding"
                 android:paddingRight="@dimen/standard_padding"
+                android:paddingEnd="@dimen/standard_padding"
                 android:paddingTop="@dimen/standard_half_padding"
-                android:src="@drawable/ic_dots_vertical"/>
+                android:src="@drawable/ic_dots_vertical"
+                android:contentDescription="@string/synced_folder_settings_button"
+                android:focusable="true"/>
         </LinearLayout>
     </RelativeLayout>
 
diff --git a/src/main/res/layout/synced_folders_layout.xml b/src/main/res/layout/synced_folders_layout.xml
index e7d6c75c6b..30ad0a0f65 100644
--- a/src/main/res/layout/synced_folders_layout.xml
+++ b/src/main/res/layout/synced_folders_layout.xml
@@ -59,14 +59,17 @@
                         android:id="@+id/custom_folder_image"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/ic_folder_star_18dp"/>
+                        android:src="@drawable/ic_folder_star_18dp"
+                        android:contentDescription="@string/synced_folder_custom_folder_image"/>
 
                     <TextView
                         android:id="@+id/add_custom_folder"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_toRightOf="@id/custom_folder_image"
+                        android:layout_toEndOf="@id/custom_folder_image"
                         android:paddingLeft="@dimen/alternate_half_padding"
+                        android:paddingStart="@dimen/alternate_half_padding"
                         android:text="@string/autoupload_custom_folder"/>
 
                 </RelativeLayout>
diff --git a/src/main/res/layout/upload_files_layout.xml b/src/main/res/layout/upload_files_layout.xml
index 3b2c2b5172..3d975403eb 100644
--- a/src/main/res/layout/upload_files_layout.xml
+++ b/src/main/res/layout/upload_files_layout.xml
@@ -40,7 +40,8 @@
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:src="@drawable/uploader_list_separator"/>
+            android:src="@drawable/uploader_list_separator"
+            android:contentDescription="@null"/>
 
     </LinearLayout>
 
@@ -83,7 +84,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel"
-            android:layout_marginRight="@dimen/standard_half_margin"/>
+            android:layout_marginRight="@dimen/standard_half_margin"
+            android:layout_marginEnd="@dimen/standard_half_margin"/>
 
         <android.support.v7.widget.AppCompatButton
 		    android:id="@+id/upload_files_btn_upload"
diff --git a/src/main/res/layout/upload_list_item.xml b/src/main/res/layout/upload_list_item.xml
index 55a6eca84b..e05032b278 100755
--- a/src/main/res/layout/upload_list_item.xml
+++ b/src/main/res/layout/upload_list_item.xml
@@ -19,7 +19,8 @@
             android:layout_width="@dimen/file_icon_size"
             android:layout_height="@dimen/file_icon_size"
             android:layout_gravity="center"
-            android:src="@drawable/folder" />
+            android:src="@drawable/folder"
+            android:contentDescription="@string/thumbnail"/>
   
     </FrameLayout>
 
@@ -50,11 +51,11 @@
                 android:id="@+id/upload_file_size"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="left"
+                android:gravity="start"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
                 android:ellipsize="middle"
                 android:singleLine="true"
-                android:text="@string/placeholder_filesize"
+                android:text="@string/placeholder_fileSize"
                 android:textSize="@dimen/upload_list_item_text_size"/>
             <TextView
                 android:id="@+id/upload_date"
@@ -111,7 +112,7 @@
         android:focusableInTouchMode="false"
         android:layout_gravity="center_vertical"
         android:paddingLeft="@dimen/standard_half_padding"
-     >
+        android:paddingStart="@dimen/standard_half_padding">
 
         <ImageButton
             android:id="@+id/upload_right_button"
@@ -119,7 +120,7 @@
             android:layout_height="@dimen/upload_list_item_image_size"
             android:layout_gravity="center"
             android:background="@android:color/transparent"
-     />
+            android:contentDescription="@string/upload_item_action_button"/>
 
 	</FrameLayout>
     
diff --git a/src/main/res/layout/uploader_layout.xml b/src/main/res/layout/uploader_layout.xml
index 128d2bc582..aebfc30dda 100644
--- a/src/main/res/layout/uploader_layout.xml
+++ b/src/main/res/layout/uploader_layout.xml
@@ -48,9 +48,10 @@
 		android:orientation="horizontal">
 
 		<ImageView
-			android:layout_width="match_parent"
-			android:layout_height="1dp"
-			android:src="@drawable/uploader_list_separator"/>
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:src="@drawable/uploader_list_separator"
+            android:contentDescription="@null"/>
 
 	</LinearLayout>
 
@@ -62,15 +63,16 @@
         android:padding="@dimen/standard_padding">
 
 		<android.support.v7.widget.AppCompatButton
-			android:theme="@style/Button"
-		    android:id="@+id/uploader_cancel"
-			style="@style/ownCloud.Button"
-		    android:layout_width="fill_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_gravity="bottom"
-		    android:layout_weight="1"
-		    android:text="@string/common_cancel"
-			android:layout_marginRight="@dimen/standard_half_margin" />
+            android:theme="@style/Button"
+            android:id="@+id/uploader_cancel"
+            style="@style/ownCloud.Button"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_weight="1"
+            android:text="@string/common_cancel"
+            android:layout_marginRight="@dimen/standard_half_margin"
+            android:layout_marginEnd="@dimen/standard_half_margin"/>
 
 		<android.support.v7.widget.AppCompatButton
 		    android:id="@+id/uploader_choose_folder"
diff --git a/src/main/res/layout/uploader_list_item_layout.xml b/src/main/res/layout/uploader_list_item_layout.xml
index b33cf1a2f2..8f2a41f199 100644
--- a/src/main/res/layout/uploader_list_item_layout.xml
+++ b/src/main/res/layout/uploader_list_item_layout.xml
@@ -62,7 +62,7 @@
                 android:id="@+id/file_size"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/placeholder_filesize"
+                android:text="@string/placeholder_fileSize"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
                 android:textSize="@dimen/two_line_secondary_text_size"/>
 
diff --git a/src/main/res/layout/whats_new_activity.xml b/src/main/res/layout/whats_new_activity.xml
index 16f49c867e..ed37f3906b 100644
--- a/src/main/res/layout/whats_new_activity.xml
+++ b/src/main/res/layout/whats_new_activity.xml
@@ -89,7 +89,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:src="@drawable/arrow_right"/>
+                android:src="@drawable/arrow_right"
+                android:contentDescription="@string/forward"/>
         </LinearLayout>
     </LinearLayout>
 
diff --git a/src/main/res/layout/whats_new_element.xml b/src/main/res/layout/whats_new_element.xml
index d218b51945..ef3814dd7d 100644
--- a/src/main/res/layout/whats_new_element.xml
+++ b/src/main/res/layout/whats_new_element.xml
@@ -32,7 +32,8 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="10dp"
         android:layout_weight="50"
-        android:src="@drawable/whats_new_files"/>
+        android:src="@drawable/whats_new_files"
+        android:contentDescription="@string/what_s_new_image"/>
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 05633c7f5c..ad51da6da6 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -230,7 +230,7 @@
 
     <string name="placeholder_sentence">هذه مساحة محجوزة</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 مساء</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-ast/strings.xml b/src/main/res/values-ast/strings.xml
index 432ddf7afc..edf77fab14 100644
--- a/src/main/res/values-ast/strings.xml
+++ b/src/main/res/values-ast/strings.xml
@@ -249,7 +249,7 @@
 
     <string name="placeholder_sentence">Esto ye un marcador de posición</string>
     <string name="placeholder_filename">MarcadorDePosicion.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index e97f2c21f2..0a13697a74 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -221,7 +221,7 @@
 
     <string name="placeholder_sentence">Това е за запазено място</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index a930ff4bfc..c669329df7 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -291,7 +291,7 @@
 
     <string name="placeholder_sentence">Això és un text variable</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml
index a0155c7dd3..c42f732927 100644
--- a/src/main/res/values-cs-rCZ/strings.xml
+++ b/src/main/res/values-cs-rCZ/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Zástupný text</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index ede0cbd6cb..3c360bc24a 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -266,7 +266,7 @@
 
     <string name="placeholder_sentence">Dette er en pladsholder</string>
     <string name="placeholder_filename">pladsholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml
index c1c1327833..f548f89edc 100644
--- a/src/main/res/values-de-rDE/strings.xml
+++ b/src/main/res/values-de-rDE/strings.xml
@@ -331,7 +331,7 @@
 
     <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
     <string name="placeholder_filename">platzhalter.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">18.5.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 71e902be35..8fc338ca74 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -331,7 +331,7 @@
 
     <string name="placeholder_sentence">Dies ist ein Platzhalter</string>
     <string name="placeholder_filename">platzhalter.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">18.5.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 332dcdce5c..75d764ee05 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -292,7 +292,7 @@
 
     <string name="placeholder_sentence">Αυτό είναι ένα σημείο placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml
index 7977ef69fc..cc36a19030 100644
--- a/src/main/res/values-en-rGB/strings.xml
+++ b/src/main/res/values-en-rGB/strings.xml
@@ -330,7 +330,7 @@
 
     <string name="placeholder_sentence">This is a placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml
index 2756e41a29..69be707131 100644
--- a/src/main/res/values-es-rAR/strings.xml
+++ b/src/main/res/values-es-rAR/strings.xml
@@ -288,7 +288,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rCL/strings.xml b/src/main/res/values-es-rCL/strings.xml
index 64397a3703..0d96469739 100644
--- a/src/main/res/values-es-rCL/strings.xml
+++ b/src/main/res/values-es-rCL/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rCO/strings.xml b/src/main/res/values-es-rCO/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rCO/strings.xml
+++ b/src/main/res/values-es-rCO/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rCR/strings.xml b/src/main/res/values-es-rCR/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rCR/strings.xml
+++ b/src/main/res/values-es-rCR/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rDO/strings.xml b/src/main/res/values-es-rDO/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rDO/strings.xml
+++ b/src/main/res/values-es-rDO/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rEC/strings.xml
+++ b/src/main/res/values-es-rEC/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rGT/strings.xml b/src/main/res/values-es-rGT/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rGT/strings.xml
+++ b/src/main/res/values-es-rGT/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rHN/strings.xml b/src/main/res/values-es-rHN/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rHN/strings.xml
+++ b/src/main/res/values-es-rHN/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index c534d7dcb2..2d1ebc0f86 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -325,7 +325,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rNI/strings.xml b/src/main/res/values-es-rNI/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rNI/strings.xml
+++ b/src/main/res/values-es-rNI/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rPA/strings.xml b/src/main/res/values-es-rPA/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rPA/strings.xml
+++ b/src/main/res/values-es-rPA/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rPE/strings.xml b/src/main/res/values-es-rPE/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rPE/strings.xml
+++ b/src/main/res/values-es-rPE/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rPR/strings.xml b/src/main/res/values-es-rPR/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rPR/strings.xml
+++ b/src/main/res/values-es-rPR/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rPY/strings.xml b/src/main/res/values-es-rPY/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rPY/strings.xml
+++ b/src/main/res/values-es-rPY/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rSV/strings.xml b/src/main/res/values-es-rSV/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rSV/strings.xml
+++ b/src/main/res/values-es-rSV/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es-rUY/strings.xml b/src/main/res/values-es-rUY/strings.xml
index 6543dc36d7..eab8b02e9a 100644
--- a/src/main/res/values-es-rUY/strings.xml
+++ b/src/main/res/values-es-rUY/strings.xml
@@ -324,7 +324,7 @@
 
     <string name="placeholder_sentence">Este es un marcador de posición</string>
     <string name="placeholder_filename">marcadordeposición.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 8c6b94cdda..99effa415f 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -330,7 +330,7 @@
 
     <string name="placeholder_sentence">Esto es un marcador de posición</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index ad928f98b9..28fade0dd3 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -294,7 +294,7 @@ Mesedez, baimendu berriz</string>
 
     <string name="placeholder_sentence">Hau leku-marka da</string>
     <string name="placeholder_filename">kokalekua.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 2452761a72..d68f226702 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -276,7 +276,7 @@
 
     <string name="placeholder_sentence">این یک حفره است.</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 کیلو بایت</string>
+    <string name="placeholder_fileSize">389 کیلو بایت</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 بعد از ظهر</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-fi-rFI/strings.xml b/src/main/res/values-fi-rFI/strings.xml
index c6c37bb5ef..e97d22cfd2 100644
--- a/src/main/res/values-fi-rFI/strings.xml
+++ b/src/main/res/values-fi-rFI/strings.xml
@@ -270,7 +270,7 @@
     <string name="ssl_validator_null_cert">Varmennetta ei voi näyttää.</string>
     <string name="ssl_validator_no_info_about_error">- Ei lisätietoja virheestä</string>
 
-    <string name="placeholder_filesize">389 kt</string>
+    <string name="placeholder_fileSize">389 kt</string>
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Lähetä vain Wi-Fi-yhteydellä</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 64ef406ffc..09662c5c21 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -332,7 +332,7 @@ Attention la suppression est irréversible.</string>
 
     <string name="placeholder_sentence">Ceci est un espace réservé</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 Ko</string>
+    <string name="placeholder_fileSize">389 Ko</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-he/strings.xml b/src/main/res/values-he/strings.xml
index ba3b8a5bdd..800d7057f6 100644
--- a/src/main/res/values-he/strings.xml
+++ b/src/main/res/values-he/strings.xml
@@ -208,7 +208,7 @@
 
     <string name="placeholder_sentence">זהו ממלא מקום</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 ק״ב</string>
+    <string name="placeholder_fileSize">389 ק״ב</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-hu-rHU/strings.xml b/src/main/res/values-hu-rHU/strings.xml
index ec0a2a6814..2714455c08 100644
--- a/src/main/res/values-hu-rHU/strings.xml
+++ b/src/main/res/values-hu-rHU/strings.xml
@@ -330,7 +330,7 @@
 
     <string name="placeholder_sentence">Ez egy helyőrző</string>
     <string name="placeholder_filename">helyörző.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">2012&#8211;05&#8211;18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 51cba3a89b..6bd736649a 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -290,7 +290,7 @@
 
     <string name="placeholder_sentence">Ini adalah placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml
index aa7f11d865..b9ca1edaa7 100644
--- a/src/main/res/values-is/strings.xml
+++ b/src/main/res/values-is/strings.xml
@@ -325,7 +325,7 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
 
     <string name="placeholder_sentence">Þetta er frátökutákn</string>
     <string name="placeholder_filename">frátökutákn.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 EH</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 1fee0c75d1..cfe71d490c 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -330,7 +330,7 @@
 
     <string name="placeholder_sentence">Questo è un segnaposto</string>
     <string name="placeholder_filename">segnaposto.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-ja-rJP/strings.xml b/src/main/res/values-ja-rJP/strings.xml
index 23c1707db8..e15b36d039 100644
--- a/src/main/res/values-ja-rJP/strings.xml
+++ b/src/main/res/values-ja-rJP/strings.xml
@@ -255,7 +255,7 @@
 
     <string name="placeholder_sentence">これはプレースホルダです</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-ka-rGE/strings.xml b/src/main/res/values-ka-rGE/strings.xml
index 9f3edb7294..adbd4cc265 100644
--- a/src/main/res/values-ka-rGE/strings.xml
+++ b/src/main/res/values-ka-rGE/strings.xml
@@ -328,7 +328,7 @@
 
     <string name="placeholder_sentence">ეს არის ადგილი</string>
     <string name="placeholder_filename">ადგილი.txt</string>
-    <string name="placeholder_filesize">389 კბ</string>
+    <string name="placeholder_fileSize">389 კბ</string>
     <string name="placeholder_timestamp">18/05/2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 061c933822..c7e3fb106e 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -256,7 +256,7 @@
 
     <string name="placeholder_sentence">이것은 자리 비움자입니다</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389KB</string>
+    <string name="placeholder_fileSize">389KB</string>
     <string name="placeholder_timestamp">2012년 05월 18일 오후 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-lt-rLT/strings.xml b/src/main/res/values-lt-rLT/strings.xml
index ad989ec276..e86e9d6dc5 100644
--- a/src/main/res/values-lt-rLT/strings.xml
+++ b/src/main/res/values-lt-rLT/strings.xml
@@ -292,7 +292,7 @@
 
     <string name="placeholder_sentence">Rezervas</string>
     <string name="placeholder_filename">rezervas.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
index c6ca1bdef8..066322d224 100644
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@@ -197,7 +197,7 @@
     <string name="ssl_validator_no_info_about_error">- Nav informācijas par kļūdu</string>
 
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 2ca53f11b5..c4a544877f 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -330,7 +330,7 @@
 
     <string name="placeholder_sentence">Dette er en plassholder</string>
     <string name="placeholder_filename">plassholder.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">18.05.2012 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 41a144a0e1..10c3ee66c9 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -331,7 +331,7 @@ Kies er eentje van een provider.</string>
 
     <string name="placeholder_sentence">Dit is een plaatshouder</string>
     <string name="placeholder_filename">plaatshouder.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 8bc5f56a02..fcb315f6fe 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -322,7 +322,7 @@
 
     <string name="placeholder_sentence">Tekst zastępczy</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index ac2e83fe74..9606f4e4fe 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -330,7 +330,7 @@
 
     <string name="placeholder_sentence">Este é um espaço reservado</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index ab9c64fcff..9a188c7b93 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -204,7 +204,7 @@
 
     <string name="placeholder_sentence">Acesta este un substituent</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KO</string>
+    <string name="placeholder_fileSize">389 KO</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 0dc3dea42d..a5dde7f716 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -326,7 +326,7 @@
 
     <string name="placeholder_sentence">Это заполнитель</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 КБ</string>
+    <string name="placeholder_fileSize">389 КБ</string>
     <string name="placeholder_timestamp">2012/05/18 12:23</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-sk-rSK/strings.xml b/src/main/res/values-sk-rSK/strings.xml
index 667396ba16..2dc78cc003 100644
--- a/src/main/res/values-sk-rSK/strings.xml
+++ b/src/main/res/values-sk-rSK/strings.xml
@@ -269,7 +269,7 @@
 
     <string name="placeholder_sentence">Toto je \"placeholder\"</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index c1a5fd4bfb..0b60bdc9e5 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -290,7 +290,7 @@
 
     <string name="placeholder_sentence">To je vsebnik predmetov</string>
     <string name="placeholder_filename">vsebnik.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index d336e70650..be9e51aebb 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -314,7 +314,7 @@
 
     <string name="placeholder_sentence">Kjo është një vendmbajtëse</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 4c6c0fab25..e9ba4d1eb4 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -332,7 +332,7 @@
 
     <string name="placeholder_sentence">Ово је местодржач</string>
     <string name="placeholder_filename">чувамместо.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 ПоП</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index f36989b994..880ea6b15f 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -291,7 +291,7 @@
 
     <string name="placeholder_sentence">Detta är en platshållare</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 17c5ce7e63..d0310ab39d 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -330,7 +330,7 @@
 
     <string name="placeholder_sentence">Bu bir yer belirleyicidir</string>
     <string name="placeholder_filename">yerbelirleyici.txt</string>
-    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_fileSize">389 KB</string>
     <string name="placeholder_timestamp">2012/05/18 12:23 ÖS</string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index de8f39fb56..1bafe1a473 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -302,7 +302,7 @@
 
     <string name="placeholder_sentence">占位符</string>
     <string name="placeholder_filename">点位符.txt</string>
-    <string name="placeholder_filesize">389字节</string>
+    <string name="placeholder_fileSize">389字节</string>
     <string name="placeholder_timestamp">2012/05/18 下午12:23 </string>
     <string name="placeholder_media_time">12:23:45</string>
 
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 99f9a4dc3d..83485ce856 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -290,7 +290,7 @@
 
     <string name="placeholder_sentence">這是佔位內容</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d2c4ad27fa..5e5e2958fe 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -332,7 +332,7 @@
 
     <string name="placeholder_sentence">This is a placeholder</string>
     <string name="placeholder_filename">placeholder.txt</string>
-    <string name="placeholder_filesize">389 KB</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>
 
@@ -716,9 +716,40 @@
     <string name="store_short_desc">The Nextcloud Android app gives you access to all your files in your Nextcloud</string>
     <string name="store_full_desc">The copyleft libre software Nextcloud Android app, gives you access to all the files in your Nextcloud.\n\nFeatures:\n* Easy, modern interface, suited to the theme of your server\n* Upload files to your Nextcloud server\n* Share them with others\n* Keep your favorite files and folders synced\n* Search across all folders on your server\n* Auto Upload for photos and videos taken by your device\n* Keep up to date with notifications\n* Multi-account support\n* Secure access to your data with fingerprint or PIN\n* Integration with DAVdroid for easy setup of calendar &amp; Contacts synchronization\n\nPlease report all issues at https://github.com/nextcloud/android/issues and discuss this app at https://help.nextcloud.com/c/clients/android\n\nNew to Nextcloud? Nextcloud is a private file sync &amp; share and communication server. It is libre software, and you can host it yourself or pay a company to do it for you. That way, you are in control of your photos, your calendar and contact data, your documents and everything else.\n\nCheck out Nextcloud at https://nextcloud.com</string>
 
+    <string name="drawer_current_account">Current account</string>
+    <string name="drawer_middle_account">Middle account</string>
+    <string name="drawer_end_account">Last account</string>
+    <string name="contactlist_item_icon">Contactlist user icon</string>
+    <string name="activity_icon">Activity icon</string>
+    <string name="file_icon">File icon</string>
+    <string name="user_icon">User icon</string>
+    <string name="fingerprint_icon">Fingerprint icon</string>
+    <string name="favorite_icon">Favorite icon</string>
+    <string name="shared_via_link_icon">Shared via link icon</string>
+    <string name="synced_icon">Synced icon</string>
+    <string name="available_offline_icon">Available offline icon</string>
+    <string name="checkbox">Checkbox</string>
+    <string name="thumbnail">Thumbnail</string>
+    <string name="shared_icon">Shared icon</string>
+    <string name="overflow_menu">Overflow menu</string>
+    <string name="share_file_icon">Share file icon</string>
+    <string name="sort_by_name_ascending">Sort by name ascending</string>
+    <string name="sort_by_modification_date_ascending">Sort by modification date ascending</string>
+    <string name="sort_by_size_descending">Sort by size descending</string>
+    <string name="sort_by_size_ascending">Sort by size ascending</string>
+    <string name="sort_by_name_descending">Sort by name descending</string>
+    <string name="sort_by_modification_date_descending">Sort by modification date descending</string>
+    <string name="synced_folders_type">Type</string>
+    <string name="sync_status_button">Sync status button</string>
+    <string name="synced_folder_settings_button">Settings button</string>
+    <string name="synced_folder_custom_folder_image">Custom folder image</string>
+    <string name="upload_item_action_button">Upload item action button</string>
+    <string name="forward">Forward</string>
+    <string name="what_s_new_image">What\'s new image</string>
+
     <string name="store_short_dev_desc">The Nextcloud Dev app is a development snapshot and can be installed parallel.</string>
     <string name="store_full_dev_desc">The Open Source Nextcloud Android app allows you to access all your files on your Nextcloud.\nThis is a dev version of the official Nextcloud app and includes brand-new, untested features which might lead to instabilities and data loss. The app is designed for users willing to test the new features and to report bugs if they occur. Do not use it for your productive work!\n\nThe dev version can be installed alongside the official Nextcloud app which is available at F-Droid, too. Once a day it is checked if the source code was updated, so there can be longer pauses between builds.</string>
-    
+
     <string name="prefs_category_dev">Dev</string>
     <string name="dev_version_no_information_available">No information available!</string>
     <string name="dev_version_no_new_version_available">No new version available!</string>