From eb2477892cbb24143d116c789d24661524a1cc37 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 26 Aug 2015 10:20:59 +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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index eb9eb6fe..a7926c69 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -1,5 +1,13 @@ [Desktop Entry] Comment=Breeze Dark Desktop Design Language by the KDE VDG +Comment[ca]=Llenguatge de disseny d'escriptori Brisa fosca pel VDG del KDE +Comment[nl]=Breeze Dark ontwerptaal van het bureaublad door 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[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 Encoding=UTF-8 Name=Breeze Dark Name[ar]=نسيم داكن