Commit 3c22da53 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 b2ce4bd9
......@@ -3,6 +3,7 @@ Name=Show Desktop
Name[ca]=Mostra l'escriptori
Name[ca@valencia]=Mostra l'escriptori
Name[cs]=Zobrazit plochu
Name[de]=Arbeitsfläche anzeigen
Name[en_GB]=Show Desktop
Name[es]=Mostrar el escritorio
Name[eu]=Erakutsi mahaigaina
......@@ -27,6 +28,7 @@ Comment=Show the Plasma desktop
Comment[ca]=Mostra l'escriptori Plasma
Comment[ca@valencia]=Mostra l'escriptori Plasma
Comment[cs]=Zobrazení plochy Plasmy
Comment[de]=Die Plasma-Arbeitsfläche anzeigen
Comment[en_GB]=Show the Plasma desktop
Comment[es]=Mostrar el escritorio Plasma
Comment[eu]=Erakutsi Plasma mahaigaina
......
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