Commit 2b93be25 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 a3736f49
......@@ -3,6 +3,7 @@ Name=Night Color Control
Name[ca]=Control del color de nit
Name[cs]=Ovládání noční barvy
Name[da]=Kontrol af natfarve
Name[de]=Nachtfarben-Steuerung
Name[en_GB]=Night Colour Control
Name[es]=Control del color nocturno
Name[et]=Öörežiimi juhtimine
......@@ -28,6 +29,7 @@ Comment=Plasmoid for controlling Night Color
Comment[ca]=Plasmoide per controlar el Color de nit
Comment[cs]=Plasmoid pro ovládání noční barvy
Comment[da]=Plasmoid til kontrol af natfarve
Comment[de]=Miniprogramm zur Steuerung der Nachtfarbe
Comment[en_GB]=Plasmoid for controlling Night Colour
Comment[es]=Plasmoide para controlar el color nocturno
Comment[et]=Öörežiimi juhtimise plasmoid
......
......@@ -58,7 +58,7 @@ Comment[hu]=Az asztal nevét is megjelenítő ablakváltó
Comment[ia]=Un disposition de commutator de fenestra informative includente nomine de scriptorio
Comment[id]=Sebuah tataletak pengalih window informatif termasuk nama desktop
Comment[it]=Uno scambiafinestre informativo che include il nome del desktop
Comment[ko]=바탕 화면 이름을 포함하는 정보를 보여 주는 창 전환기 레이아웃
Comment[ko]=바탕 화면 이름 정보를 보여 주는 창 전환기 레이아웃
Comment[lt]=Informatyvus langų perjungiklio išdėstymas rodantis darbalaukio pavadinimą
Comment[nb]=En informativ utforming av vindusbytter som tar med skrivebordsnavnet
Comment[nl]=Een informatieve indeling van de vensterwisselaar inclusief de naam van het bureaublad
......
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