Commit a3736f49 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 86b874f4
......@@ -5,7 +5,7 @@ Name[cs]=Ovládání noční barvy
Name[da]=Kontrol af natfarve
Name[en_GB]=Night Colour Control
Name[es]=Control del color nocturno
Name[et]=Öise värvi juhtimine
Name[et]=Öörežiimi juhtimine
Name[eu]=Gaueko kolorearen agintea
Name[fi]=Yövärin hallinta
Name[ia]=ColorColor de Nocte non es executante
......@@ -30,7 +30,7 @@ Comment[cs]=Plasmoid pro ovládání noční barvy
Comment[da]=Plasmoid til kontrol af natfarve
Comment[en_GB]=Plasmoid for controlling Night Colour
Comment[es]=Plasmoide para controlar el color nocturno
Comment[et]=Öise värvi juhtimise plasmoid
Comment[et]=Öörežiimi juhtimise plasmoid
Comment[eu]=Gaueko kolorea kontrolatzeko plasmoidea
Comment[fi]=Sovelma yövärin hallintaan
Comment[id]=Plasmoid untuk mengendalikan Warna Malam
......
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