From 7963effff6029845182ef52d81e3397f49baae89 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 May 2024 01:19:07 +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" --- app/org.kde.kdeconnect.app.desktop | 2 +- plugins/bigscreen/kdeconnect_bigscreen.json | 2 +- plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 2 +- plugins/mprisremote/kdeconnect_mprisremote.json | 2 +- plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 +- plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json | 2 +- plugins/systemvolume/kdeconnect_systemvolume.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index b35fdb356..c8334f944 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -58,7 +58,7 @@ GenericName[ar]=مزامنة الأجهزة GenericName[az]=Cihazların eyniləşdirilməsi GenericName[bg]=Синхронизация на устройство GenericName[ca]=Sincronització de dispositius -GenericName[ca@valencia]=Sincronització de dispositius +GenericName[ca@valencia]=Sincronitzeu els dispositius GenericName[cs]=Synchronizace zařízení GenericName[da]=Enhedssynkronisering GenericName[de]=Geräteabgleich diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index ec12b323a..2e5ba0f14 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -103,7 +103,7 @@ "Name[cs]": "Hlasové ovládání pro Bigscreen", "Name[de]": "Bigscreen-Spracheingabe", "Name[en_GB]": "Bigscreen voice control", - "Name[eo]": "Grandekrana voĉa kontrolo", + "Name[eo]": "Grandekrana pervoĉa stiro", "Name[es]": "Control de voz de Bigscreen", "Name[eu]": "«Bigscreen»en ahots agintea", "Name[fi]": "Bigscreen-äänen hallinta", diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index 6325b9100..5f0f50ca5 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -108,7 +108,7 @@ "Name[de]": "Steuerung für Multimedia-Empfänger", "Name[el]": "Δέκτης ελέγχου πολυμέσων", "Name[en_GB]": "Multimedia control receiver", - "Name[eo]": "Multmedia kontrolo ricevilo", + "Name[eo]": "Multmediostira ricevilo", "Name[es]": "Receptor de control multimedia", "Name[et]": "Multimeedia juhtimine", "Name[eu]": "Multimedia-kontroladore hartzailea", diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json index ca0efff34..627641f41 100644 --- a/plugins/mprisremote/kdeconnect_mprisremote.json +++ b/plugins/mprisremote/kdeconnect_mprisremote.json @@ -66,7 +66,7 @@ "Description[de]": "Steuerung von MPRIS-Diensten", "Description[el]": "Έλεγχος υπηρεσιών MPRIS", "Description[en_GB]": "Control MPRIS services", - "Description[eo]": "Kontroli MPRIS-servojn", + "Description[eo]": "Regi MPRIS-servojn", "Description[es]": "Controlar los servicios MPRIS", "Description[et]": "MPRIS-teenuste juhtimine", "Description[eu]": "Kontrolatu MPRIS zerbitzuak", diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json index a5303cefa..d209e6d5c 100644 --- a/plugins/remotecontrol/kdeconnect_remotecontrol.json +++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json @@ -66,7 +66,7 @@ "Description[de]": "Entfernte Systeme steuern", "Description[el]": "Έλεγχος ανταπόκρισης απομακρυσμένων συστημάτων", "Description[en_GB]": "Control Remote systems", - "Description[eo]": "Kontroli Forajn sistemojn", + "Description[eo]": "Regi Forajn sistemojn", "Description[es]": "Controlar sistemas remotos", "Description[et]": "Kaugjuhtimissüsteemid", "Description[eu]": "Kontrolatu urruneko sistemak", diff --git a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json index 3ba61bbc1..cc7620bee 100644 --- a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json +++ b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json @@ -62,7 +62,7 @@ "Description[de]": "Steuert die Lautstärke eines verbundenen Geräts", "Description[el]": "Έλεγχος του τόμου της συνδεδεμένης συσκευής", "Description[en_GB]": "Control the volume of the connected device", - "Description[eo]": "Kontroli la laŭtecon de la konektita aparato", + "Description[eo]": "Regi la laŭtecon de la konektita aparato", "Description[es]": "Controle el volumen del dispositivo conectado", "Description[et]": "Ühendatud seadme helitugevuse juhtimine", "Description[eu]": "Kontrolatu konektatutako gailuaren bolumena", diff --git a/plugins/systemvolume/kdeconnect_systemvolume.json b/plugins/systemvolume/kdeconnect_systemvolume.json index 73b164c0f..35c61b6f4 100644 --- a/plugins/systemvolume/kdeconnect_systemvolume.json +++ b/plugins/systemvolume/kdeconnect_systemvolume.json @@ -63,7 +63,7 @@ "Description[de]": "Steuert die Lautstärke des Systems über Ihr Telefon", "Description[el]": "Έλεγοχς του τόμου του συστήματοα από το τηλέφωνό σας", "Description[en_GB]": "Control the system volume from your phone", - "Description[eo]": "Kontroli la sisteman laŭtecon de via telefono", + "Description[eo]": "Regi la sisteman laŭtecon de via telefono", "Description[es]": "Controle el volumen del sistema desde su teléfono", "Description[et]": "Süsteemi helitugevuse juhtimine oma telefonist", "Description[eu]": "Kontrolatu sistemaren bolumena zure telefonotik",