From 1523174c4249b36532dbe270042af05f516e7957 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Sep 2023 02:05:55 +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 | 2 ++ icons/index.theme | 2 ++ 2 files changed, 4 insertions(+) diff --git a/icons-dark/index.theme b/icons-dark/index.theme index 40ebdd4c..ea0d1112 100644 --- a/icons-dark/index.theme +++ b/icons-dark/index.theme @@ -37,6 +37,7 @@ Name[pt]=Brisa Escura Name[pt_BR]=Breeze Dark Name[ro]=Briză, întunecat Name[ru]=Breeze, тёмный вариант +Name[sa]=Breeze तिमिर Name[sk]=Tmavý vánok Name[sl]=Sapica (temna) (Breeze Dark) Name[sr]=Поветарац тамни @@ -90,6 +91,7 @@ Comment[pt]=Brisa Escuro da VDG do KDE Comment[pt_BR]=Breeze Dark pelo KDE VDG Comment[ro]=Briză, întunecat, de KDE VDG Comment[ru]=Тёмный вариант Breeze от KDE VDG +Comment[sa]=KDE VDG द्वारा Breeze तिमिर इति Comment[sk]=Tmavý vánok od KDE VDG Comment[sl]=Breeze Dark od KDE VDG Comment[sv]=Breeze mörk av KDE:s visuella designgrupp diff --git a/icons/index.theme b/icons/index.theme index c103c119..6d27902b 100644 --- a/icons/index.theme +++ b/icons/index.theme @@ -37,6 +37,7 @@ Name[pt]=Brisa Name[pt_BR]=Breeze Name[ro]=Briză Name[ru]=Breeze +Name[sa]=Breeze Name[sk]=Vánok Name[sl]=Sapica (Breeze) Name[sr]=Поветарац @@ -90,6 +91,7 @@ Comment[pt]=Brisa da VDG do KDE Comment[pt_BR]=Breeze pelo KDE VDG Comment[ro]=Briză, de KDE VDG Comment[ru]=Breeze от KDE VDG +Comment[sa]=KDE VDG द्वारा Breeze Comment[sk]=Vánok od KDE VDG Comment[sl]=Breeze od KDE VDG Comment[sv]=Breeze av KDE:s visuella designgrupp