On Monday, 25 February 2013 at 8:10, [email protected] wrote: > Auto-merging po/zh_TW.po > CONFLICT (content): Merge conflict in po/zh_TW.po > Auto-merging po/zh_CN.po > CONFLICT (content): Merge conflict in po/zh_CN.po > Auto-merging po/uk_UA.po > CONFLICT (content): Merge conflict in po/uk_UA.po > Auto-merging po/tr.po > CONFLICT (content): Merge conflict in po/tr.po > Auto-merging po/sl.po > CONFLICT (content): Merge conflict in po/sl.po > Auto-merging po/sk.po > CONFLICT (content): Merge conflict in po/sk.po > Auto-merging po/ru.po > CONFLICT (content): Merge conflict in po/ru.po > Auto-merging po/ro.po > CONFLICT (content): Merge conflict in po/ro.po > Auto-merging po/pt_BR.po > CONFLICT (content): Merge conflict in po/pt_BR.po > Auto-merging po/pt.po > CONFLICT (content): Merge conflict in po/pt.po > Auto-merging po/pl.po > CONFLICT (content): Merge conflict in po/pl.po > Auto-merging po/nl.po > CONFLICT (content): Merge conflict in po/nl.po > Auto-merging po/nb.po > CONFLICT (content): Merge conflict in po/nb.po > Auto-merging po/lt.po > CONFLICT (content): Merge conflict in po/lt.po > Auto-merging po/la.po > CONFLICT (content): Merge conflict in po/la.po > Auto-merging po/ko.po > CONFLICT (content): Merge conflict in po/ko.po > Auto-merging po/it.po > CONFLICT (content): Merge conflict in po/it.po > Auto-merging po/hu.po > CONFLICT (content): Merge conflict in po/hu.po > Auto-merging po/hr.po > CONFLICT (content): Merge conflict in po/hr.po > Auto-merging po/ga.po > CONFLICT (content): Merge conflict in po/ga.po > Auto-merging po/fy.po > CONFLICT (content): Merge conflict in po/fy.po > Auto-merging po/fr.po > CONFLICT (content): Merge conflict in po/fr.po > Auto-merging po/fi.po > CONFLICT (content): Merge conflict in po/fi.po > Auto-merging po/et_EE.po > CONFLICT (content): Merge conflict in po/et_EE.po > Auto-merging po/es.po > CONFLICT (content): Merge conflict in po/es.po > Auto-merging po/en_GB.po > CONFLICT (content): Merge conflict in po/en_GB.po > Auto-merging po/el.po > CONFLICT (content): Merge conflict in po/el.po > Auto-merging po/de.po > CONFLICT (content): Merge conflict in po/de.po > Auto-merging po/da.po > CONFLICT (content): Merge conflict in po/da.po > Auto-merging po/cs.po > CONFLICT (content): Merge conflict in po/cs.po > Auto-merging po/ca_ES.po > CONFLICT (content): Merge conflict in po/ca_ES.po > Automatic merge failed; fix conflicts and then commit the result.
That's the reason why I always reverted the translation update after a release. And it also seems nobody reverted/updated the version numbers after 3.1.0, so all 3.1 branch builds since then claim to be 3.1.0... ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb _______________________________________________ Warzone2100-project mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/warzone2100-project
