From 51a9f26bc1096fb63b8afa3552438f254f5b659b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 20 Sep 2024 01:25:09 +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" --- plugins/systemvolume/kdeconnect_systemvolume.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/systemvolume/kdeconnect_systemvolume.json b/plugins/systemvolume/kdeconnect_systemvolume.json index 58560e86e..e81b4f6ee 100644 --- a/plugins/systemvolume/kdeconnect_systemvolume.json +++ b/plugins/systemvolume/kdeconnect_systemvolume.json @@ -62,7 +62,7 @@ "Description[cs]": "Ovládejte hlasitost systému z vašeho telefonu", "Description[da]": "Kontrollér systemets lydstyrke fra din telefon", "Description[de]": "Steuert die Lautstärke des Systems über Ihr Telefon", - "Description[el]": "Έλεγοχς του τόμου του συστήματοα από το τηλέφωνό σας", + "Description[el]": "Έλεγχος του τόμου του συστήματος από το τηλέφωνό σας", "Description[en_GB]": "Control the system volume from your phone", "Description[eo]": "Regi la sisteman laŭtecon de via telefono", "Description[es]": "Controle el volumen del sistema desde su teléfono",