Commit 59f53bef 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 0535a718
Pipeline #211888 passed with stage
in 2 minutes and 1 second
......@@ -40,7 +40,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[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
......
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