Homec4science

Merge branch 'maint-1.1'

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 25 2013, 13:48.

Description

Merge branch 'maint-1.1'

  • maint-1.1: I18N: updates to Catalan and Spanish translations
  • Merge note: the PO files were msgmerged from maint-1.1.

Conflicts:
po/ca.po
po/es.po

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:9798a735fd92: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 25 2013, 13:52

Merged Changes

CommitAuthorDetailsCommitted
578b148dccefFerran Jorba/Tibor Simko
I18N: updates to Catalan and Spanish translations 
Feb 25 2013