From c5b769508c061b165ec8b5a722239bbaa7d791db Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Aug 2019 05:05:01 +0200 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/org.kde.kdeconnect_open.desktop | 3 +++ plugins/presenter/kdeconnect_presenter.json | 2 ++ urlhandler/org.kde.kdeconnect.smshandler.desktop | 1 + 3 files changed, 6 insertions(+) diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop index d35a78986..c3bb01954 100644 --- a/data/org.kde.kdeconnect_open.desktop +++ b/data/org.kde.kdeconnect_open.desktop @@ -5,6 +5,7 @@ GenericName[cs]=Otevřít na připojeném zařízení přes KDE Connect GenericName[de]=Ein verbundenes Gerät mit KDE-Connect öffnen GenericName[en_GB]=Open on connected device via KDE Connect GenericName[es]=Abrir en dispositivo conectado a través de KDE Connect +GenericName[fr]=Ouvrir sur un appareil connecté via KDE Connect GenericName[gl]=Abrir no dispositivo conectado por KDE Connect GenericName[it]=Apri nel dispositivo connesso tramite KDE Connect GenericName[ko]=KDE Connect로 연결된 장치에서 열기 @@ -24,6 +25,7 @@ Name[cs]=Otevřít na připojeném zařízení přes KDE Connect Name[de]=Ein verbundenes Gerät mit KDE-Connect öffnen Name[en_GB]=Open on connected device via KDE Connect Name[es]=Abrir en dispositivo conectado a través de KDE Connect +Name[fr]=Ouvrir sur un appareil connecté via KDE Connect Name[gl]=Abrir no dispositivo conectado por KDE Connect Name[it]=Apri nel dispositivo connesso tramite KDE Connect Name[ko]=KDE Connect로 연결된 장치에서 열기 @@ -43,6 +45,7 @@ Comment[cs]=Otevřít na připojeném zařízení pomocí KDE Connect Comment[de]=Ein verbundenes Gerät mit KDE-Connect öffnen Comment[en_GB]=Open on a connected device using KDE Connect Comment[es]=Abrir en dispositivo conectado a través de KDE Connect +Comment[fr]=Ouvrir sur un appareil connecté avec KDE Connect Comment[gl]=Abrir nun dispositivo conectado usando KDE Connect Comment[it]=Apri in un dispositivo connesso usando KDE Connect Comment[ko]=KDE Connect로 연결된 장치에서 열기 diff --git a/plugins/presenter/kdeconnect_presenter.json b/plugins/presenter/kdeconnect_presenter.json index ec0e3f6a2..f3b030033 100644 --- a/plugins/presenter/kdeconnect_presenter.json +++ b/plugins/presenter/kdeconnect_presenter.json @@ -47,6 +47,7 @@ "Description[cs]": "Použijte mobilní zařízení k ukázání na položky na obrazovce", "Description[de]": "Anzeige von Objekten auf dem Bildschirm mit Ihrem mobilen Gerät", "Description[en_GB]": "Use your mobile device to point to things on the screen", + "Description[fr]": "Utilisez votre appareil mobile pour montrer des choses à l'écran", "Description[gl]": "Use o seu dispositivo móbil para apuntar a cousas na pantalla", "Description[it]": "Usa il tuo dispositivo mobile per indicare gli oggetti sullo schermo", "Description[nl]": "Uw mobiele apparaat gebruiken om naar dingen op het scherm te wijzen", @@ -67,6 +68,7 @@ "Name[de]": "Präsentation", "Name[en_GB]": "Presenter", "Name[es]": "Presentador", + "Name[fr]": "Présentateur", "Name[gl]": "Presentador", "Name[it]": "Presentatore", "Name[ko]": "프레젠터", diff --git a/urlhandler/org.kde.kdeconnect.smshandler.desktop b/urlhandler/org.kde.kdeconnect.smshandler.desktop index b9c361824..90dc052f4 100644 --- a/urlhandler/org.kde.kdeconnect.smshandler.desktop +++ b/urlhandler/org.kde.kdeconnect.smshandler.desktop @@ -6,6 +6,7 @@ Name[cs]=Nástroj pro práci s URL v SMS pro KDE Connect Name[de]=KDE-Connect-SMS-Dienstprogramm für URLs (Adressen) Name[en_GB]=KDE Connect SMS URL Handler Name[es]=Controlador de URL de SMS de KDE Connect +Name[fr]=Gestionnaire d'URL SMS de KDE Connect Name[gl]=Xestor de URL de SMS de KDE Connect Name[it]=Gestore URL SMS di KDE Connect Name[ko]=KDE Connect SMS URL 처리기