Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/build.gradle

9 files changed, 42 insertions, 10 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
index e512b007e..c049c1fac 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
@@ -444,7 +444,12 @@ public class JsonToEntityParser {
                 card.setAttachmentCount(e.get("attachmentCount").getAsInt());
             }
 
-            card.setOrder(e.get("order").getAsInt());
+            if (e.has("order") && !e.get("order").isJsonNull()) {
+                card.setOrder(e.get("order").getAsInt());
+            } else {
+                card.setOrder(0);
+            }
+
             card.setOverdue(e.get("overdue").getAsInt());
             card.setDueDate(getTimestampFromString(e.get("duedate")));
             card.setCommentsUnread(e.get("commentsUnread").getAsInt());
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 0d01d8b6e..73c7b6bf7 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,6 +1,8 @@
 <resources>
     <string name="navigation_drawer_open">فتح التنقل </string>
     <string name="navigation_drawer_close">إقفال التنقل </string>
+    <string name="hint_search_deck">بحث الادراج</string>
+
     <string name="simple_boards">الالواح</string>
     <string name="simple_add">إضافة</string>
     <string name="simple_save">حفظ</string>
@@ -31,6 +33,8 @@
     <string name="simple_copied">نُسخت </string>
     <string name="simple_archive">الأرشيف</string>
     <string name="simple_unassigned">غير معيين </string>
+    <string name="hint_error_appeared">حدث خطأ</string>
+
     <string name="edit_board">تعديل اللوح</string>
     <string name="archive_board">أرشفة اللوح </string>
     <string name="delete_board">مسح اللوح</string>
@@ -151,8 +155,12 @@
     <string name="no_content">لا يوجد محتوى حتى الآن</string>
     <string name="last_background_sync">آخر مزامنة في الخلفية:</string>
     <string name="simple_off">إيقاف</string>
+    <string name="minutes_15">15 دقيقة</string>
+    <string name="hour_1">1 ساعة</string>
+    <string name="hours_6">6 ساعات</string>
     <string name="action_card_move">حرك البطاقة</string>
     <string name="action_card_move_title">نقل %1$s</string>
+    <string name="title_is_mandatory">العنوان مطلوب</string>
     <string name="provide_at_least_a_title_or_description">أدخل عنوانًا أو وصفًا على الأقل</string>
     <string name="welcome_text">مرحبًا بك في %1$s</string>
     <string name="maintenance_mode_explanation">سيرفر %1$s حاليًا في وضع الصيانة. فضلًا تواصل مع المسؤول أو أعد المحاولة لاحقًا. </string>
@@ -235,10 +243,12 @@
     <string name="error_dialog_attachment_upload_failed">لا يمكن رفع المرفق، يرجى محاولة مشاركته بطريقة أخرى وإخبارنا بهذا الخطأ.</string>
     <string name="error_dialog_certificate">يبدو أن هناك خطأ ما في شهادة الخادم، من فضلك قم بمراجعة جميع الحسابات في تطبيق نكست كلاود لمزيد من المعلومات.</string>
     <string name="error_dialog_tip_disable_battery_optimizations">يرجى تعطيل جميع تحسينات البطارية لنكست كلاود وتطبيق Deck.</string>
+    <string name="error_dialog_unknown_error">يبدو أن مثيل Nextcloud الخاص بك لا يمكن الوصول إليه . يرجى التحقق من اتصالك بالإنترنت وما إذا كنت قادرًا على الاتصال بالمثيل الخاص بك عبر المتصفح.</string>
     <string name="error_action_open_deck_info">افتح معلومات التطبيق</string>
     <string name="error_action_open_nextcloud_app">فتح تطبيق نكست كلاود</string>
     <string name="error_action_open_network">إعدادات الشبكة</string>
     <string name="error_action_server_logs">سجلات الخادم </string>
+    <string name="error_action_open_in_browser">فتح في المتصفح</string>
     <string name="error_action_install">تثبيت</string>
     <string name="error_action_report_issue">ابلغ عنه</string>
     <string name="info_box_maintenance_mode">الخادم في وضع الصيانة</string>
@@ -294,6 +304,7 @@
     <string name="single_card">بطاقة مفردة</string>
     <string name="project_type_room">غرفة الدردشة</string>
     <string name="simple_move">نقل</string>
+    <string name="cannot_upload_files_without_permission">لا يمكن رفع الملفات بدون صلاحيات</string>
     <string name="clone_cards">استنسخ البطاقة </string>
     <string name="simple_clone">استنسخ</string>
     <string name="user_avatar">صورة المستخدم الشخصية </string>
@@ -326,4 +337,9 @@
     <string name="copying_logs_to_file">نسخ السجلات إلى الملف </string>
     <string name="account_imported">تم استيراد الحساب</string>
     <string name="simple_search">البحث</string>
-    </resources>
+    <!-- Label for a title input field that is required to be filled out -->
+    <string name="title_mandatory">العنوان (مطلوب)</string>
+    <string name="saving_new_card">يجري حفظ بطاقة جديدة ...</string>
+    <string name="progress_import">يجري استعادة لوحة %1$d من %2$d ...</string>
+    <string name="progress_import_indeterminate">يجري استعادة اللوحات ...</string>
+</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index d6d779833..0079c43e8 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -3,7 +3,7 @@
     <string name="navigation_drawer_close">Tanca el calaix de navegació</string>
     <string name="hint_search_deck">Cerca targetes</string>
 
-    <string name="simple_boards">Taulells</string>
+    <string name="simple_boards">Taulers</string>
     <string name="simple_add">Afegeix</string>
     <string name="simple_save">Desa</string>
     <string name="simple_more">Més</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 9cb9438d4..cdbc7189c 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -295,7 +295,7 @@
     <string name="simple_contact">Kontaktua</string>
     <string name="simple_file">Fitxategia</string>
     <string name="simple_camera">Kamera</string>
-    <string name="take_photo">Argazkia atera</string>
+    <string name="take_photo">Atera argazki bat</string>
     <string name="take_photo_switch_camera">Aldatu kamera</string>
     <string name="take_photo_toggle_torch">Txandakatu linterna</string>
     <string name="show_all_contacts">Erakutsi kontaktu guztiak</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9c600f1c8..18dcc73fc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -40,7 +40,7 @@
     <string name="delete_board">Supprimer le tableau</string>
     <string name="delete_something">Supprimer %1$s</string>
 
-    <string name="about">À propos de</string>
+    <string name="about">À propos</string>
     <string name="about_version_title">Version</string>
     <string name="about_version">Vous utilisez actuellement la version : %1$s</string>
     <string name="about_maintainer_title">Responsable</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index e6373a9af..2e1500d55 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -114,11 +114,16 @@
     </plurals>
     <string name="add_a_new_list_using_the_button">+버튼을 사용하여 새로운 리스트를 더하시오.</string>
     <string name="add_a_new_card_using_the_button">+ 버튼을 사용하여 새 카드를 추가</string>
+    <string name="update_deck">Deck 웹앱 업데이트</string>
+    <string name="deck_outdated_please_update">덱 버전(%1$s)이 너무 오래되었습니다. 안드로이드 클라이언트를 사용하기 위해서는 업데이트가 필요합니다.</string>
     <string name="delete_board_message">모든 리스트와 카드를 포함한 이 보드를 영구적으로 지웁니다.</string>
     <string name="settings_theme_title">테마</string>
     <string name="settings_branding_title">브랜딩</string>
     <string name="settings_compact_title">축소 모드</string>
+    <string name="settings_cover_images_title">커버 이미지</string>
+    <string name="settings_debugging">디버그 로그</string>
     <string name="settings_etags">ETag 사용</string>
+    <string name="settings_etags_summary">동기화 속도 향샹</string>
     <string name="settings_background_sync">백그라운드 동기화</string>
     <string name="settings_compress_image_attachments">업로드 시 이미지 압축</string>
     <string name="search_in">%1$s 에서 검색</string>
@@ -228,10 +233,12 @@
     <string name="error_dialog_attachment_upload_failed">첨부 파일을 업로드 할 수 없습니다. 다른 방법으로 공유하시고 저희에게 이 버그에 대해 알려주세요.</string>
     <string name="error_dialog_certificate">서버의 인증서가 무언가 잘못된 것 같습니다. Nextcloud 어플리케이션에서 모든 계정을 확인해 더 많은 정보를 확인하십시오.</string>
     <string name="error_dialog_tip_disable_battery_optimizations">Nextcloud 및 Deck 앱에 대한 모든 배터리 최적화를 비활성화해 주십시오.</string>
+    <string name="error_dialog_unknown_error">넥스트 클라우드에 연결 할 수 없습니다. 웹브라우저로 연결이 가능한지 확인 하거나, 인터넷 연결이 되어 있는지 확인해 주세요.</string>
     <string name="error_action_open_deck_info">앱 정보 열기</string>
     <string name="error_action_open_nextcloud_app">Nextcloud 앱 열기</string>
     <string name="error_action_open_network">네트워크 환경설정</string>
     <string name="error_action_server_logs">서버 기록</string>
+    <string name="error_action_open_in_browser">브라우저에서 열기</string>
     <string name="error_action_install">설치</string>
     <string name="error_action_report_issue">보고</string>
     <string name="info_box_maintenance_mode">서버가 유지 관리 모드임</string>
@@ -312,4 +319,6 @@
     <!-- Label for a title input field that is required to be filled out -->
     <string name="title_mandatory">제목(필수)</string>
     <string name="saving_new_card">새 카드 저장...</string>
-    </resources>
+    <string name="progress_import">%2$d에서 보드 %1$d 가져오기</string>
+    <string name="progress_import_indeterminate">보드 가져오기</string>
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index df6856bf5..870d8424f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -324,4 +324,6 @@ Controleer a.u.b. uw internet verbinding en of U in staat bent verbinding te mak
     <!-- Label for a title input field that is required to be filled out -->
     <string name="title_mandatory">Titel (vereist)</string>
     <string name="saving_new_card">Opslaan nieuwe kaart...</string>
-    </resources>
+    <string name="progress_import">Bord %1$d van %2$d importeren ...</string>
+    <string name="progress_import_indeterminate">Borden importeren...</string>
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 248e01f6b..e0f8c4741 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -304,8 +304,8 @@
     <string name="simple_file">Plik</string>
     <string name="simple_camera">Aparat</string>
     <string name="take_photo">Zrobić zdjęcie</string>
-    <string name="take_photo_switch_camera">Przełącz aparat</string>
-    <string name="take_photo_toggle_torch">Włącz latarkę</string>
+    <string name="take_photo_switch_camera">Przełącz kamerę</string>
+    <string name="take_photo_toggle_torch">Przełącz latarkę</string>
     <string name="show_all_contacts">Pokaż wszystkie kontakty</string>
     <string name="show_all_files">Pokaż wszystkie pliki</string>
     <string name="recent">Ostatnie</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6837c75bf..3765ca507 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -297,7 +297,7 @@
     <string name="simple_camera">Kamera</string>
     <string name="take_photo">Bir fotoğraf çekin</string>
     <string name="take_photo_switch_camera">Kamerayı değiştir</string>
-    <string name="take_photo_toggle_torch">Feneri aç/kapat</string>
+    <string name="take_photo_toggle_torch">El fenerini aç/kapat</string>
     <string name="show_all_contacts">Tüm kişileri görüntüle</string>
     <string name="show_all_files">Tüm dosyaları görüntüle</string>
     <string name="recent">Son kullanılan</string>