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 9 years ago
parent 6438443050
commit 47702686af
  1. 2
      kdecoration/breeze.json

@ -12,6 +12,7 @@
"Description[fi]": "Breeze-tyyliä käyttävä ikkunan kehys Plasma-työpöydälle",
"Description[fr]": "Décorations de fenêtres utilisant le style visuel Brise pour le bureau Plasma",
"Description[gl]": "Decoración de xanelas que usa o estilo visual Breeze para o escritorio Plasma.",
"Description[ia]": "Decoration de fenestra usante le stylo visual Breeze (Brisa) per le scriptorio de Plasma",
"Description[it]": "Decorazione per finestre che usa lo stile visuale di Brezza per il desktop Plasma",
"Description[ko]": "Plasma 데스크톱의 Breeze 시각 스타일을 사용하는 창 장식",
"Description[nl]": "Vensterdecoratie met gebruik van de visuele stijl Breeze voor het Plasma bureaublad",
@ -38,6 +39,7 @@
"Name[ca]": "Brisa",
"Name[es]": "Brisa",
"Name[fr]": "Brise",
"Name[ia]": "Brisa (Breeze)",
"Name[it]": "Brezza",
"Name[pl]": "Bryza",
"Name[pt]": "Brisa",

Loading…
Cancel
Save