diff options
| author | l10n daemon script <[email protected]> | 2026-06-03 02:24:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-06-03 02:24:32 +0000 |
| commit | fe6bb8bd6a076d8293e2090935ee41577324c760 (patch) | |
| tree | cfa9456ee7a785ce1c532454029ec54b31c48f8c /src/itemactions | |
| parent | e402e1211cae466c7ba906dcb9e6337cd33d63bc (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 2397a93ca..b0774d0a6 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -39,6 +39,7 @@ "Name[sl]": "Skrij", "Name[sv]": "Dölj", "Name[tr]": "Gizle", + "Name[ug]": "يوشۇر", "Name[uk]": "Приховати", "Name[zh_CN]": "隐藏", "Name[zh_TW]": "隱藏" diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index fa0432990..f55754b29 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -49,6 +49,7 @@ "Name[sv]": "Flytta till ny katalog", "Name[ta]": "புதிய அடைவிற்கு நகர்த்து", "Name[tr]": "Yeni Klasöre Taşı", + "Name[ug]": "يېڭى قىسقۇچقا يۆتكە", "Name[uk]": "Пересунути до нової теки", "Name[zh_CN]": "移动到新建文件夹", "Name[zh_TW]": "移動到新資料夾" diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 5809a454c..d8503b439 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -40,6 +40,7 @@ "Name[sl]": "Nastavi ikono mape", "Name[sv]": "Ange katalogikon", "Name[tr]": "Klasör Simgesi Ayarla", + "Name[ug]": "قىسقۇچ سىنبەلگە تەڭشىكى", "Name[uk]": "Встановити піктограму теки", "Name[zh_CN]": "设置文件夹图标", "Name[zh_TW]": "設定資料夾圖示" |