From c06e86f413c40b1273d1043bccc25599d1319d1d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 30 Aug 2015 11:36:13 +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.dark/metadata.desktop | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 058e9b01..e8abb29b 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -10,6 +10,10 @@ Comment[pl]=Język Projektowania Ciemnego Pulpitu Bryzy przez KDE VDG Comment[pt]=Linguagem de Desenho do Ecrã Brisa Escuro, da VDG do KDE Comment[pt_BR]=Linguagem de desenho da área de trabalho Breeze Dark por KDE VDG Comment[sl]=Sapica (temna), oblikovalni jezik namizja avtorjev KDE VDG +Comment[sr]=Језик дизајна површи Поветарац тамни од КДЕ‑ВДГ‑а +Comment[sr@ijekavian]=Језик дизајна површи Поветарац тамни од КДЕ‑ВДГ‑а +Comment[sr@ijekavianlatin]=Jezik dizajna površi Povetarac tamni od KDE VDG‑a +Comment[sr@latin]=Jezik dizajna površi Povetarac tamni od KDE VDG‑a Comment[sv]=Breeze-konstruktionsspråk för mörkt skrivbord av KDE VDG Comment[uk]=Мова розробки стільниці Breeze Dark, створена KDE VDG Comment[x-test]=xxBreeze Dark Desktop Design Language by the KDE VDGxx