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"
wilder-5.24
l10n daemon script 5 years ago
parent 6e8054afcd
commit 79db59e05e
  1. 4
      lookandfeel.twilight/metadata.desktop

@ -1,6 +1,8 @@
[Desktop Entry]
Comment=Breeze Twilight by the KDE VDG
Comment[ca]=Brisa crepuscular, creat pel VDG del KDE
Comment[da]=Breeze Twilight af KDE's visuelle designgruppe
Comment[el]=Breeze του λυκόφωτος από το KDE VDG
Comment[es]=Brisa crepúsculo por KDE VDG
Comment[et]=Breeze videvik KDE VDG-lt
Comment[it]=Brezza crepuscolo a cura del VDG di KDE
@ -12,6 +14,8 @@ Comment[uk]=Сутінкова Breeze, автори — KDE VDG
Comment[x-test]=xxBreeze Twilight by the KDE VDGxx
Name=Breeze Twilight
Name[ca]=Brisa crepuscular
Name[da]=Breeze twilight
Name[el]=Breeze του λυκόφωτος
Name[es]=Brisa crepúsculo
Name[et]=Breeze videvik
Name[it]=Brezza crepuscolo

Loading…
Cancel
Save