From e671db140aebd042ed204e7910e282d29cefc068 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 14 May 2019 05:46:38 +0200 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" --- org.kde.rust_qt_binding_generator.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.kde.rust_qt_binding_generator.desktop b/org.kde.rust_qt_binding_generator.desktop index 5a075b0..1efc0ee 100644 --- a/org.kde.rust_qt_binding_generator.desktop +++ b/org.kde.rust_qt_binding_generator.desktop @@ -8,6 +8,7 @@ GenericName[ca@valencia]=Generador de vincles de programació GenericName[es]=Generador de vínculos de programación GenericName[nl]=Binding Generator voor programmeren GenericName[pt]=Gerador de Interfaces de Programação +GenericName[sk]=Programovací generátor väzieb GenericName[sv]=Programmerar bindningsgenerator GenericName[uk]=Засіб створення програмних прив'язок GenericName[x-test]=xxProgramming Binding Generatorxx @@ -18,6 +19,7 @@ Name[ca@valencia]=Generador de vincles pel Rust a les Qt Name[es]=Generador de vínculos de Rust para Qt Name[nl]=Rust Qt Binding Generator Name[pt]=Gerador de Interfaces de Qt em Rust +Name[sk]=Generátor väzieb Rust Qt Name[sv]=Rust Qt-bindningsgenerator Name[uk]=Засіб створення прив'язок Qt до Rust Name[x-test]=xxRust Qt Binding Generatorxx