Commit c06b43dc authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 1b62205d
......@@ -3,6 +3,7 @@ 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[en_GB]=Breeze Twilight by the KDE VDG
Comment[es]=Brisa crepúsculo por KDE VDG
Comment[et]=Breeze videvik KDE VDG-lt
Comment[eu]=Breeze ilunabarra, KDE VDGk egina
......@@ -21,6 +22,7 @@ Name=Breeze Twilight
Name[ca]=Brisa crepuscular
Name[da]=Breeze twilight
Name[el]=Breeze του λυκόφωτος
Name[en_GB]=Breeze Twilight
Name[es]=Brisa crepúsculo
Name[et]=Breeze videvik
Name[eu]=Breeze ilunabarra
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment