From 875dbab70c97a293f87a6f4c53e63931078c8b86 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 6 Jul 2019 05:15:02 +0200 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 | 1 + src/desktoptheme/breeze-light/metadata.desktop.cmake | 1 + src/desktoptheme/breeze/metadata.desktop.cmake | 1 + 3 files changed, 3 insertions(+) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index 8d39b58ba..f2adce2f6 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake @@ -60,6 +60,7 @@ 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 +Comment[sk]=Vánok Tmavý od KDE VDG Comment[sv]=Breeze mörk av KDE:s visuella designgrupp Comment[uk]=Темна Breeze, автори — KDE VDG Comment[x-test]=xxBreeze Dark by the KDE VDGxx diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake index 69359effc..065e817ed 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake @@ -57,6 +57,7 @@ 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 +Comment[sk]=Vánok Svetlý od KDE VDG Comment[sv]=Breeze ljus av KDE:s visuella designgrupp Comment[uk]=Світла Breeze, автори — KDE VDG Comment[x-test]=xxBreeze Light by the KDE VDGxx diff --git a/src/desktoptheme/breeze/metadata.desktop.cmake b/src/desktoptheme/breeze/metadata.desktop.cmake index a29961690..98026d1f9 100644 --- a/src/desktoptheme/breeze/metadata.desktop.cmake +++ b/src/desktoptheme/breeze/metadata.desktop.cmake @@ -60,6 +60,7 @@ 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 +Comment[sk]=Vánok od KDE VDG Comment[sv]=Breeze av KDE:s visuella designgrupp Comment[uk]=Breeze, автори — KDE VDG Comment[x-test]=xxBreeze by the KDE VDGxx