From 874d6c36cef2c432316115576bf6284cb3f23d03 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 3 Jun 2019 05:24:26 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/org.kde.rust_qt_binding_generator.desktop b/org.kde.rust_qt_binding_generator.desktop index 86be85c..dd590cf 100644 --- a/org.kde.rust_qt_binding_generator.desktop +++ b/org.kde.rust_qt_binding_generator.desktop @@ -15,6 +15,7 @@ GenericName[sk]=Programovací generátor väzieb GenericName[sv]=Programmerar bindningsgenerator GenericName[uk]=Засіб створення програмних прив'язок GenericName[x-test]=xxProgramming Binding Generatorxx +GenericName[zh_TW]=程式 Binding 產生器 Icon=applications-development Name=Rust Qt Binding Generator Name[ca]=Generador de vincles pel Rust a les Qt