From 25999b25f6b9ef87aa26013c57f72dd4e25b97b9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 16 Jun 2026 01:42:55 +0000
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 src/dolphinpart.json.in                        | 1 +
 src/itemactions/hidefileitemaction.json        | 1 +
 src/itemactions/movetonewfolderitemaction.json | 1 +
 src/itemactions/setfoldericonitemaction.json   | 1 +
 src/settings/kcm/kcmdolphingeneral.json        | 1 +
 src/settings/kcm/kcmdolphinviewmodes.json      | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 77315346e..8a8b1e43e 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -43,6 +43,7 @@
         "Name[ja]": "Dolphin ビュー",
         "Name[ka]": "Dolphin-ის ხედი",
         "Name[ko]": "Dolphin 보기",
+        "Name[lo]": "ມຸມມອງ Dolphin",
         "Name[lt]": "Dolphin rodinys",
         "Name[lv]": "„Dolphin“ skats",
         "Name[ml]": "ഡോള്‍ഫിന്‍ അവതരണരീതി",
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json
index b0774d0a6..0d711a3f9 100644
--- a/src/itemactions/hidefileitemaction.json
+++ b/src/itemactions/hidefileitemaction.json
@@ -25,6 +25,7 @@
         "Name[ja]": "隠す",
         "Name[ka]": "დამალვა",
         "Name[ko]": "숨기기",
+        "Name[lo]": "ເຊື່ອງ",
         "Name[lt]": "Slėpti",
         "Name[lv]": "Paslēpt",
         "Name[nb]": "Skjul",
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index f55754b29..af97a8f6c 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -32,6 +32,7 @@
         "Name[ja]": "新しいフォルダに移動",
         "Name[ka]": "გადატანა ახალ საქაღალდეში",
         "Name[ko]": "새 폴더로 이동",
+        "Name[lo]": "ຍ້າຍໄປໂຟນເດີໃໝ່",
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[lv]": "Pārvietot uz jaunu mapi",
         "Name[nb]": "Flytt til ny mappe",
diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index d8503b439..1a3b97ae5 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -26,6 +26,7 @@
         "Name[ja]": "フォルダのアイコンをセットする",
         "Name[ka]": "საქაღალდის ხატულას დაყენება",
         "Name[ko]": "폴더 아이콘 설정",
+        "Name[lo]": "ກຳນົດໄອຄອນໂຟນເດີ",
         "Name[lt]": "Nustatyti aplanko piktogramą",
         "Name[lv]": "Norādīt datnes ikonu",
         "Name[nb]": "Velg mappeikon",
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index c3ed3212b..5fd1de0e6 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -32,6 +32,7 @@
         "Name[ja]": "全般",
         "Name[ka]": "მთავარი",
         "Name[ko]": "일반",
+        "Name[lo]": "ທົ່ວໄປ",
         "Name[lt]": "Bendrosios",
         "Name[lv]": "Vispārīgi",
         "Name[nb]": "Generelt",
diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 8eab5147b..434b49a7f 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -32,6 +32,7 @@
         "Name[ja]": "表示モード",
         "Name[ka]": "ნახვის რეჟიმები",
         "Name[ko]": "보기 모드",
+        "Name[lo]": "ໂຫມດມຸມມອງ",
         "Name[lt]": "Rodinio veiksenos",
         "Name[lv]": "Skata režīmi",
         "Name[ml]": "അവതരണ രീതികള്‍",
-- 
cgit v1.3.1