Commit 4bc44dc7 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 83d30599
......@@ -3,6 +3,7 @@ Name=Plasma Nano Toolbox
Name[ca]=Quadre d'eines del Plasma Nano
Name[ca@valencia]=Quadre d'eines del Plasma Nano
Name[da]=Værktøjskasse til Plasma Nano
Name[el]=Εργαλειοθήκη Plasma Nano
Name[en_GB]=Plasma Nano Toolbox
Name[es]=Caja de herramientas Plasma Nano
Name[et]=Plasma Nano tööriistakast
......@@ -34,6 +35,7 @@ Comment=Manage Wallpaper and Widgets
Comment[ca]=Gestiona els fons de pantalla i els estris
Comment[ca@valencia]=Gestiona els fons de pantalla i els estris
Comment[da]=Håndtér baggrundsbillede og widgets
Comment[el]=Διαχειριστείτε ταπετσαρίες και γραφικά συστατικά
Comment[en_GB]=Manage Wallpaper and Widgets
Comment[es]=Gestión de fondos del escritorio y de elementos gráficos
Comment[et]=Taustapiltide ja vidinate haldamine
......@@ -4,6 +4,7 @@ Name[ca]=Plasma Nano
Name[ca@valencia]=Plasma Nano
Name[cs]=Plasma Nano
Name[da]=Plasma Nano
Name[el]=Plasma Nano
Name[en_GB]=Plasma Nano
Name[es]=Plasma Nano
Name[et]=Plasma Nano
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