From 0d57626fff4b5dd1524a363bfc77b14aaadc61ff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 May 2022 03:10:38 +0000 Subject: [PATCH] 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" --- .../plasma-containmentactions-switchactivity.json | 2 +- .../switchdesktop/plasma-containmentactions-switchdesktop.json | 2 +- solidautoeject/solidautoeject.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containmentactions/switchactivity/plasma-containmentactions-switchactivity.json b/containmentactions/switchactivity/plasma-containmentactions-switchactivity.json index 8459cb0c2..d235bb095 100644 --- 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", diff --git a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.json b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.json index a52bdfac8..55ff7c1c3 100644 --- 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", diff --git a/solidautoeject/solidautoeject.json b/solidautoeject/solidautoeject.json index 1a68da715..8e81b5ffe 100644 --- 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",