From 88384d75f821285568d61626092ab71130c930c9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Oct 2020 06:40:28 +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" --- lookandfeel.twilight/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lookandfeel.twilight/metadata.desktop b/lookandfeel.twilight/metadata.desktop index be5d2e85..a76274ad 100644 --- a/lookandfeel.twilight/metadata.desktop +++ b/lookandfeel.twilight/metadata.desktop @@ -7,6 +7,7 @@ Comment[es]=Brisa crepúsculo por KDE VDG Comment[et]=Breeze videvik KDE VDG-lt Comment[it]=Brezza crepuscolo a cura del VDG di KDE Comment[nl]=Breeze Twilight door de KDE VDG +Comment[nn]=Breeze skumring frå KDE VDG Comment[pt]=Brisa da Madrugada da VDG do KDE Comment[sl]=Sapica ob mraku s strani KDE VDG Comment[sv]=Breeze skymning av KDE:s visuella designgrupp @@ -20,6 +21,7 @@ Name[es]=Brisa crepúsculo Name[et]=Breeze videvik Name[it]=Brezza crepuscolo Name[nl]=Breeze Twilight +Name[nn]=Breeze skumring Name[pt]=Brisa da Madrugada Name[sl]=Sapica ob mraku Name[sv]=Breeze skymning