diff options
| author | l10n daemon script <scripty@kde.org> | 2022-04-16 01:48:49 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2022-04-16 01:48:49 +0000 |
| commit | 56b0d26e556f457f7f9d39a6e9c564b45157486b (patch) | |
| tree | 2c3ea0bdfa79f913aaa27a4e9b57f5dbea4dc470 | |
| parent | 241efe6c2500e73374384be8afad4e63e8e2b55e (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 f061fdc6..9afef6a7 100644 --- a/dev-scripts/docker/AppImage/clazy.AppDir/clazy.desktop +++ b/dev-scripts/docker/AppImage/clazy.AppDir/clazy.desktop @@ -28,6 +28,7 @@ Name[ru]=Clazy Name[sk]=Clazy Name[sl]=Clazy Name[sv]=Clazy +Name[tr]=Clazy Name[uk]=Clazy Name[x-test]=xxClazyxx Name[zh_CN]=Clazy |