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 9e7e25d465
commit 640fde21ca
  1. 2
      lookandfeel.twilight/metadata.desktop
  2. 1
      wallpapers/Next/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

@ -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]=ਸ਼

Loading…
Cancel
Save