From dc1a8741881368448c71d14ca108e1fac787ba7a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 May 2019 05:29:18 +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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.kde.rust_qt_binding_generator.desktop b/org.kde.rust_qt_binding_generator.desktop index c9f1c12..86be85c 100644 --- a/org.kde.rust_qt_binding_generator.desktop +++ b/org.kde.rust_qt_binding_generator.desktop @@ -5,7 +5,9 @@ Exec=elisa %U GenericName=Programming Binding Generator GenericName[ca]=Generador de vincles de programació GenericName[ca@valencia]=Generador de vincles de programació +GenericName[en_GB]=Programming Binding Generator GenericName[es]=Generador de vínculos de programación +GenericName[ko]=프로그래밍 바인딩 생성기 GenericName[nl]=Binding Generator voor programmeren GenericName[pt]=Gerador de Interfaces de Programação GenericName[pt_BR]=Gerador de interfaces de programação @@ -17,7 +19,9 @@ 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[en_GB]=Rust Qt Binding Generator Name[es]=Generador de vínculos de Rust para Qt +Name[ko]=Rust Qt 바인딩 생성기 Name[nl]=Rust Qt Binding Generator Name[pt]=Gerador de Interfaces de Qt em Rust Name[pt_BR]=Gerador de interfaces Qt para Rust