From 40e7cab454a37a2ee853cf62f2170020bd8cb94f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 27 Apr 2023 01:43:28 +0000 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/battery/kdeconnect_battery.json | 1 + plugins/clipboard/kdeconnect_clipboard.json | 1 + plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 1 + plugins/notifications/kdeconnect_notifications.json | 1 + plugins/pausemusic/kdeconnect_pausemusic.json | 1 + plugins/ping/kdeconnect_ping.json | 1 + plugins/runcommand/kdeconnect_runcommand.json | 1 + plugins/share/kdeconnect_share.json | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 9 files changed, 9 insertions(+) diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 37b4a59c4..7ba2828c4 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora", diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json index 495087a3f..9aa7e60ad 100644 --- a/plugins/clipboard/kdeconnect_clipboard.json +++ b/plugins/clipboard/kdeconnect_clipboard.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora", diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index ba970a926..ae87db24f 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 4cc1fa870..561820ee4 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora", diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 57f78e9d2..7784d0ae4 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora", diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index 2c6d1c0c8..6138523d4 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/plugins/ping/kdeconnect_ping.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora", diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index 6d74b54a0..983921ed8 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora", diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index 3cf0c21fa..be526278a 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 0f26732af..a99fc19fd 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora", + "Name[de]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora", "Name[es]": "Albert Vaca Cintora", "Name[fi]": "Albert Vaca Cintora",