[Warzone2100-commits] [Warzone2100/warzone2100] dd9a75: French translation update by machintruc/cpasmoi.

2013-11-07 Thread automerge
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: dd9a750e13bf0703aedd20384f40376845e25c72
  
https://github.com/Warzone2100/warzone2100/commit/dd9a750e13bf0703aedd20384f40376845e25c72
  Author: cybersphinx chr@gmx.net
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by machintruc/cpasmoi.


  Commit: 7e24f1f5f396601d44d7bc315a2e270d3a713d6c
  
https://github.com/Warzone2100/warzone2100/commit/7e24f1f5f396601d44d7bc315a2e270d3a713d6c
  Author: cybersphinx chr@gmx.net
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
M icons/warzone2100.desktop
M po/POTFILES.in
M po/custom/mac-infoplist.txt

  Log Message:
  ---
  Update POTFILES.in and custom translations.


  Commit: 0f7a152599cb2a27d7826fe92b74005eca06453b
  
https://github.com/Warzone2100/warzone2100/commit/0f7a152599cb2a27d7826fe92b74005eca06453b
  Author: cybersphinx chr@gmx.net
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po

  Log Message:
  ---
  Update translations.


  Commit: 83cd123e74c079b1b9d5d1337363261eb161e243
  
https://github.com/Warzone2100/warzone2100/commit/83cd123e74c079b1b9d5d1337363261eb161e243
  Author: per p...@wz2100.net
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
M src/mission.cpp

  Log Message:
  ---
  Fix possible crash in campaign when returning home to factory that does not 
exist. Discovered by Coverity scanner.


  Commit: 8b058539e70d5ce47a2c6b21b3e0acd187ab8b2b
  
https://github.com/Warzone2100/warzone2100/commit/8b058539e70d5ce47a2c6b21b3e0acd187ab8b2b
  Author: automerge c...@wz2100.net
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
M icons/warzone2100.desktop
M po/POTFILES.in
M po/ca_ES.po
M po/cs.po
M po/custom/mac-infoplist.txt
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
M src/mission.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: 
https://github.com/Warzone2100/warzone2100/compare/dda1585f9519...8b058539e70d
--
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] dd9a75: French translation update by machintruc/cpasmoi.

2013-11-07 Thread automerge
  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: dd9a750e13bf0703aedd20384f40376845e25c72
  
https://github.com/Warzone2100/warzone2100/commit/dd9a750e13bf0703aedd20384f40376845e25c72
  Author: cybersphinx chr@gmx.net
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  French translation update by machintruc/cpasmoi.


  Commit: 7e24f1f5f396601d44d7bc315a2e270d3a713d6c
  
https://github.com/Warzone2100/warzone2100/commit/7e24f1f5f396601d44d7bc315a2e270d3a713d6c
  Author: cybersphinx chr@gmx.net
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
M icons/warzone2100.desktop
M po/POTFILES.in
M po/custom/mac-infoplist.txt

  Log Message:
  ---
  Update POTFILES.in and custom translations.


  Commit: 0f7a152599cb2a27d7826fe92b74005eca06453b
  
https://github.com/Warzone2100/warzone2100/commit/0f7a152599cb2a27d7826fe92b74005eca06453b
  Author: cybersphinx chr@gmx.net
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po

  Log Message:
  ---
  Update translations.


  Commit: 83cd123e74c079b1b9d5d1337363261eb161e243
  
https://github.com/Warzone2100/warzone2100/commit/83cd123e74c079b1b9d5d1337363261eb161e243
  Author: per p...@wz2100.net
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
M src/mission.cpp

  Log Message:
  ---
  Fix possible crash in campaign when returning home to factory that does not 
exist. Discovered by Coverity scanner.


  Commit: 4be4b01140efd9367a6ad7726b8e1447e909d602
  
https://github.com/Warzone2100/warzone2100/commit/4be4b01140efd9367a6ad7726b8e1447e909d602
  Author: automerge c...@wz2100.net
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
M icons/warzone2100.desktop
M po/POTFILES.in
M po/ca_ES.po
M po/cs.po
M po/custom/mac-infoplist.txt
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
M src/mission.cpp

  Log Message:
  ---
  Merge branch 'bugfixes' into 3.1


Compare: 
https://github.com/Warzone2100/warzone2100/compare/6d63bdbfffab...4be4b01140ef
--
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231iu=/4140/ostg.clktrk___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits