From 182fd5f27979cffce7646ea1a19d5e6554c77b72 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Jul 2022 01:46:22 +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 43933eb0b..63027799a 100644 --- a/plugins/virtualmonitor/kdeconnect_virtualmonitor.json +++ b/plugins/virtualmonitor/kdeconnect_virtualmonitor.json @@ -14,12 +14,14 @@ "Name[es]": "Aleix Pol i Gonzalez", "Name[fi]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez", + "Name[ia]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez", "Name[ko]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez", "Name[nn]": "Aleix Pol i Gonzalez", "Name[pl]": "Aleix Pol i Gonzalez", "Name[pt]": "Aleix Pol i Gonzalez", + "Name[pt_BR]": "Aleix Pol i Gonzalez", "Name[ro]": "Aleix Pol i Gonzalez", "Name[sl]": "Aleix Pol i Gonzalez", "Name[sv]": "Aleix Pol i Gonzalez", @@ -38,6 +40,7 @@ "Description[es]": "Usar sus dispositivos como monitores virtuales", "Description[fi]": "Käytä laitteita virtuaalinäyttöinä", "Description[fr]": "Utilisez vos périphériques comme des écrans virtuels", + "Description[ia]": "Usa tu dispositivos como monitor virtual", "Description[id]": "Gunakan perangkatmu sebagai monitor virtual", "Description[it]": "Usa i tuoi dispositivi come schermi virtuali", "Description[ko]": "내 장치를 가상 모니터로 사용", @@ -45,6 +48,7 @@ "Description[nn]": "Bruk einingane som virtuelle avlyttarar", "Description[pl]": "Użyj swojego urządzenia jako wyświetlacza wirtualnego", "Description[pt]": "Usar os seus dispositivos como monitores virtuais", + "Description[pt_BR]": "Usa seus dispositivos como monitores virtuais", "Description[ro]": "Folosiți-vă dispozitivele ca monitoare virtuale", "Description[sl]": "Uporabi vaše naprave kot navidezne monitorje", "Description[sv]": "Använd apparater som virtuella bildskärmar", @@ -65,6 +69,7 @@ "Name[es]": "Monitor virtual", "Name[fi]": "Virtuaalinäyttö", "Name[fr]": "Écran virtuel", + "Name[ia]": "Monitor virtual", "Name[id]": "Monitor Virtual", "Name[it]": "Schermo virtuale", "Name[ko]": "가상 모니터", @@ -72,6 +77,7 @@ "Name[nn]": "Virtuell avlyttar", "Name[pl]": "Wyświetlacz wirtualny", "Name[pt]": "Monitor Virtual", + "Name[pt_BR]": "Monitor virtual", "Name[ro]": "Monitor virtual", "Name[sl]": "Navidezni monitor", "Name[sv]": "Virtuell bildskärm",