implements FossifyOrg#114

Honk2 · Nov 1, 2024 · 48ea667 · 48ea667
1 parent a6f61fa
commit 48ea667
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+<<<<<<< HEAD
 <string name="app_launcher_name">Opkald</string>
 <string name="default_phone_app_prompt">Vælg venligst denne app som standard til opkald</string>
 <string name="allow_displaying_over_other_apps">Tillad venligst visning over andre apps for pålidelig adfærd</string>
@@ -69,6 +70,7 @@
 <string name="speed_dial">Hurtigopkald</string>
 <string name="manage_speed_dial">Administrer hurtigopkald</string>
 <string name="speed_dial_label">Klik på et nummer for at tilknytte en kontakt til det. Derefter kan du hurtigt ringe op til den givne kontkakt ved at holde nede på det givne nummer via det numeriske tastatur.</string>
+<string name="show_contact_thumbnails">Vis kontakt miniature-billede</string>
 
 <!-- Settings -->
 <string name="show_contact_thumbnails">Vis kontakt miniature-billede</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -70,4 +70,4 @@
     <string name="audio_route_bluetooth">Bluetooth</string>
     <string name="export_call_history">通話履歴をエクスポート</string>
     <string name="import_call_history">通話履歴をインポート</string>
-</resources>
+</resources>