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/itemactions/setfoldericonitemaction.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/itemactions/setfoldericonitemaction.json')

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",
-- 
cgit v1.3.1