From 7b2ced67aa82edac25a49b45e45065053c75c56c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 May 2021 01:32:42 +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" --- 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 38d3d9ad..48f1d0fd 100644 --- a/lookandfeel.twilight/metadata.desktop +++ b/lookandfeel.twilight/metadata.desktop @@ -16,6 +16,7 @@ Comment[hu]=Breeze Twilight a KDE VDG-től Comment[ia]=Brisa Crepusculo (Breeze Twilight) per KDE VDG Comment[it]=Brezza crepuscolo a cura del VDG di KDE Comment[ja]=KDE VDG による Breeze トワイライト +Comment[ko]=KDE 시각 디자인 그룹에서 제작한 새벽의 Breeze Comment[lt]=Breeze prieblanda pagal KDE VDG Comment[nl]=Breeze Twilight door de KDE VDG Comment[nn]=Breeze skumring frå KDE VDG @@ -47,6 +48,7 @@ Name[hu]=Breeze Twilight Name[ia]=Brisa Crepusculo (Breeze Twilight) Name[it]=Brezza crepuscolo Name[ja]=Breeze トワイライト +Name[ko]=새벽의 Breeze Name[lt]=Breeze prieblanda Name[nl]=Breeze Twilight Name[nn]=Breeze skumring diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 6d183f53..9d5fb815 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -14,6 +14,7 @@ Name[hu]=Tejút Name[ia]=Milky Way (Via Lactee) Name[it]=Via Lattea Name[ja]=ミルキーウェイ +Name[ko]=은하수 Name[nl]=Melkweg Name[nn]=Mjølkevegen Name[pl]=Droga Mleczna