From 1449fbac30545944360b00dc2821aac5c97470fa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Jan 2021 09:54:24 +0100 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 305eda279..327155055 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -54,7 +54,7 @@ "Description[lt]": "Bigscreen papildinys", "Description[nl]": "Bigscreen plug-in", "Description[nn]": "Bigscreen-tillegg", - "Description[pl]": "Wtyczka Bigscreen", + "Description[pl]": "Wtyczka Dużego Ekranu", "Description[pt]": "'Plugin' de Ecrã Grande", "Description[pt_BR]": "Plugin de tela grande", "Description[ro]": "Extensia „ecran mare”", @@ -87,7 +87,7 @@ "Name[lt]": "Bigscreen", "Name[nl]": "Bigscreen", "Name[nn]": "Bigscreen", - "Name[pl]": "Bigscreen", + "Name[pl]": "Duży Ekran", "Name[pt]": "Ecrã grande", "Name[pt_BR]": "Tela grande", "Name[ro]": "Ecran mare",