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"
9 years ago · fb2ea377ac
parent bc73040686
commit fb2ea377ac
1 changed files with 1 additions and 0 deletions
--- a/kdecoration/breeze.json
+++ b/kdecoration/breeze.json
@ -1,6 +1,7 @@
 {
    "KPlugin": {
        "Description": "Window decoration using the Breeze visual style for the Plasma Desktop", 
+        "Description[ast]": "Decoración de ventanes qu'usa l'estilu visual Breeze pal escritoriu Plasma", 
        "Description[ca@valencia]": "Decoració de les finestres que usa l'estil visual Brisa per a l'escriptori del Plasma", 
        "Description[ca]": "Decoració de les finestres que usa l'estil visual Brisa per a l'escriptori del Plasma", 
        "Description[cs]": "Dekorace oken pro pracovní plochu Plasma využívající styl Breeze",