From ee81c53ac0ffeea1922ba46d0dc3474235a4e3d6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 12 Dec 2019 05:48:12 +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" --- .../lookandfeel/plasma-packagestructure-lookandfeel.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop index eabe17363..e1e8b7829 100644 --- a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop +++ b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop @@ -20,6 +20,7 @@ Name[gl]=Aparencia e comportamento Name[he]=מראה ותחושה Name[hu]=Megjelenés Name[ia]=Semblantia +Name[id]=Look and Feel Name[is]=Útlit og viðmót Name[it]=Aspetto Name[ja]=外観