From ede9015884ad657c0e28b548d0f2bac2227e024f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 20 Jun 2018 05:45:06 +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" --- src/plugins/GreaseMonkey/metadata.desktop | 2 +- src/plugins/VerticalTabs/metadata.desktop | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/GreaseMonkey/metadata.desktop b/src/plugins/GreaseMonkey/metadata.desktop index 248043615..c77dc60c0 100644 --- a/src/plugins/GreaseMonkey/metadata.desktop +++ b/src/plugins/GreaseMonkey/metadata.desktop @@ -18,7 +18,7 @@ Name[pt]=GreaseMonkey Name[sv]=GreaseMonkey Name[uk]=GreaseMonkey Name[x-test]=xxGreaseMonkeyxx -Name[zh_CN]=GreaseMonkey +Name[zh_CN]=油猴 Comment=Provides support for userscripts Comment[ca]=Proporciona suport per scripts d'usuari Comment[ca@valencia]=Proporciona suport per scripts d'usuari diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index 1f85bb375..34085c893 100644 --- a/src/plugins/VerticalTabs/metadata.desktop +++ b/src/plugins/VerticalTabs/metadata.desktop @@ -18,7 +18,7 @@ Name[pt]=Páginas Verticais Name[sv]=Vertikala flikar Name[uk]=Вертикальні вкладки Name[x-test]=xxVertical Tabsxx -Name[zh_CN]=垂直选项卡 +Name[zh_CN]=垂直标签页 Comment=Adds ability to show tabs in sidebar Comment[ca]=Afegeix la possibilitat de mostrar les pestanyes a la barra lateral Comment[ca@valencia]=Afig la possibilitat de mostrar les pestanyes a la barra lateral @@ -37,7 +37,7 @@ Comment[pt]=Adiciona a capacidade de mostrar as páginas na barra lateral Comment[sv]=Lägger till möjlighet att visa flikar i sidorader Comment[uk]=Додає можливість показу вкладок на бічній панелі Comment[x-test]=xxAdds ability to show tabs in sidebarxx -Comment[zh_CN]=添加在边栏中显示选项卡的功能 +Comment[zh_CN]=添加在边栏中显示标签页的功能 Icon=:verticaltabs/data/icon.svg Type=Service