From e682fd32132b4289e8ec6cd37f3ece27a5bb2d52 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 1 Sep 2016 10:04:45 +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" --- .../lookandfeel/plasma-packagestructure-lookandfeel.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop index 9df98af37..a7ffb0331 100644 --- a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop +++ b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop @@ -16,7 +16,7 @@ Name[eu]=Itxura eta Izaera Name[fi]=Ulkoasu ja tuntuma Name[fr]=Apparence Name[gl]=Aparencia e comportamento -Name[he]=מראה והרגשה +Name[he]=מראה ותחושה Name[hu]=Megjelenés Name[ia]=Semblantia Name[id]=Tampilan dan Rasa