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"
4 years ago · 0d57626fff
parent 3f4c5a2236
commit 0d57626fff
3 changed files with 3 additions and 3 deletions
--- a/containmentactions/switchactivity/plasma-containmentactions-switchactivity.json
+++ b/containmentactions/switchactivity/plasma-containmentactions-switchactivity.json
@ -39,7 +39,7 @@
        "Description": "Switch to another activity",
        "Description[ar]": "بدّل إلى نشاط آخر",
        "Description[az]": "Başqa İş Otağına keçidi təmin edir",
-        "Description[ca@valencia]": "Canvia a una altra activitat",
+        "Description[ca@valencia]": "Canvia a una atra activitat",
        "Description[ca]": "Canvia a una altra activitat",
        "Description[cs]": "Přepnout na jinou aktivitu",
        "Description[de]": "Zu einer anderen Aktivität wechseln",
--- a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.json
+++ b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.json
@ -39,7 +39,7 @@
        "Description": "Switch to another virtual desktop",
        "Description[ar]": "بدّل إلى سطح مكتب وهمي آخر",
        "Description[az]": "Başqa İş Masasına keçidi təmin edir",
-        "Description[ca@valencia]": "Canvia a un altre escriptori virtual",
+        "Description[ca@valencia]": "Canvia a un atre escriptori virtual",
        "Description[ca]": "Canvia a un altre escriptori virtual",
        "Description[cs]": "Přepnout na jinou virtuální plochu",
        "Description[de]": "Zu einer anderen virtuellen Arbeitsfläche wechseln",
--- a/solidautoeject/solidautoeject.json
+++ b/solidautoeject/solidautoeject.json
@ -3,7 +3,7 @@
        "Description": "Automatically releases drives when their eject button is pushed",
        "Description[ar]": "أطلِق الأجهزة آليًا عندما يُضغَط زر الإخراج",
        "Description[az]": "Çıxart düyməsinə vurduqda daşıyıcıları avtomatik ayırır",
-        "Description[ca@valencia]": "Allibera unitats automàticament quan es prem el seu botó d'expulsió",
+        "Description[ca@valencia]": "Llibera unitats automàticament quan es prem el seu botó d'expulsió",
        "Description[ca]": "Allibera unitats automàticament quan es prem el seu botó d'expulsió",
        "Description[cs]": "Umožňuje automaticky uvolnit mechaniku při stisknutí tlačítka vysunutí",
        "Description[de]": "Löst die Laufwerkseinbindung automatisch bei Betätigung des Auswurfknopfes",