diff options
| author | l10n daemon script <[email protected]> | 2025-10-01 01:40:20 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-10-01 01:40:20 +0000 |
| commit | bf3c9f90bbbeb164841d772a22067afffd70ed3b (patch) | |
| tree | ce77eec4d4225378536e24389b2e87b9cb5b2247 /src | |
| parent | 982943fd1c05b3c6a1d640acb00abd206a662869 (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 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 547c72d3f..0efd6f72f 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -23,6 +23,7 @@ "Name[sv]": "Dölj", "Name[tr]": "Gizle", "Name[uk]": "Приховати", + "Name[zh_CN]": "隐藏", "Name[zh_TW]": "隱藏" }, "X-KDE-Show-In-Submenu": true |