From 4384d755a4132e119cdf31f1a0bf3ead14b91f43 Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Fri, 31 Jul 2015 12:36:42 +0200
Subject: [PATCH 1/4] Update library refernce: Upgrade jackrabbit to 2.10.1

---
 owncloud-android-library | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owncloud-android-library b/owncloud-android-library
index 02c24c8a3b..d89387b8df 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 02c24c8a3bd87382590ece0e0744ad430718b51a
+Subproject commit d89387b8df6d1829d6ea57b1cdf74eaa9043e035

From 1aa1a1fd50e2545653c404481f77e20be3682cfc Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Fri, 31 Jul 2015 15:21:18 +0200
Subject: [PATCH 2/4] Update library reference

---
 owncloud-android-library | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owncloud-android-library b/owncloud-android-library
index d89387b8df..482a70fba1 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit d89387b8df6d1829d6ea57b1cdf74eaa9043e035
+Subproject commit 482a70fba1775a849a643761efc3952875e31f77

From d77f1d7ec005746a8598e163b096f4bd284d12d7 Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Mon, 3 Aug 2015 15:07:20 +0200
Subject: [PATCH 3/4] Update build.gradle to 1.2.3

---
 build.gradle                  | 2 +-
 oc_jb_workaround/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 209b7ee946..ae06be8f27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 
diff --git a/oc_jb_workaround/build.gradle b/oc_jb_workaround/build.gradle
index 882a090f5e..2fcc9f6c60 100644
--- a/oc_jb_workaround/build.gradle
+++ b/oc_jb_workaround/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 apply plugin: 'com.android.library'

From 74d5911e567d5626a03f6cfffeb91a0426be4e01 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 4 Aug 2015 01:14:04 -0400
Subject: [PATCH 4/4] [tx-robot] updated from transifex

---
 res/values-ar/strings.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b05bc3366a..8137565763 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -11,16 +11,27 @@
   <string name="actionbar_settings">إعدادات</string>
   <string name="actionbar_see_details">تفاصيل</string>
   <string name="actionbar_send_file">أرسل</string>
+  <string name="actionbar_sort">ترتيب</string>
+  <string name="actionbar_sort_title">ترتيب بـ</string>
+  <string-array name="actionbar_sortby">
+    <item>الف باء</item>
+    <item>الأحدث إلى الاقدم</item>
+  </string-array>
   <!--TODO re-enable when server-side folder size calculation is available   
     	<item>Biggest - Smallest</item>-->
   <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
   <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">كل الملفات</string>
   <!--TODO re-enable when "On Device" is available
     <string name="drawer_item_on_device">On device</string>-->
+  <string name="drawer_item_settings">الإعدادات</string>
+  <string name="drawer_item_logs">سجلّ</string>
+  <string name="drawer_close">إغلاق</string>
   <string name="prefs_category_general">عام</string>
   <string name="prefs_category_more">المزيد</string>
   <string name="prefs_accounts">حسابات</string>
   <string name="prefs_manage_accounts">إدارة الحسابات</string>
+  <string name="prefs_passcode">الرقم السري</string>
   <string name="prefs_instant_upload">رفع الصورة مباشرة</string>
   <string name="prefs_instant_upload_summary">رفع صورة المؤخذة عبر الكاميرا</string>
   <string name="prefs_instant_video_upload">رفع فيديو مباشرة</string>
@@ -34,6 +45,8 @@
   <string name="prefs_recommend">توصية الى صديق</string>
   <string name="prefs_feedback">ملاحظات</string>
   <string name="prefs_imprint">الدمغة.</string>
+  <string name="prefs_remember_last_share_location">تذكر مشاركة الموقع</string>
+  <string name="prefs_remember_last_upload_location_summary">تذكر آخر موقع رُفِعَ</string>
   <string name="recommend_subject">جرب %1$s على جهازك الذكي</string>
   <string name="auth_check_server">تحقق من الخادم</string>
   <string name="auth_host_url">عنوان الخادم https://…</string>
@@ -55,6 +68,8 @@
   <string name="uploader_info_uploading">يتم الرفع</string>
   <string name="file_list_seconds_ago">منذ ثواني</string>
   <string name="file_list_empty">لا يوجد شيء هنا. إرفع بعض الملفات!</string>
+  <string name="file_list_loading">تحميل ...</string>
+  <string name="local_file_list_empty">لا توجد ملفات في هذا المجلد</string>
   <string name="filedetails_select_file">اضغظ على الملف ليتم عرض خيارات أكثر</string>
   <string name="filedetails_size">الحجم :</string>
   <string name="filedetails_type">النوع :</string>
@@ -243,6 +258,7 @@
   <string name="network_host_not_available">تعذر إكمال العملية، الخادم غير متوفر</string>
   <string name="empty"></string>
   <string name="prefs_category_accounts">حسابات</string>
+  <string name="actionbar_logger">سجل</string>
   <string name="saml_authentication_wrong_pass">كلمة مرور خاطئة</string>
   <string name="folder_picker_choose_button_text">اختيار</string>
   <string name="prefs_category_security">الأمان</string>