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

@ -11,7 +11,9 @@ X-KDE-Weight=60
Name=Breeze Window Decoration
Name[ca]=Decoració de les finestres Brisa
Name[es]=Decoración de ventanas Brisa
Name[eu]=Breeze leihoen apaindura
Name[it]=Decorazione delle finestre di Brezza
Name[nl]=Breeze vensterdecoratie
Name[pt]=Decoração de Janelas Brisa
Name[sv]=Breeze fönsterdekoration

@ -11,7 +11,9 @@ X-KDE-Weight=50
Name=Breeze Widget Style
Name[ca]=Estil dels estris Brisa
Name[es]=Estilo de elementos gráficos Brisa
Name[eu]=Breeze trepeten estiloa
Name[it]=Stile degli oggetti di Brezza
Name[nl]=Breeze widgetstijl
Name[pt]=Estilo Gráfico Brisa
Name[sv]=Breeze stil för grafiska komponenter

Loading…
Cancel
Save