Merge remote-tracking branch 'origin/master' into dev

Gemfile.lock

@@ -10,17 +10,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.913.0)
-    aws-sdk-core (3.191.6)
+    aws-partitions (1.937.0)
+    aws-sdk-core (3.196.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.78.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-kms (1.82.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.1)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-s3 (1.151.0)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -110,7 +110,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-huawei_appgallery_connect (1.0.28)
+    fastlane-plugin-huawei_appgallery_connect (1.0.30)
       cgi
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
@@ -160,11 +160,11 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     nanaimo (0.3.0)
     naturally (2.2.1)
     nkf (0.2.0)
-    optparse (0.4.0)
+    optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
     public_suffix (5.0.5)
@@ -174,7 +174,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -187,6 +188,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)

app/src/main/res/values-ar/strings.xml

@@ -941,6 +941,7 @@
     <string name="upload_list_delete">حذف</string>
     <string name="upload_list_empty_headline">لا توجد تحميلات</string>
     <string name="upload_list_empty_text_auto_upload">قم بتحميل بعض الملفات أو قم بتفعيل التحميل التلقائي.</string>
+    <string name="upload_list_expand_header">تبديل توسيع الترويسة</string>
     <string name="upload_list_resolve_conflict">حل تعارُض</string>
     <string name="upload_local_storage_full">التخزين المحلي ممتلئ</string>
     <string name="upload_local_storage_not_copied">تعذر نسخ الملف إلى التخزين المحلي</string>

app/src/main/res/values-b+en+001/strings.xml

@@ -915,6 +915,7 @@
     <string name="upload_list_delete">Delete</string>
     <string name="upload_list_empty_headline">No uploads available</string>
     <string name="upload_list_empty_text_auto_upload">Upload some content or activate auto upload.</string>
+    <string name="upload_list_expand_header">Toggle expansion of header</string>
     <string name="upload_list_resolve_conflict">Resolve conflict</string>
     <string name="upload_local_storage_full">Local storage full</string>
     <string name="upload_local_storage_not_copied">File could not be copied to local storage</string>

app/src/main/res/values-de/strings.xml

@@ -915,6 +915,7 @@
     <string name="upload_list_delete">Löschen</string>
     <string name="upload_list_empty_headline">Keine Uploads verfügbar</string>
     <string name="upload_list_empty_text_auto_upload">Laden Sie Inhalte hoch oder aktivieren Sie den Auto Upload.</string>
+    <string name="upload_list_expand_header">Erweiterung der Kopfzeile umschalten</string>
     <string name="upload_list_resolve_conflict">Konflikt lösen</string>
     <string name="upload_local_storage_full">Lokaler Speicher voll</string>
     <string name="upload_local_storage_not_copied">Datei konnte nicht in den lokalen Speicher kopiert werden</string>

app/src/main/res/values-es/strings.xml

@@ -209,7 +209,7 @@
     <string name="create_new_folder">Nueva carpeta</string>
     <string name="create_new_presentation">Nueva presentación</string>
     <string name="create_new_spreadsheet">Nueva hoja de cálculo</string>
-    <string name="create_rich_workspace">Añadir descripción a carpeta</string>
+    <string name="create_rich_workspace">Añadir una descripción a la carpeta</string>
     <string name="creates_rich_workspace">Añade una descripción a la carpeta</string>
     <string name="credentials_disabled">Credenciales desactivadas</string>
     <string name="daily_backup">Copia de seguridad diaria</string>
@@ -915,6 +915,7 @@
     <string name="upload_list_delete">Eliminar</string>
     <string name="upload_list_empty_headline">No hay subidas disponibles</string>
     <string name="upload_list_empty_text_auto_upload">Sube algún contenido o active la subida automática.</string>
+    <string name="upload_list_expand_header">Alternar la expansión de la cabecera</string>
     <string name="upload_list_resolve_conflict">Resolver conflicto</string>
     <string name="upload_local_storage_full">Almacenamiento local lleno</string>
     <string name="upload_local_storage_not_copied">No se ha podido copiar el archivo al almacenamiento local</string>

app/src/main/res/values-gl/strings.xml

@@ -407,6 +407,7 @@
     <string name="foreign_files_success">Foron movidos todos os ficheiros</string>
     <string name="forward">Reenviar</string>
     <string name="fourHours">4 horas</string>
+    <string name="grid_file_features_live_photo_content_description">Esta icona indica a dispoñibilidade de Live Photo</string>
     <string name="hidden_file_name_warning">O nome dará lugar a un ficheiro agochado</string>
     <string name="hint_name">Nome</string>
     <string name="hint_note">Nota</string>

app/src/main/res/values-sr/strings.xml

@@ -915,6 +915,7 @@
     <string name="upload_list_delete">Избриши</string>
     <string name="upload_list_empty_headline">Нема доступних отпремања</string>
     <string name="upload_list_empty_text_auto_upload">Отпремите нешто или укључите аутоматско отпремање.</string>
+    <string name="upload_list_expand_header">Укљ./Искљ. развијање заглавља</string>
     <string name="upload_list_resolve_conflict">Разреши сукоб</string>
     <string name="upload_local_storage_full">Локално складиште пуно</string>
     <string name="upload_local_storage_not_copied">Фајл није могао да се копира на локално складиште</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -915,6 +915,7 @@
     <string name="upload_list_delete">刪除</string>
     <string name="upload_list_empty_headline">沒有上傳的檔案</string>
     <string name="upload_list_empty_text_auto_upload">上傳一些內容或者啟動自動上傳。</string>
+    <string name="upload_list_expand_header">切換標頭展開</string>
     <string name="upload_list_resolve_conflict">解決抵觸</string>
     <string name="upload_local_storage_full">近端儲存空間已滿</string>
     <string name="upload_local_storage_not_copied">無法複製檔案到近端資料夾</string>