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"
wilder-5.24
l10n daemon script 5 years ago
parent 8f7e7168d1
commit 7b2ced67aa
  1. 2
      lookandfeel.twilight/metadata.desktop
  2. 1
      wallpapers/Next/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

@ -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

Loading…
Cancel
Save