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 8 years ago
parent 0db61995a6
commit 73b2d30b10
  1. 1
      kdecoration/breeze.json

@ -16,6 +16,7 @@
"Description[gl]": "Decoración de xanelas que usa o estilo visual Breeze para o escritorio Plasma.",
"Description[hu]": "A Breeze vizuális stílusát használó ablakdekoráció",
"Description[ia]": "Decoration de fenestra usante le stylo visual Breeze (Brisa) per le scriptorio de Plasma",
"Description[id]": "Dekorasi jendela menggunakan gaya visual Breeze untuk Desktop 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",

Loading…
Cancel
Save