From 640fde21caa8ce14baf6bba7eb66bc03919e2b67 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 3 Nov 2020 06:15:27 +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 ++ wallpapers/Next/metadata.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/lookandfeel.twilight/metadata.desktop b/lookandfeel.twilight/metadata.desktop index 94c7ce0e..2026bde1 100644 --- a/lookandfeel.twilight/metadata.desktop +++ b/lookandfeel.twilight/metadata.desktop @@ -8,6 +8,7 @@ Comment[et]=Breeze videvik KDE VDG-lt Comment[eu]=Breeze ilunabarra, KDE VDGk egina Comment[fr]=Breeze gris par l'équipe de conception visuelle de KDE « VDG » Comment[it]=Brezza crepuscolo a cura del VDG di KDE +Comment[lt]=Breeze prieblanda pagal KDE VDG Comment[nl]=Breeze Twilight door de KDE VDG Comment[nn]=Breeze skumring frå KDE VDG Comment[pt]=Brisa da Madrugada da VDG do KDE @@ -24,6 +25,7 @@ Name[et]=Breeze videvik Name[eu]=Breeze ilunabarra Name[fr]=Breeze gris Name[it]=Brezza crepuscolo +Name[lt]=Breeze prieblanda Name[nl]=Breeze Twilight Name[nn]=Breeze skumring Name[pt]=Brisa da Madrugada diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 814cfa22..9fd6fd85 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -13,6 +13,7 @@ Name[eu]=Oskola Name[fr]=Interpréteur Name[it]=Shell Name[ko]=셸 +Name[lt]=Apvalkalas Name[nl]=Shell Name[nn]=Skal Name[pa]=ਸ਼ੈੱਲ