From 395cb5d2f57eb2876f5f68d61bad1ef43ec5df6a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Sep 2017 05:00:58 +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" --- linux/applications/org.kde.Falkon.desktop | 1 - src/lib/data/breeze-fallback/index.theme | 1 - 2 files changed, 2 deletions(-) diff --git a/linux/applications/org.kde.Falkon.desktop b/linux/applications/org.kde.Falkon.desktop index 14b65bac0..30f82c7ba 100644 --- a/linux/applications/org.kde.Falkon.desktop +++ b/linux/applications/org.kde.Falkon.desktop @@ -41,7 +41,6 @@ GenericName[sk]=Webový prehliadač GenericName[sv]=Webbläsare GenericName[uk]=Переглядач інтернету GenericName[x-test]=xxWeb Browserxx -GenericName[zh_CN]=网页浏览器 Exec=falkon %u MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;application/x-mimearchive; Terminal=false diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index f9f07db08..0a7e19505 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -13,7 +13,6 @@ Name[sk]=Vánok Name[sv]=Breeze Name[uk]=Breeze Name[x-test]=xxBreezexx -Name[zh_CN]=微风 Comment=Breeze Team Comment[ar]=فريق نسيم Comment[ast]=L'equipu de Breeze