From 29f9449fdabf49a1ef6b762cb3bd4d994e83d6bc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Nov 2015 08:59:07 +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 | 2 +- src/desktoptheme/breeze/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop b/src/desktoptheme/breeze-dark/metadata.desktop index ca1e8157d..20c02f44f 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop +++ b/src/desktoptheme/breeze-dark/metadata.desktop @@ -20,7 +20,7 @@ Name[lt]=Breeze tamsi Name[nb]=Mørk bris Name[nds]=Breeze düüster Name[nl]=Breeze Dark -Name[nn]=Bris (mørk) +Name[nn]=Breeze mørk Name[pl]=Ciemna bryza Name[pt]=Brisa Escura Name[pt_BR]=Breeze Dark diff --git a/src/desktoptheme/breeze/metadata.desktop b/src/desktoptheme/breeze/metadata.desktop index 6abe6ad7d..66ff7c1ed 100644 --- a/src/desktoptheme/breeze/metadata.desktop +++ b/src/desktoptheme/breeze/metadata.desktop @@ -20,7 +20,7 @@ Name[lt]=Breeze Name[nb]=Bris Name[nds]=Breeze Name[nl]=Breeze -Name[nn]=Bris +Name[nn]=Breeze Name[pl]=Bryza Name[pt]=Brisa Name[pt_BR]=Breeze