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 c3cafe4329
commit 10061e1cec
  1. 1
      kdecoration/config/breezedecorationconfig.desktop
  2. 1
      kstyle/config/breezestyleconfig.desktop

@ -13,6 +13,7 @@ Name=Breeze Window Decoration
Name[ca]=Decoració de les finestres Brisa
Name[ca@valencia]=Decoració de les finestres Brisa
Name[cs]=Dekorace oken Breeze
Name[da]=Breeze vinduesdekoration
Name[el]=Διακοσμήσεις παραθύρου Breeze
Name[es]=Decoración de ventanas Brisa
Name[eu]=Breeze leihoen apaindura

@ -13,6 +13,7 @@ Name=Breeze Widget Style
Name[ca]=Estil dels estris Brisa
Name[ca@valencia]=Estil dels estris Brisa
Name[cs]=Styl widgetů Breeze
Name[da]=Breeze kontrolstil
Name[el]=Στιλ γραφικών συστατικών Breeze
Name[es]=Estilo de elementos gráficos Brisa
Name[eu]=Breeze trepeten estiloa

Loading…
Cancel
Save