From 60801fbbc87f6005ca8d69c8540890fd908d3b69 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 May 2019 06:04:53 +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 6d806a9..5a075b0 100644 --- a/org.kde.rust_qt_binding_generator.desktop +++ b/org.kde.rust_qt_binding_generator.desktop @@ -7,6 +7,7 @@ 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[pt]=Gerador de Interfaces de Programação GenericName[sv]=Programmerar bindningsgenerator GenericName[uk]=Засіб створення програмних прив'язок GenericName[x-test]=xxProgramming Binding Generatorxx @@ -16,6 +17,7 @@ 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[pt]=Gerador de Interfaces de Qt em Rust Name[sv]=Rust Qt-bindningsgenerator Name[uk]=Засіб створення прив'язок Qt до Rust Name[x-test]=xxRust Qt Binding Generatorxx