From 640296c15419dddf9bbb5582f0c3019b7cc864aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Sep 2025 01:37:26 +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" --- icons-dark/index.theme.in | 2 -- icons/index.theme.in | 2 -- 2 files changed, 4 deletions(-) diff --git a/icons-dark/index.theme.in b/icons-dark/index.theme.in index efbc6663..3776642d 100644 --- a/icons-dark/index.theme.in +++ b/icons-dark/index.theme.in @@ -52,7 +52,6 @@ Name[tg]=Насими торик Name[tr]=Esinti Koyu Name[uk]=Темна Breeze Name[vi]=Breeze Tối -Name[x-test]=xxBreeze Darkxx Name[zh_CN]=Breeze 微风深色 Name[zh_TW]=Breeze Dark @@ -103,7 +102,6 @@ Comment[tg]=Насими торик аз KDE VDG Comment[tr]=KDE Görsel Tasarım grubundan Esinti Koyu Comment[uk]=Breeze Dark, автори — KDE VDG Comment[vi]=Breeze Tối, do KDE VDG -Comment[x-test]=xxBreeze Dark by the KDE VDGxx Comment[zh_CN]=Breeze 微风深色主题，由 KDE VDG (视觉设计团队) 设计制作 Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze Dark diff --git a/icons/index.theme.in b/icons/index.theme.in index 241e122a..5e47fbfc 100644 --- a/icons/index.theme.in +++ b/icons/index.theme.in @@ -52,7 +52,6 @@ Name[tg]=Насим Name[tr]=Esinti Name[uk]=Breeze Name[vi]=Breeze -Name[x-test]=xxBreezexx Name[zh_CN]=Breeze 微风 Name[zh_TW]=Breeze @@ -103,7 +102,6 @@ Comment[tg]=Насим аз KDE VDG Comment[tr]=KDE Görsel Tasarım grubundan Esinti Comment[uk]=Breeze, автори — KDE VDG Comment[vi]=Breeze, do KDE VDG -Comment[x-test]=xxBreeze by the KDE VDGxx Comment[zh_CN]=Breeze 微风主题，由 KDE VDG (视觉设计团队) 设计制作 Comment[zh_TW]=由 KDE VDG 團隊製作的 Breeze