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 f822c7058c
commit 80aeb86ccf
  1. 2
      lookandfeel.twilight/metadata.desktop
  2. 1
      wallpapers/Next/metadata.desktop

@ -4,6 +4,7 @@ Comment[az]=Breeze -Toranlıq - KDE VDG tərəfindən
Comment[ca]=Brisa crepuscular, creat pel VDG del KDE
Comment[cs]=Breeze Twilight od KDE VDG
Comment[da]=Breeze Twilight af KDE's visuelle designgruppe
Comment[de]=Breeze-Dämmerung von der KDE VDG
Comment[el]=Breeze του λυκόφωτος από το KDE VDG
Comment[en_GB]=Breeze Twilight by the KDE VDG
Comment[es]=Brisa crepúsculo por KDE VDG
@ -33,6 +34,7 @@ Name[az]=Breeze Toranlıq
Name[ca]=Brisa crepuscular
Name[cs]=Breeze Twilight
Name[da]=Breeze twilight
Name[de]=Breeze-Dämmerung
Name[el]=Breeze του λυκόφωτος
Name[en_GB]=Breeze Twilight
Name[es]=Brisa crepúsculo

@ -3,6 +3,7 @@ Name=Milky Way
Name[az]=Süd Yolu
Name[ca]=Via Làctia
Name[cs]=Mléčná dráha
Name[de]=Milchstraße
Name[el]=Ο Γαλαξίας μας
Name[en_GB]=Milky Way
Name[es]=Vía Láctea

Loading…
Cancel
Save