From f44018095d0c89c4ca7c8644d9d6f9bea8c9b733 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 May 2019 05:50:51 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.kde.rust_qt_binding_generator.desktop b/org.kde.rust_qt_binding_generator.desktop index 95d90c1..6d806a9 100644 --- a/org.kde.rust_qt_binding_generator.desktop +++ b/org.kde.rust_qt_binding_generator.desktop @@ -5,6 +5,7 @@ Exec=elisa %U GenericName=Programming Binding Generator GenericName[ca]=Generador de vincles de programació GenericName[ca@valencia]=Generador de vincles de programació +GenericName[es]=Generador de vínculos de programación GenericName[nl]=Binding Generator voor programmeren GenericName[sv]=Programmerar bindningsgenerator GenericName[uk]=Засіб створення програмних прив'язок @@ -13,10 +14,12 @@ 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[es]=Generador de vínculos de Rust para Qt Name[nl]=Rust Qt Binding Generator Name[sv]=Rust Qt-bindningsgenerator Name[uk]=Засіб створення прив'язок Qt до Rust Name[x-test]=xxRust Qt Binding Generatorxx +Name[zh_TW]=Rust Qt Binding 產生器 StartupNotify=false Terminal=true Type=Application