Merge pull request #2273 from CatimaLoyalty/fix/weblate_conflict_2025…

…0109 Fix/weblate conflict 20250109
CatimaLoyalty · Jan 9, 2025 · 29aef64 · 29aef64
2 parents 07f2348 + cbe243f
commit 29aef64
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 1 deletion.
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="settings_display_barcode_max_brightness">Gör streckkodsvyn ljusare</string>
+    <string name="settings_display_barcode_max_brightness">Gör skärmen ljusare</string>
     <string name="settings_keep_screen_on">Håll skärmen påslagen</string>
     <string name="importFidmeMessage">Välj den exporterade <i>fidme-export-request-xxxxxx.zip</i> från FidMe som du vill importera och välj streckkodstyper manuellt efteråt.
 \nSkapa den från din FidMe-profil först genom att välja \"Data Protection\" och sen trycka på \"Extract my data\".</string>

diff --git a/fastlane/metadata/android/cs-CZ/changelogs/145.txt b/fastlane/metadata/android/cs-CZ/changelogs/145.txt
@@ -0,0 +1 @@
+- Cíl Android 15
diff --git a/fastlane/metadata/android/de-DE/changelogs/145.txt b/fastlane/metadata/android/de-DE/changelogs/145.txt
@@ -0,0 +1 @@
+- Ziel Android 15
diff --git a/fastlane/metadata/android/lv/changelogs/145.txt b/fastlane/metadata/android/lv/changelogs/145.txt
@@ -0,0 +1 @@
+- Android 15 atbalsts
diff --git a/fastlane/metadata/android/ru-RU/changelogs/145.txt b/fastlane/metadata/android/ru-RU/changelogs/145.txt
@@ -0,0 +1 @@
+- Ориентация на Android 15
diff --git a/fastlane/metadata/android/uk/changelogs/145.txt b/fastlane/metadata/android/uk/changelogs/145.txt
@@ -0,0 +1 @@
+- Цільова версія Android 15
diff --git a/fastlane/metadata/android/zh-CN/changelogs/145.txt b/fastlane/metadata/android/zh-CN/changelogs/145.txt
@@ -0,0 +1 @@
+- 以 Android 15（API 级别35）为目标平台
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- 以 Android 15（API 级别35）为目标平台