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

@ -16,6 +16,7 @@ Name[cs]=Dekorace oken Breeze
Name[da]=Breeze vinduesdekoration Name[da]=Breeze vinduesdekoration
Name[de]=Breeze-Fensterdekoration Name[de]=Breeze-Fensterdekoration
Name[el]=Διακοσμήσεις παραθύρου Breeze Name[el]=Διακοσμήσεις παραθύρου Breeze
Name[en_GB]=Breeze Window Decoration
Name[es]=Decoración de ventanas Brisa Name[es]=Decoración de ventanas Brisa
Name[eu]=Breeze leihoen apaindura Name[eu]=Breeze leihoen apaindura
Name[fr]=Décoration de fenêtre Brise Name[fr]=Décoration de fenêtre Brise

@ -16,6 +16,7 @@ Name[cs]=Styl widgetů Breeze
Name[da]=Breeze kontrolstil Name[da]=Breeze kontrolstil
Name[de]=Breeze-Stil der Bedienelemente Name[de]=Breeze-Stil der Bedienelemente
Name[el]=Στιλ γραφικών συστατικών Breeze Name[el]=Στιλ γραφικών συστατικών Breeze
Name[en_GB]=Breeze Widget Style
Name[es]=Estilo de elementos gráficos Brisa Name[es]=Estilo de elementos gráficos Brisa
Name[eu]=Breeze trepeten estiloa Name[eu]=Breeze trepeten estiloa
Name[fr]=Style de composant graphique Brise Name[fr]=Style de composant graphique Brise

Loading…
Cancel
Save