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.17
l10n daemon script 7 years ago
parent 6e141c18c1
commit 7007a0d87d
  1. 2
      colors/BreezeDark.colors
  2. 2
      colors/BreezeLight.colors
  3. 4
      cursors/Breeze_Snow/Breeze_Snow/index.theme
  4. 4
      cursors/Breeze_Snow/src/index.theme
  5. 4
      lookandfeel.dark/metadata.desktop

@ -123,7 +123,7 @@ Name[gl]=Breeze escuro
Name[he]=Breeze Dark
Name[hu]=Breeze Dark
Name[ia]=Brisa obscure
Name[id]=Breeze Dark
Name[id]=Breeze Gelap
Name[it]=Brezza scuro
Name[ko]=어두운 Breeze
Name[lt]=Breeze tamsi

@ -116,7 +116,7 @@ Name[eu]=Breeze argia
Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[id]=Breeze Light
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
Name[nl]=Breeze Light

@ -11,7 +11,7 @@ Name[eu]=Breeze argia
Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[id]=Breeze Light
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
Name[nl]=Breeze Light
@ -37,7 +37,7 @@ Comment[eu]=Breeze argia, KDE VDGk egina
Comment[fi]=Breeze Light KDE VDG:ltä
Comment[fr]=Brise Light par KDE VDG
Comment[gl]=Breeze claro de KDE VDG
Comment[id]=Breeze Light oleh KDE VDG
Comment[id]=Breeze Terang oleh KDE VDG
Comment[it]=Brezza chiaro a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light
Comment[nl]=Breeze Light door de KDE VDG

@ -11,7 +11,7 @@ Name[eu]=Breeze argia
Name[fi]=Breeze Light
Name[fr]=Brise clair
Name[gl]=Breeze claro
Name[id]=Breeze Light
Name[id]=Breeze Terang
Name[it]=Brezza chiaro
Name[ko]=Breeze Light
Name[nl]=Breeze Light
@ -37,7 +37,7 @@ Comment[eu]=Breeze argia, KDE VDGk egina
Comment[fi]=Breeze Light KDE VDG:ltä
Comment[fr]=Brise Light par KDE VDG
Comment[gl]=Breeze claro de KDE VDG
Comment[id]=Breeze Light oleh KDE VDG
Comment[id]=Breeze Terang oleh KDE VDG
Comment[it]=Brezza chiaro a cura del VDG di KDE
Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light
Comment[nl]=Breeze Light door de KDE VDG

@ -10,7 +10,7 @@ Comment[eu]=Breeze iluna, KDE VDGk egina
Comment[fi]=Breeze Dark KDE VDG:ltä
Comment[fr]=Breeze sombre, par KDE VDG
Comment[gl]=Breeze escuro de KDE VDG
Comment[id]=Breeze Dark oleh KDE VDG
Comment[id]=Breeze Gelap oleh KDE VDG
Comment[it]=Brezza scuro a cura del VDG di KDE
Comment[ko]=KDE VDG에서 만든 어두운 Breeze
Comment[nl]=Breeze Dark door de KDE VDG
@ -44,7 +44,7 @@ Name[gl]=Breeze escuro
Name[he]=Breeze Dark
Name[hu]=Breeze Dark
Name[ia]=Brisa obscure
Name[id]=Breeze Dark
Name[id]=Breeze Gelap
Name[it]=Brezza scuro
Name[ko]=어두운 Breeze
Name[lt]=Breeze tamsi

Loading…
Cancel
Save