From e338309ef54d15d0319b8edccfd58e6d32b5a51b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 6 Jun 2020 05:03:00 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 0dff4dbf5..cfbaa8417 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -29,6 +29,7 @@ "Description[nl]": "Bigscreen plug-in", "Description[nn]": "Bigscreen-tillegg", "Description[pt]": "'Plugin' de Ecrã Grande", + "Description[pt_BR]": "Plugin de tela grande", "Description[sk]": "Doplnok veľkej obrazovky", "Description[uk]": "Додаток для великих екранів", "Description[x-test]": "xxBigscreen Pluginxx", @@ -46,6 +47,7 @@ "Name[nl]": "Bigscreen", "Name[nn]": "Bigscreen", "Name[pt]": "Ecrã grande", + "Name[pt_BR]": "Tela grande", "Name[sk]": "Veľká obrazovka", "Name[uk]": "Великий екран", "Name[x-test]": "xxBigscreenxx",