Merge branch 'maint-1.0' into maint-1.1
- maint-1.0: I18N: fix gender problem in a French translation
- Merge note: corrected one similar phrase.
Conflicts:
po/fr.po
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Tibor Simko <tibor.simko@cern.ch> | Aug 23 2014, 23:28 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
aba5932488be | Ludmila Marian/Tibor Simko | I18N: fix gender problem in a French translation | Aug 22 2014 |