From 9dba71945a0f7ddd146b3f5f67e83a0cf6a537dd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 May 2021 01:35:01 +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" --- plasma_phone_components.notifyrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc index 88be6784..fdb273ac 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -13,6 +13,7 @@ Name[fr]=Plasma Name[hu]=Plasma Name[ia]=Plasma Name[it]=Plasma +Name[ko]=Plasma Name[nl]=Plasma Name[nn]=Plasma Name[pa]=ਪਲਾਜ਼ਮਾ @@ -38,6 +39,7 @@ Name[fr]=Capturé Name[hu]=Rögzítve Name[ia]=Capturate Name[it]=Catturato +Name[ko]=캡처됨 Name[nl]=Opgenomen Name[nn]=Opptak Name[pa]=ਕੈਪਚਰ ਕੀਤਾ @@ -59,6 +61,7 @@ Comment[fr]=Capturé Comment[hu]=Rögzítve Comment[ia]=Capturate Comment[it]=Catturato +Comment[ko]=캡처됨 Comment[nl]=Opgenomen Comment[nn]=Opptak Comment[pa]=ਕੈਪਚਰ ਕੀਤਾ