From 1d15f7df64bdbbfaa5375db14ddf1a637bc18bf8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 23 Jun 2019 05:04:17 +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 dd590cf..fbb91d0 100644 --- a/org.kde.rust_qt_binding_generator.desktop +++ b/org.kde.rust_qt_binding_generator.desktop @@ -9,6 +9,7 @@ GenericName[en_GB]=Programming Binding Generator GenericName[es]=Generador de vínculos de programación GenericName[ko]=프로그래밍 바인딩 생성기 GenericName[nl]=Binding Generator voor programmeren +GenericName[pl]=Tworzenie dowiązań programistycznych GenericName[pt]=Gerador de Interfaces de Programação GenericName[pt_BR]=Gerador de interfaces de programação GenericName[sk]=Programovací generátor väzieb @@ -24,6 +25,7 @@ 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[pl]=Tworzenie powiązań Qt Rust Name[pt]=Gerador de Interfaces de Qt em Rust Name[pt_BR]=Gerador de interfaces Qt para Rust Name[sk]=Generátor väzieb Rust Qt