diff options
| author | l10n daemon script <scripty@kde.org> | 2022-02-16 01:51:38 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-02-16 01:51:38 +0000 |
| commit | 873663751645c3af3e1f2a66e804eb99c563348d (patch) | |
| tree | a4f9867c31ca4a62ac3bf05886137a6a585e7882 | |
| parent | 2a51a070007fdd450a9dbca4c4e3c0942ededd95 (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"
| -rw-r--r-- | dev-scripts/docker/AppImage/clazy.AppDir/clazy.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dev-scripts/docker/AppImage/clazy.AppDir/clazy.desktop b/dev-scripts/docker/AppImage/clazy.AppDir/clazy.desktop index a8f9aa43..f061fdc6 100644 --- a/dev-scripts/docker/AppImage/clazy.AppDir/clazy.desktop +++ b/dev-scripts/docker/AppImage/clazy.AppDir/clazy.desktop @@ -30,6 +30,7 @@ Name[sl]=Clazy Name[sv]=Clazy Name[uk]=Clazy Name[x-test]=xxClazyxx +Name[zh_CN]=Clazy Name[zh_TW]=Clazy Exec=clazy Icon=clazy |