From e36bf748cc97e5d3e473637ee6af87f40609f35a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 23 Dec 2018 05:14:11 +0100 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" --- data/kdeconnect-thunar.desktop | 1 + plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop index 38cdf2a1e..8780ed616 100644 --- a/data/kdeconnect-thunar.desktop +++ b/data/kdeconnect-thunar.desktop @@ -12,6 +12,7 @@ Name[de]=Mit KDE-Connect versenden Name[en_GB]=Send via KDE Connect Name[es]=Enviar via KDE Connect Name[eu]=Bidali KDE Connect bidez +Name[fr]=Envoyer via KDE Connect Name[gl]=Enviar mediante KDE Connect Name[it]=Invia tramite KDE Connect Name[nl]=Via KDE Connect versturen diff --git a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json index dc5400020..03665d8a0 100644 --- a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json +++ b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json @@ -34,6 +34,7 @@ "Description[en_GB]": "Control the volume of the connected device", "Description[es]": "Controle el volumen del dispositivo conectado", "Description[eu]": "Kontrolatu konektatutako gailuaren bolumena", + "Description[fr]": "Contrôler le volume du périphérique connecté", "Description[gl]": "Controlar o volume do dispositivo conectado", "Description[it]": "Controlla il volume del dispositivo connesso", "Description[nl]": "Bestuur het volume van het verbonden apparaat", @@ -55,6 +56,7 @@ "Name[en_GB]": "Remote system volume", "Name[es]": "Volumen del sistema remoto", "Name[eu]": "Urruneko sistemaren bolumena", + "Name[fr]": "Volume du système distant", "Name[gl]": "Volume de sistema remoto", "Name[it]": "Volume del sistema remoto", "Name[nl]": "Systeemvolume op afstand",