Commit 974c8e5a 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 b54adbec
Pipeline #247733 passed with stage
in 2 minutes and 8 seconds
......@@ -2,6 +2,7 @@
Name=Plasma Nano Toolbox
Name[ast]=Caxa de ferramientes de Plasma Nano
Name[az]=Plasma Nano alətlər qutusu
Name[bg]=Инструменти на Plasma Nano
Name[ca]=Quadre d'eines del Plasma Nano
Name[ca@valencia]=Quadre d'eines de Plasma Nano
Name[da]=Værktøjskasse til Plasma Nano
......@@ -37,6 +38,7 @@ Name[zh_TW]=Plasma Nano 工具箱
Comment=Manage Wallpaper and Widgets
Comment[ast]=Xestiona fondos y widgets
Comment[az]=Divar kağızlarının və Vidjetlərin idarə olunması
Comment[bg]=Управление на тапети и уиджети
Comment[ca]=Gestiona els fons de pantalla i els ginys
Comment[ca@valencia]=Gestiona els fons de pantalla i els ginys
Comment[cs]=Spravujte tapety a widgety
......@@ -2,6 +2,7 @@
Name=Plasma Nano
Name[ast]=Plasma Nano
Name[az]=Plasma Nanos
Name[bg]=Plasma Nano
Name[ca]=Plasma Nano
Name[ca@valencia]=Plasma Nano
Name[cs]=Plasma Nano
Supports Markdown
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