From 1928390d1f7c8dc6ef8da6865dbedda6e56be786 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Oct 2019 05:30:22 +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.cmake | 2 +- src/desktoptheme/breeze-light/metadata.desktop.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index ceae2d600..1fa24d648 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake @@ -28,7 +28,7 @@ Name[pl]=Ciemna bryza Name[pt]=Brisa Escura Name[pt_BR]=Breeze Dark Name[ru]=Breeze, тёмный вариант -Name[sk]=Tmavý vánok +Name[sk]=Vánok Tmavý Name[sl]=Sapica (temna) Name[sr]=Поветарац тамни Name[sr@ijekavian]=Поветарац тамни diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake index fbc828fc7..4e90cb7ce 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake @@ -25,7 +25,7 @@ Name[pl]=Jasna Bryza Name[pt]=Brisa Clara Name[pt_BR]=Breeze Light Name[ru]=Breeze, светлый вариант -Name[sk]=Vánok svetlý +Name[sk]=Vánok Svetlý Name[sl]=Sapica (svetla) Name[sr]=Поветарац лаки Name[sr@ijekavian]=Поветарац лаки