diff options
| author | l10n daemon script <[email protected]> | 2026-01-17 01:39:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-01-17 01:39:38 +0000 |
| commit | 137097be34a041d457624939e4d9eea25ed58f14 (patch) | |
| tree | f5dd197f84726574a9f5ba911588fe48687f2156 /src | |
| parent | d501d5b6ff7875e763aac7688dca6e4da59e4130 (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')
| -rw-r--r-- | src/itemactions/hidefileitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index b77d15baa..288e0cb69 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -22,6 +22,7 @@ "Name[it]": "Nascondi", "Name[ka]": "დამალვა", "Name[ko]": "숨기기", + "Name[lt]": "Slėpti", "Name[lv]": "Paslēpt", "Name[nl]": "Verbergen", "Name[pl]": "Ukryj", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 6c4e53495..b730aff84 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -24,6 +24,7 @@ "Name[ja]": "フォルダのアイコンをセットする", "Name[ka]": "საქაღალდის ხატულას დაყენება", "Name[ko]": "폴더 아이콘 설정", + "Name[lt]": "Nustatyti aplanko piktogramą", "Name[lv]": "Norādīt datnes ikonu", "Name[nl]": "Mappictogram instellen", "Name[pa]": "ਫੋਲਡਰ ਲਈ ਆਈਕਾਨ ਦਿਓ", |