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-pre-rebase
l10n daemon script 10 years ago
parent 82cda41a37
commit 78ee981609
  1. 2
      kdecoration/breeze.json

@ -11,6 +11,7 @@
"Description[et]": "Plasma töölaua akende dekoratsioon Breeze'i visuaalse stiiliga",
"Description[fi]": "Breeze-tyyliä käyttävä ikkunan kehys Plasma-työpöydälle",
"Description[gl]": "Decoración de xanelas que usa o estilo visual Breeze para o escritorio Plasma.",
"Description[it]": "Decorazione per finestre che usa lo stile visuale di Brezza per il desktop Plasma",
"Description[nl]": "Vensterdecoratie met gebruik van de visuele stijl Breeze voor het Plasma bureaublad",
"Description[nn]": "Vindaugspynt som brukar Breeze-stilen for Plasma-skrivebordet",
"Description[pl]": "Wystrój okien przy użyciu stylu wizualnego Bryzy dla Pulpitu Plazmy",
@ -34,6 +35,7 @@
"Name[ca@valencia]": "Brisa",
"Name[ca]": "Brisa",
"Name[es]": "Brisa",
"Name[it]": "Brezza",
"Name[pl]": "Bryza",
"Name[pt]": "Brisa",
"Name[sk]": "Vánok",

Loading…
Cancel
Save