From eb3ea40edb44af6a32d8e4b027671262344db3de Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 10 Feb 2024 01:15:57 +0000 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" --- themes/mac/metadata.desktop | 2 +- themes/windows/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 84d2c872a..3f380ea27 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -75,7 +75,7 @@ Comment[ru]=Тема в стиле Mac для Falkon, основанная на Comment[sk]=Mac téma pre Falkon postavená na Firefox Mac OS X téme Comment[sl]=Mac kot tema za Falkon temelji na temi Mac OS X za Firefox Comment[sv]=Mac-liknande tema för Falkon baserat på Firefox Mac OS X-tema -Comment[tr]=Firefox macOS teması tabanlı, Falkon için Mac'e benzer tema +Comment[tr]=Firefox macOS teması tabanlı, Falkon için Mac’e benzer tema Comment[uk]=Mac-подібна тема для Falkon, заснована на темі Mac OS X для Firefox Comment[x-test]=xxMac like theme for Falkon based on Firefox Mac OS X themexx Comment[zh_CN]=仿照 macOS 风格设计的 Falkon 主题，基于 Firefox Mac OS X 主题编写。 diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index fe3ea5aba..c8d581c1b 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -75,7 +75,7 @@ Comment[ru]=Тема в стиле Windows, основанная на систе Comment[sk]=Téma ako Windows postavená na Material Dizajne Comment[sl]=Windowsu podobna tema, ki temelji na temi Material design Comment[sv]=Windows-liknande tema baserat på Material design -Comment[tr]=Material design tabanlı, Windows'a benzer tema +Comment[tr]=Material design tabanlı, Windows’a benzer tema Comment[uk]=Windows-подібна тема, заснована на дизайні Material Comment[x-test]=xxWindows like theme based on Material designxx Comment[zh_CN]=仿照 Windows 风格设计的 Falkon 主题，基于 Material 设计语言编写。