From 96583a62c23852fb1e053075f88658d2be190391 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Jun 2022 01:42:52 +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/virtualmonitor/kdeconnect_virtualmonitor.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json index f5f84c2f2..63885ac88 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -9,8 +9,10 @@ "Name[ca@valencia]": "Aleix Pol i Gonzalez", "Name[ca]": "Aleix Pol i Gonzalez", "Name[es]": "Aleix Pol i Gonzalez", + "Name[fr]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez", + "Name[pl]": "Aleix Pol i Gonzalez", "Name[pt]": "Aleix Pol i Gonzalez", "Name[ro]": "Aleix Pol i Gonzalez", "Name[sl]": "Aleix Pol i Gonzalez", @@ -26,8 +28,10 @@ "Description[ca@valencia]": "Utiliseu els vostres dispositius com a monitors virtuals", "Description[ca]": "Useu els vostres dispositius com a monitors virtuals", "Description[es]": "Usar sus dispositivos como monitores virtuales", + "Description[fr]": "Utilisez vos périphériques comme des écrans virtuels", "Description[it]": "Usa i tuoi dispositivi come schermi virtuali", "Description[nl]": "Uw apparaten als virtuele monitoren gebruiken", + "Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego", "Description[pt]": "Usar os seus dispositivos como monitores virtuais", "Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale", "Description[sl]": "Uporabi vaše naprave kot navidezne monitorje", @@ -45,8 +49,10 @@ "Name[ca@valencia]": "Monitor virtual", "Name[ca]": "Monitor virtual", "Name[es]": "Monitor virtual", + "Name[fr]": "Écran virtuel", "Name[it]": "Schermo virtuale", "Name[nl]": "Virtuele monitor", + "Name[pl]": "Wyświetlacz wirtualny", "Name[pt]": "Monitor Virtual", "Name[ro]": "Monitor virtual", "Name[sl]": "Navidezni monitor",