diff options
| author | l10n daemon script <[email protected]> | 2026-06-16 01:42:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-06-16 01:42:55 +0000 |
| commit | 25999b25f6b9ef87aa26013c57f72dd4e25b97b9 (patch) | |
| tree | 2dee64e9c449bfd69a4307878cbef9734c1f6ab9 /src/itemactions | |
| parent | eabed6e1f1d0aa9e25fc73f540250232ec9edc55 (diff) | |
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"
Diffstat (limited to 'src/itemactions')
| -rw-r--r-- | src/itemactions/hidefileitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 |
3 files changed, 3 insertions, 0 deletions
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", |