From d056b044834af7d047bd6a0c742a9ec39730981c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 May 2019 05:57:15 +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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/org.kde.rust_qt_binding_generator.desktop b/org.kde.rust_qt_binding_generator.desktop index 6aa6473..95d90c1 100644 --- a/org.kde.rust_qt_binding_generator.desktop +++ b/org.kde.rust_qt_binding_generator.desktop @@ -3,8 +3,20 @@ Categories=Qt;KDE; Comment= Exec=elisa %U GenericName=Programming Binding Generator +GenericName[ca]=Generador de vincles de programació +GenericName[ca@valencia]=Generador de vincles de programació +GenericName[nl]=Binding Generator voor programmeren +GenericName[sv]=Programmerar bindningsgenerator +GenericName[uk]=Засіб створення програмних прив'язок +GenericName[x-test]=xxProgramming Binding Generatorxx Icon=applications-development Name=Rust Qt Binding Generator +Name[ca]=Generador de vincles pel Rust a les Qt +Name[ca@valencia]=Generador de vincles pel Rust a les Qt +Name[nl]=Rust Qt Binding Generator +Name[sv]=Rust Qt-bindningsgenerator +Name[uk]=Засіб створення прив'язок Qt до Rust +Name[x-test]=xxRust Qt Binding Generatorxx StartupNotify=false Terminal=true Type=Application