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 b320bd390b
commit b54d21e46c
  1. 1
      kdecoration/config/breezedecorationconfig.desktop
  2. 1
      kstyle/config/breezestyleconfig.desktop

@ -22,6 +22,7 @@ Name[eu]=Breeze leihoen apaindura
Name[fr]=Décoration de fenêtre Brise
Name[ia]=Decoration de fenestra Breeze
Name[it]=Decorazione delle finestre di Brezza
Name[ko]=Breeze 창 장식
Name[nl]=Breeze vensterdecoratie
Name[pl]=Wygląd okien Bryzy
Name[pt]=Decoração de Janelas Brisa

@ -22,6 +22,7 @@ Name[eu]=Breeze trepeten estiloa
Name[fr]=Style de composant graphique Brise
Name[ia]=Stilo de Elemento Graphic de Fenestra (Widget) de Breeze
Name[it]=Stile degli oggetti di Brezza
Name[ko]=Breeze 위젯 스타일
Name[nl]=Breeze widgetstijl
Name[pl]=Wygląd interfejsu Bryzy
Name[pt]=Estilo Gráfico Brisa

Loading…
Cancel
Save