Merge branch 'main' of https://github.com/nextcloud/notes-android

AndyScherzinger · AndyScherzinger · commit 8d1c13e0fbe6 · 2025-12-27T11:36:39.000+01:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -42,17 +42,16 @@ GEM
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     excon (0.112.0)
-    faraday (1.10.4)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+      multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
@@ -61,13 +60,10 @@ GEM
     faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
-      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
@@ -167,7 +163,7 @@ GEM
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.18.0)
+    multi_json (1.19.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -301,6 +301,7 @@
     <string name="share_dialog_title">Sdílení</string>
     <string name="share_expiration_date_format">%1$s</string>
     <string name="share_expiration_date_label">Platnost skončí %1$s</string>
+    <string name="share_expires">Platnost sdílení skončí %1$s</string>
     <string name="share_file">Nasdílet %1$s</string>
     <string name="share_group_clarification">%1$s (skupina)</string>
     <string name="share_internal_link">Interní odkaz na sdílení</string>
diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml
@@ -301,6 +301,7 @@
     <string name="share_dialog_title">Jagamine</string>
     <string name="share_expiration_date_format">%1$s</string>
     <string name="share_expiration_date_label">Aegub %1$s</string>
+    <string name="share_expires">Jagamine aegub %1$s</string>
     <string name="share_file">Jaga %1$s</string>
     <string name="share_group_clarification">%1$s (grupp)</string>
     <string name="share_internal_link">Jaga sisemist linki</string>
