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 f838b06bda
commit ce72de243a
  1. 1
      colors/BreezeHighContrast.colors
  2. 1
      colors/BreezeLight.colors
  3. 1
      cursors/Breeze/Breeze/index.theme
  4. 1
      cursors/Breeze/src/index.theme
  5. 2
      cursors/Breeze_Snow/Breeze_Snow/index.theme
  6. 2
      cursors/Breeze_Snow/src/index.theme
  7. 1
      lookandfeel.dark/metadata.desktop

@ -109,6 +109,7 @@ Name[ca]=Brisa de contrast alt
Name[ca@valencia]=Brisa de contrast alt
Name[cs]=Breeze - Vysoký kontrast
Name[de]=Breeze Hoher Kontrast
Name[en_GB]=Breeze High Contrast
Name[es]=Brisa de alto contraste
Name[fi]=Suurikontrastinen Breeze
Name[fr]=Breeze contraste élevé

@ -109,6 +109,7 @@ Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[cs]=Breeze Světlé
Name[de]=Breeze Hell
Name[en_GB]=Breeze Light
Name[es]=Brisa claro
Name[fi]=Breeze Light
Name[fr]=Breeze clair

@ -47,6 +47,7 @@ Comment=Breeze by the KDE VDG
Comment[ca]=Brisa pel VDG del KDE
Comment[ca@valencia]=Brisa pel VDG del KDE
Comment[de]=Breeze von der KDE VDG
Comment[en_GB]=Breeze by the KDE VDG
Comment[es]=Brisa por KDE VDG
Comment[fi]=Breeze KDE VDG:ltä
Comment[fr]=Breeze par KDE VDG

@ -47,6 +47,7 @@ Comment=Breeze by the KDE VDG
Comment[ca]=Brisa pel VDG del KDE
Comment[ca@valencia]=Brisa pel VDG del KDE
Comment[de]=Breeze von der KDE VDG
Comment[en_GB]=Breeze by the KDE VDG
Comment[es]=Brisa por KDE VDG
Comment[fi]=Breeze KDE VDG:ltä
Comment[fr]=Breeze par KDE VDG

@ -4,6 +4,7 @@ Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[cs]=Breeze Světlé
Name[de]=Breeze Hell
Name[en_GB]=Breeze Light
Name[es]=Brisa claro
Name[fi]=Breeze Light
Name[fr]=Breeze clair
@ -26,6 +27,7 @@ Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara pel VDG del KDE
Comment[ca@valencia]=Brisa clara pel VDG del KDE
Comment[de]=Breeze-Hell von der KDE VDG
Comment[en_GB]=Breeze Light by the KDE VDG
Comment[es]=Brisa claro por KDE VDG
Comment[fi]=Breeze Light KDE VDG:ltä
Comment[fr]=Breeze Light par KDE VDG

@ -4,6 +4,7 @@ Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[cs]=Breeze Světlé
Name[de]=Breeze Hell
Name[en_GB]=Breeze Light
Name[es]=Brisa claro
Name[fi]=Breeze Light
Name[fr]=Breeze clair
@ -26,6 +27,7 @@ Comment=Breeze Light by the KDE VDG
Comment[ca]=Brisa clara pel VDG del KDE
Comment[ca@valencia]=Brisa clara pel VDG del KDE
Comment[de]=Breeze-Hell von der KDE VDG
Comment[en_GB]=Breeze Light by the KDE VDG
Comment[es]=Brisa claro por KDE VDG
Comment[fi]=Breeze Light KDE VDG:ltä
Comment[fr]=Breeze Light par KDE VDG

@ -3,6 +3,7 @@ Comment=Breeze Dark by the KDE VDG
Comment[ca]=Brisa fosca pel VDG del KDE
Comment[ca@valencia]=Brisa fosca pel VDG del KDE
Comment[de]=Breeze-Dunkel von der KDE VDG
Comment[en_GB]=Breeze Dark by the KDE VDG
Comment[es]=Brisa oscuro por KDE VDG
Comment[fi]=Breeze Dark KDE VDG:ltä
Comment[fr]=Breeze sombre, par KDE VDG

Loading…
Cancel
Save