From 2ec0a35fc100a1193a0a80dc3c94fde332f150f9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 Jul 2021 01:14:02 +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" --- src/desktoptheme/breeze-dark/metadata.desktop.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index 9485e8ace..bef635270 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake @@ -27,7 +27,7 @@ Name[nds]=Breeze düüster Name[nl]=Breeze Dark Name[nn]=Breeze mørk Name[pa]=ਬਰੀਜ਼ ਗੂੜ੍ਹਾ -Name[pl]=Ciemna bryza +Name[pl]=Ciemna Bryza Name[pt]=Brisa Escura Name[pt_BR]=Breeze Dark Name[ro]=Briză, întunecat @@ -69,7 +69,7 @@ Comment[ko]=KDE VDG에서 만든 어두운 Breeze Comment[nl]=Breeze Dark door de KDE VDG Comment[nn]=Breeze mørk frå KDE VDG Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼ ਗੂੜ੍ਹਾ -Comment[pl]=Ciemna bryza autorstwa KDE VDG +Comment[pl]=Ciemna Bryza autorstwa KDE VDG Comment[pt]=Brisa Escuro da VDG do KDE Comment[pt_BR]=Breeze Dark pelo KDE VDG Comment[ro]=Briză, întunecat, de KDE VDG