Commit 65c54186 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 56acdcca
[Desktop Entry]
Name=Night Color Control
Name[ca]=Control del color de nit
Name[es]=Control del color nocturno
Name[et]=Öise värvi juhtimine
Name[nl]=Besturing van nachtkleur
Name[pt]=Controlo da Cor Nocturna
Name[uk]=Керування нічними кольорами
Name[x-test]=xxNight Color Controlxx
Comment=Plasmoid for controlling Night Color
Comment[ca]=Plasmoide per controlar el Color de nit
Comment[es]=Plasmoide para controlar el color nocturno
Comment[et]=Öise värvi juhtimise plasmoid
Comment[nl]=Plasmoid voor besturing van nachtkleur
Comment[pt]=Plasmóide para controlar a Cor Nocturna
Comment[sv]=Plasmoid för att kontrollera nattfärg
Comment[uk]=Плазмоїд для керування нічними кольорами
Comment[x-test]=xxPlasmoid for controlling Night Colorxx
Comment[zh_TW]=控制夜色的 Plasmoid
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