From 58d35ec881262e2b38cd3ba233e0935abb40deac Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jul 2020 05:32:17 +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" --- plugins/bigscreen/kdeconnect_bigscreen.json | 3 +++ urlhandler/org.kde.kdeconnect.handler.desktop | 1 + 2 files changed, 4 insertions(+) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index dc3dc4799..0d3e2fa04 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -4,6 +4,7 @@ { "Email": "aix.m@outlook.com", "Name": "Aditya Mehra", + "Name[ca@valencia]": "Aditya Mehra", "Name[ca]": "Aditya Mehra", "Name[cs]": "Aditya Mehra", "Name[en_GB]": "Aditya Mehra", @@ -27,6 +28,7 @@ } ], "Description": "Bigscreen Plugin", + "Description[ca@valencia]": "Connector de la Bigscreen", "Description[ca]": "Connector de la Bigscreen", "Description[cs]": "Modul pro velkou obrazovku", "Description[en_GB]": "Bigscreen Plugin", @@ -52,6 +54,7 @@ "Id": "kdeconnect_bigscreen", "License": "GPL", "Name": "Bigscreen", + "Name[ca@valencia]": "Bigscreen", "Name[ca]": "Bigscreen", "Name[cs]": "Velká obrazovka", "Name[en_GB]": "Bigscreen", diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop index d9ef303b1..e6b24a775 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=KDE Connect URL Handler Name[ca]=Gestor d'URL del KDE Connect +Name[ca@valencia]=Gestor d'URL del KDE Connect Name[cs]=Nástroj pro práci s URL v KDE Connect Name[en_GB]=KDE Connect URL Handler Name[es]=Controlador de URL de KDE Connect