diff options
| author | l10n daemon script <[email protected]> | 2025-09-09 02:12:34 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-09 02:12:34 +0000 |
| commit | d22a837edd132b29535810c01aacfcc1a004c10a (patch) | |
| tree | 696ae5758e9446bade8894e6f615c0de792c5d24 /src/itemactions | |
| parent | 2644ac445f28322bd1e66c9f87b80e735dd1c8cb (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/movetonewfolderitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index aa6251d6c..3b995afa8 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -45,7 +45,6 @@ "Name[ta]": "புதிய அடைவிற்கு நகர்த்து", "Name[tr]": "Yeni Klasöre Taşı", "Name[uk]": "Пересунути до нової теки", - "Name[x-test]": "xxMove to New Folderxx", "Name[zh_CN]": "移动到新建文件夹", "Name[zh_TW]": "移動到新資料夾" }, diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index ac7e333ac..b12e1eba2 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -30,7 +30,6 @@ "Name[sv]": "Ange katalogikon", "Name[tr]": "Klasör Simgesi Ayarla", "Name[uk]": "Встановити піктограму теки", - "Name[x-test]": "xxSet Folder Iconxx", "Name[zh_CN]": "设置文件夹图标", "Name[zh_TW]": "設定資料夾圖示" }, |