From 6eb5e70607c352def12d7ee1eca00c5d995846dc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 14 Aug 2019 05:04:20 +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 +++ 1 file changed, 3 insertions(+) diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop index c3bb01954..ca106fde4 100644 --- a/data/org.kde.kdeconnect_open.desktop +++ b/data/org.kde.kdeconnect_open.desktop @@ -9,6 +9,7 @@ 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로 연결된 장치에서 열기 +GenericName[lt]=Atverti prijungtame įrenginyje per KDE Connect GenericName[nl]=Op verbonden apparaat openen via KDE Connect GenericName[nn]=Opna på tilkopla eining via KDE Connect GenericName[pl]=Otwórz na podłączonym urządzeniu przez KDE Connect @@ -29,6 +30,7 @@ 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로 연결된 장치에서 열기 +Name[lt]=Atverti prijungtame įrenginyje per KDE Connect Name[nl]=Op verbonden apparaat openen via KDE Connect Name[nn]=Opna på tilkopla eining via KDE Connect Name[pl]=Otwórz na podłączonym urządzeniu przez KDE Connect @@ -49,6 +51,7 @@ 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로 연결된 장치에서 열기 +Comment[lt]=Atverti prijungtame įrenginyje naudojant KDE Connect Comment[nl]=Op een verbonden apparaat openen via KDE Connect Comment[nn]=Opna på ei tilkopla eining via KDE Connect Comment[pl]=Otwórz na podłączonym urządzeniu przez KDE Connect