From d3a6284f3c368f7c233470c40b9edbe267bfd810 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 3 Aug 2018 05:36:50 +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" --- sfos/kdeconnect-sfos.desktop | 40 ++++++++++++++++++++++++++++++++++ sfos/kdeconnectd.desktop.cmake | 1 + 2 files changed, 41 insertions(+) diff --git a/sfos/kdeconnect-sfos.desktop b/sfos/kdeconnect-sfos.desktop index 7ba1133d7..48417a9bd 100644 --- a/sfos/kdeconnect-sfos.desktop +++ b/sfos/kdeconnect-sfos.desktop @@ -4,6 +4,46 @@ X-Nemo-Application-Type=generic Icon=kdeconnect Exec=kdeconnect-sfos Name=KDE Connect +Name[ar]=كدي المتّصل +Name[ast]=KDE Connect +Name[bg]=KDE Connect +Name[bs]=Konekcija KDE +Name[ca]=KDE Connect +Name[ca@valencia]=KDE Connect +Name[cs]=KDE Connect +Name[da]=KDE Connect +Name[de]=KDE-Connect +Name[el]=KDE Connect +Name[en_GB]=KDE Connect +Name[es]=KDE Connect +Name[et]=KDE Connect +Name[eu]=KDE Connect +Name[fi]=KDE Connect +Name[fr]=KDE Connect +Name[gl]=KDE Connect +Name[he]=KDE Connect +Name[hu]=KDE csatlakozás +Name[id]=KDE Connect +Name[it]=KDE Connect +Name[ko]=KDE Connect +Name[nl]=KDE Connect +Name[nn]=KDE Connect +Name[pl]=KDE Connect +Name[pt]=KDE Connect +Name[pt_BR]=KDE Connect +Name[ro]=KDE Connect +Name[ru]=KDE Connect +Name[sk]=KDE Connect +Name[sr]=КДЕ‑конекција +Name[sr@ijekavian]=КДЕ‑конекција +Name[sr@ijekavianlatin]=KDE‑konekcija +Name[sr@latin]=KDE‑konekcija +Name[sv]=KDE-anslut +Name[tr]=KDE Connect +Name[uk]=З’єднання KDE +Name[x-test]=xxKDE Connectxx +Name[zh_CN]=KDE Connect +Name[zh_TW]=KDE 連線 # translation example: # your app name in German locale (de) # diff --git a/sfos/kdeconnectd.desktop.cmake b/sfos/kdeconnectd.desktop.cmake index ab93439cb..aaaa14b83 100644 --- a/sfos/kdeconnectd.desktop.cmake +++ b/sfos/kdeconnectd.desktop.cmake @@ -26,6 +26,7 @@ Name[fr]=Démon KDE Connect Name[gl]=Servizo de KDE Connect Name[he]=דמון KDEConnect Name[hu]=KDEConnect szolgáltatás +Name[id]=Daemon KDEConnect Name[it]=Demone KDE Connect Name[ko]=KDE Connect 데몬 Name[nl]=KDEConnect-daemon