From 49fddadd809a56771f668563b7b9b7ce156c68a5 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 7 Jun 2016 01:14:21 -0400
Subject: [PATCH 1/7] [tx-robot] updated from transifex

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

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 58e44e6b81..bfadd47c15 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -63,6 +63,9 @@
   <string name="uploader_wrn_no_account_text">Cihazınızda hiç %1$s hesabı yok. Lütfen ilk olarak bir hesap ayarlayın.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">Kurulum</string>
   <string name="uploader_wrn_no_account_quit_btn_text">Çıkış</string>
+  <string name="uploader_error_title_no_file_to_upload">Yüklenecek dosya yok</string>
+  <string name="uploader_error_message_no_file_to_upload">Alınan veri hiç geçerii dosya içermiyor.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">Dosya yüklenemiyor</string>
   <string name="file_list_seconds_ago">saniyeler önce</string>
   <string name="file_list_empty">Burada hiçbir şey yok. Bir şeyler yükleyin!</string>
   <string name="file_list_loading">Yükleniyor...</string>
@@ -216,6 +219,8 @@
         </string>
   <string name="auth_can_not_auth_against_server">Bu sunucuya karşı kimlik doğrulama yapılamaz</string>
   <string name="auth_account_does_not_exist">Hesap henüz cihazda mevcut değil</string>
+  <string name="favorite">Çevrimdışı erişim olarak işaretle</string>
+  <string name="unfavorite">Çevrimdışı erişimden kaldır</string>
   <string name="common_rename">Yeniden adlandır</string>
   <string name="common_remove">Kaldır</string>
   <string name="confirmation_remove_alert">Gerçekten %1$s dosyasını kaldırmak istiyor musunuz?</string>
@@ -298,6 +303,7 @@
   <string name="activity_chooser_send_file_title">Gönder</string>
   <string name="copy_link">Bağlantıyı kopyala</string>
   <string name="clipboard_text_copied">Panoya kopyalandı</string>
+  <string name="clipboard_uxexpected_error">Panoya kopyalanırken beklenmeyen bir hata oluştu</string>
   <string name="error_cant_bind_to_operations_service">Ciddi hata: işlem gerçekleştirilemiyor</string>
   <string name="network_error_socket_exception">Sunucuya bağlanılırken bir hata oluştu.</string>
   <string name="network_error_socket_timeout_exception">Sunucu beklenirken bir hata oluştu, işlem yapılamadı</string>
@@ -399,4 +405,5 @@
   <string name="manage_space_clear_data">Verileri temizle</string>
   <string name="manage_space_error">Bazı dosyalar silinemedi</string>
   <string name="permission_storage_access">Dosya yüklemek ve indirmek için ek izin gerekiyor.</string>
+  <string name="local_file_not_found_toast">Dosya yerel dosya sisteminde bulunamadı.</string>
 </resources>

From 6d2747c19989e2408f3baffb07a732ba500e4b68 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 8 Jun 2016 01:13:57 -0400
Subject: [PATCH 2/7] [tx-robot] updated from transifex

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

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 40fe1b8536..42535e7f57 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="about_android">%1$s تطبيق آندرويد</string>
   <string name="about_version">الإصدار %1$s</string>
   <string name="actionbar_sync">تحديث الحساب</string>
   <string name="actionbar_upload">رفع</string>
@@ -24,11 +25,13 @@
   <!--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_uploads_list">التحميلات</string>
   <string name="drawer_close">إغلاق</string>
   <string name="drawer_open">افتح</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>
@@ -43,6 +46,8 @@
   <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="recommend_text">أريد دعوتك لاستخدام %1$s على هاتفك الذكي!\n تحميل من هنا: %2$s</string>
+  <string name="auth_check_server">فحص الخادم</string>
   <string name="auth_host_url">عنوان الخادم https://…</string>
   <string name="auth_username">إسم المستخدم</string>
   <string name="auth_password">كلمة السر</string>
@@ -52,12 +57,21 @@
   <string name="uploader_btn_upload_text">رفع</string>
   <string name="uploader_top_message">اختر مجلد الرفع</string>
   <string name="uploader_wrn_no_account_title">لم يتم العثور على أي حساب</string>
+  <string name="uploader_wrn_no_account_text">لا توجد حسابات %1$s على جهازك.  أنت بحاجة لإعداد حساب في البداية.</string>
   <string name="uploader_wrn_no_account_setup_btn_text">تهيئة</string>
   <string name="uploader_wrn_no_account_quit_btn_text">خروج</string>
+  <string name="uploader_error_title_no_file_to_upload">لا يوجد ملف لترفعه</string>
+  <string name="uploader_error_message_received_piece_of_text">%1$s لا يمكنه رفع جزء نص على أنه ملف.</string>
+  <string name="uploader_error_message_no_file_to_upload">البيانات المستلمة لا تشمل أي ملف صالح.</string>
+  <string name="uploader_error_title_file_cannot_be_uploaded">الملف لا يمكن رفعه</string>
+  <string name="uploader_error_message_read_permission_not_granted">%1$s غير مسموح له أن يقرأ ملفاً مستلماً</string>
+  <string name="uploader_error_message_source_file_not_found">الملف المطلوب رفعه لم يتم العثور عليه في مكانه.  فضلاً تحقق من وجود الملف.</string>
   <string name="file_list_seconds_ago">منذ ثواني</string>
   <string name="file_list_empty">لا يوجد شيء هنا. إرفع بعض الملفات!</string>
   <string name="file_list_loading">تحميل ...</string>
+  <string name="file_list_no_app_for_file_type">لم أجد تطبيقاً يدعم نوع الملف هذا!</string>
   <string name="local_file_list_empty">لا توجد ملفات في هذا المجلد</string>
+  <string name="upload_list_empty">لا توجد تحميلات.</string>
   <string name="file_list_folder">مجلد</string>
   <string name="file_list_folders">مجلدات</string>
   <string name="file_list_file">ملف</string>
@@ -68,18 +82,23 @@
   <string name="filedetails_created">انشئ في :</string>
   <string name="filedetails_modified">عُدل في :</string>
   <string name="filedetails_download">تحميل</string>
+  <string name="filedetails_sync_file">زامِن</string>
   <string name="filedetails_renamed_in_upload_msg">تم تغيير اسم الملف إلى  %1$s أثناء الرفع</string>
   <string name="action_share">شارك</string>
   <string name="common_yes">نعم</string>
   <string name="common_no">لا</string>
   <string name="common_ok">تم</string>
+  <string name="common_cancel_sync">ألغ المزامنة</string>
   <string name="common_cancel">إلغاء</string>
   <string name="common_back">رجوع</string>
+  <string name="common_save_exit">حفظ &amp; خروج</string>
   <string name="common_error">خطأ</string>
   <string name="common_loading">تحميل ...</string>
+  <string name="common_unknown">غير معروف</string>
   <string name="common_error_unknown">خطأ غير معروف. </string>
   <string name="about_title">حول</string>
   <string name="change_password">عدل كلمة السر</string>
+  <string name="delete_account">حذف الحساب</string>
   <string name="create_account">حساب جديد</string>
   <string name="upload_chooser_title">الرفع من ...</string>
   <string name="uploader_info_dirname">اسم المجلد</string>
@@ -88,6 +107,7 @@
   <string name="uploader_upload_succeeded_ticker">تم الرفع بنجاح</string>
   <string name="uploader_upload_failed_ticker">فشل الرفع</string>
   <string name="uploader_upload_failed_content_single">لم يكتمل رفع  %1$s </string>
+  <string name="uploads_view_title">التحميلات</string>
   <string name="uploads_view_group_current_uploads">الحالي</string>
   <string name="uploads_view_upload_status_unknown_fail">خطأ غير معروف. </string>
   <string name="downloader_download_in_progress_ticker">يتم التحميل ...</string>
@@ -167,6 +187,7 @@
   <string name="sync_file_nothing_to_do_msg">تمت  مزامنة محتويات الملفات من قبل</string>
   <string name="create_dir_fail_msg">لايمكن إنشاء المجلد</string>
   <string name="filename_forbidden_characters">رموز ممنوعة: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_forbidden_charaters_from_server">اسم الملف به ، على الأقل ، حرف غير صالح</string>
   <string name="filename_empty">إسم الملف لا يمكن أن يكون فارغاً</string>
   <string name="wait_a_moment">انتظر للحظة</string>
   <string name="filedisplay_unexpected_bad_get_content">خطا غير متوقع : الرجاء اختيار الملف من تطبيق آخر</string>

From 6aab804ec73ced4334fd7dce8d1cc4e57c7dab42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Gonz=C3=A1lez=20Cabrero?=
 <malkomich@gmail.com>
Date: Thu, 21 Apr 2016 11:24:02 +0200
Subject: [PATCH 3/7] Changelog update 2.0.0 release

---
 CHANGELOG.md           | 13 ++++++++++---
 res/values/strings.xml |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f25f04485..65f8c7bef8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.0.0 (April 2016)
+- Uploads view: track the progress of your uploads and handle failures
+- Federated sharing: share files with users in other ownCloud servers
+- Improvements on the UI following material design lines
+- Set a shared-by-link folder as editable
+- Wifi-only for instant uploads stop on Wifi loss
+- Be warned of server certificate changed in any action
+- Improvements when other apps send files to ownCloud
+- Bug fixing
+
 ## 1.9.1 (February 2016)
 - Set and edit permissions on internal shared data
 - Instant uploads: avoid file duplications, set policy in app settings
@@ -79,6 +89,3 @@
 - Settings view updated
 - Improved subjects in e-mails
 - Bugs fixed
-
-
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 301b167371..76a8e17db6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -449,7 +449,7 @@
     <string name="action_switch_list_view">List view</string>
 
     <string name="manage_space_title">Manage space</string>
-    <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanentlty. \n\nDownloaded files will be kept untouched.\n\nThis process can take some time.</string>
+    <string name="manage_space_description">Settings, database and server certificates from %1$s\'s data will be deleted permanently. \n\nDownloaded files will be kept untouched.\n\nThis process can take some time.</string>
     <string name="manage_space_clear_data">Clear data</string>
     <string name="manage_space_error">Some files could not be deleted.</string>
 

From 2bc528ceb2f3d85a07b5641c395aa1988685d557 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@owncloud.com>
Date: Wed, 8 Jun 2016 15:37:27 +0200
Subject: [PATCH 4/7] Changelog update with 2.0.1 release

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65f8c7bef8..ae3b330d45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.0.1 (June 2016)
+- Favorite files are now called AVAILABLE OFFLINE
+- New overlay icons
+- Bugs fixed, including:
+ + Upload content from other apps works again
+ + Passwords with non-alphanumeric characters work fine
+ + Sending files from other apps does not duplicate them
+ + Favorite setting is not lost after uploading
+ + Instant uploads waiting for Wi-Fi are not shown as failed				
+
 ## 2.0.0 (April 2016)
 - Uploads view: track the progress of your uploads and handle failures
 - Federated sharing: share files with users in other ownCloud servers

From 7c8a60c1c35e580ae4d1ba0efb2b19f4f5d081c7 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@owncloud.com>
Date: Wed, 8 Jun 2016 15:42:39 +0200
Subject: [PATCH 5/7] Updated reference to version 0.9.12 of ownCloud library
 for Android

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

diff --git a/owncloud-android-library b/owncloud-android-library
index cdce258a3f..954f69de99 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit cdce258a3f7fa40b362fef104bc2bd3e2f3babd6
+Subproject commit 954f69de990fe1c54bd29a23e52f12e5f41f1c71

From 110ea08b36e5fa97c26f18cb3e30378503c604db Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 9 Jun 2016 01:13:52 -0400
Subject: [PATCH 6/7] [tx-robot] updated from transifex

---
 res/values-ar/strings.xml | 23 +++++++++++++++++++++++
 res/values-pl/strings.xml |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 42535e7f57..ccc67b1e4f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -88,6 +88,8 @@
   <string name="common_yes">نعم</string>
   <string name="common_no">لا</string>
   <string name="common_ok">تم</string>
+  <string name="common_remove_upload">إحذف الرفع</string>
+  <string name="common_retry_upload">عاود الرفع ثانية</string>
   <string name="common_cancel_sync">ألغ المزامنة</string>
   <string name="common_cancel">إلغاء</string>
   <string name="common_back">رجوع</string>
@@ -105,18 +107,39 @@
   <string name="uploader_upload_in_progress_ticker">يتم الرفع ...</string>
   <string name="uploader_upload_in_progress_content">%1$d%% رفع %2$s</string>
   <string name="uploader_upload_succeeded_ticker">تم الرفع بنجاح</string>
+  <string name="uploader_upload_succeeded_content_single">تم رفع %1$s</string>
   <string name="uploader_upload_failed_ticker">فشل الرفع</string>
   <string name="uploader_upload_failed_content_single">لم يكتمل رفع  %1$s </string>
+  <string name="uploader_upload_failed_credentials_error">فشل التحميل ، تحتاج للدخول مرة أخرى</string>
   <string name="uploads_view_title">التحميلات</string>
   <string name="uploads_view_group_current_uploads">الحالي</string>
+  <string name="uploads_view_group_failed_uploads">فشل (إلمس لإعادة المحاولة)</string>
+  <string name="uploads_view_group_finished_uploads">تم رفعه</string>
+  <string name="uploads_view_upload_status_succeeded">مكتمل</string>
+  <string name="uploads_view_upload_status_cancelled">ملغي</string>
+  <string name="uploads_view_upload_status_paused">مُوقَف</string>
+  <string name="uploads_view_upload_status_failed_connection_error">خطأ اتصال</string>
+  <string name="uploads_view_upload_status_failed_retry">ستتم معاودة الرفع قريباً</string>
+  <string name="uploads_view_upload_status_failed_folder_error">خطأ في المجلّد</string>
+  <string name="uploads_view_upload_status_failed_file_error">خطأ في الملف</string>
+  <string name="uploads_view_upload_status_failed_localfile_error">لم يتم العثور على الملف المحلّي</string>
+  <string name="uploads_view_upload_status_failed_permission_error">خطأ في الإذن</string>
+  <string name="uploads_view_upload_status_conflict">تعارُض</string>
+  <string name="uploads_view_upload_status_service_interrupted">تم إنهاء التطبيق</string>
   <string name="uploads_view_upload_status_unknown_fail">خطأ غير معروف. </string>
+  <string name="uploads_view_upload_status_waiting_for_wifi">بانتظار اتصال wifi</string>
+  <string name="uploads_view_later_waiting_to_upload">بانتظار الرفع</string>
   <string name="downloader_download_in_progress_ticker">يتم التحميل ...</string>
   <string name="downloader_download_in_progress_content">%1$d%% تحميل  %2$s</string>
   <string name="downloader_download_succeeded_ticker">تم التحميل بنجاح</string>
   <string name="downloader_download_failed_ticker">فشل التحميل</string>
   <string name="downloader_download_failed_content"> لم يكتمل تحميل %1$s</string>
   <string name="downloader_not_downloaded_yet">لم يتم تحميلها بعد</string>
+  <string name="downloader_download_failed_credentials_error">فشل التحميل ، تحتاج للدخول مرة أخرى</string>
   <string name="common_choose_account">اختر حسابا</string>
+  <string name="sync_fail_ticker">فشلت المزامنة</string>
+  <string name="sync_fail_ticker_unauthorized">فشلت المزامنة ، تحتاج للدخول مرة أخرى</string>
+  <string name="sync_fail_content">مزامنة %1$s لم تكتمل</string>
   <string name="sync_fail_content_unauthorized">كلمة السر غير صالحة لـ %1$s</string>
   <string name="sync_conflicts_in_favourites_ticker">هناك تعارض</string>
   <string name="sync_conflicts_in_favourites_content">لم تنجح المزامنة الدائمة لـ %1$d ملفات</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index fa634a2d53..06e392f4af 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -223,6 +223,8 @@
 	</string>
   <string name="auth_can_not_auth_against_server">Błąd autoryzacji na tym serwerze</string>
   <string name="auth_account_does_not_exist">Konto jeszcze nie istnieje na tym urządzeniu.</string>
+  <string name="favorite">Udostępnij w trybie offline</string>
+  <string name="unfavorite">Wyłącz udostępnianie w trybie offline</string>
   <string name="common_rename">Zmień nazwę</string>
   <string name="common_remove">Usuń</string>
   <string name="confirmation_remove_alert">Czy naprawdę chcesz usunąć %1$s?</string>

From be93f8dbab715a3b37e8ae3ccc4c7cc12feabccb Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 10 Jun 2016 01:13:57 -0400
Subject: [PATCH 7/7] [tx-robot] updated from transifex

---
 res/values-en-rGB/strings.xml |  2 ++
 res/values-pt-rPT/strings.xml | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3cb2c153ee..0b1762021e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -223,6 +223,8 @@
 	</string>
   <string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
   <string name="auth_account_does_not_exist">Account does not exist in the device yet</string>
+  <string name="favorite">Set as available offline</string>
+  <string name="unfavorite">Unset as available offline</string>
   <string name="common_rename">Rename</string>
   <string name="common_remove">Remove</string>
   <string name="confirmation_remove_alert">Do you really want to remove %1$s?</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e12c9201ff..9a9c8ac1d7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -134,11 +134,11 @@
   <string name="uploads_view_upload_status_service_interrupted">A aplicação foi terminada</string>
   <string name="uploads_view_upload_status_unknown_fail">Erro desconhecido</string>
   <string name="uploads_view_upload_status_waiting_for_wifi">A aguardar pela ligação wi-fi</string>
-  <string name="uploads_view_later_waiting_to_upload">A aguardar para enviar</string>
-  <string name="downloader_download_in_progress_ticker">A transferir…</string>
-  <string name="downloader_download_in_progress_content">%1$d%% A transferir %2$s</string>
+  <string name="uploads_view_later_waiting_to_upload">A aguardar para carregar</string>
+  <string name="downloader_download_in_progress_ticker">A descarregar…</string>
+  <string name="downloader_download_in_progress_content">%1$d%% A descarregar %2$s</string>
   <string name="downloader_download_succeeded_ticker">Transferência bem sucedida</string>
-  <string name="downloader_download_succeeded_content">%1$s transferido</string>
+  <string name="downloader_download_succeeded_content">%1$s descarregado</string>
   <string name="downloader_download_failed_ticker">Transferência falhou</string>
   <string name="downloader_download_failed_content">Não foi possível concluir a transferência de %1$s</string>
   <string name="downloader_not_downloaded_yet">Por transferir</string>
@@ -156,7 +156,7 @@
   <string name="sync_foreign_files_forgotten_content">Não foi possível copiar %1$d ficheiros da pasta %2$s para</string>
   <string name="sync_foreign_files_forgotten_explanation">A partir da versão 1.3.16, os ficheiros enviados deste dispositivo são copiados para a pasta local %1$s para evitar a perda de dados quando é sincronizado um só ficheiro com várias contas.\n\nDevido a esta alteração, todos os ficheiros enviados nas versões anteriores desta aplicação foram copiados para a pasta %2$s. No entanto, um erro impediu a conclusão desta operação durante a sincronização da conta. Pode deixar o ficheiro(s) como estão e remover a hiperligação para %3$s, ou mover o(s) ficheiro(s) para a pasta %1$s e guardar a hiperligação para %4$s.\n\nEm baixo estão listados os ficheiro(s) locais e remotos em %5$s que foram associados.</string>
   <string name="sync_current_folder_was_removed">A pasta %1$s já não existe</string>
-  <string name="foreign_files_move">Mover Todos</string>
+  <string name="foreign_files_move">Mover todos</string>
   <string name="foreign_files_success">Foram movidos todos os ficheiros</string>
   <string name="foreign_files_fail">Não foi possível mover alguns ficheiros</string>
   <string name="foreign_files_local_text">Local: %1$s</string>