From 252298e88c0e68af418d4eaef607c6b8dda58cb7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Mar 2019 05:33:56 +0100 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 | 1 + src/desktoptheme/breeze-light/metadata.desktop | 1 + src/desktoptheme/breeze/metadata.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index 8f29f7c46..c4af5388c 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -50,6 +50,7 @@ Comment[gl]=Breeze escuro de KDE VDG Comment[id]=Breeze Dark oleh KDE VDG Comment[it]=Brezza scuro del KDE VDG Comment[nl]=Breeze Dark door de 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[ru]=Тёмный вариант Breeze от KDE VDG diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index ed6b6576d..84fb08114 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -47,6 +47,7 @@ Comment[gl]=Breeze claro de KDE VDG Comment[id]=Breeze Light oleh KDE VDG Comment[it]=Brezza chiaro del KDE VDG Comment[nl]=Breeze Light door de KDE VDG +Comment[pl]=Lekka Bryza autorstwa KDE VDG Comment[pt]=Brisa Claro da VDG do KDE Comment[pt_BR]=Breeze Light pelo KDE VDG Comment[ru]=Светлый вариант Breeze от KDE VDG diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index 0172be833..0415458f2 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -50,6 +50,7 @@ Comment[gl]=Breeze de KDE VDG Comment[id]=Breeze oleh KDE VDG Comment[it]=Brezza del KDE VDG Comment[nl]=Breeze door de KDE VDG +Comment[pl]=Bryza autorstwa KDE VDG Comment[pt]=Brisa da VDG do KDE Comment[pt_BR]=Breeze pelo KDE VDG Comment[ru]=Breeze от KDE VDG