Revision 5049

Merge changes from trunk r4534:4993

* r4534 | rda | 2012-05-16 18:44:29 +0200 (Mer, 16 mai 2012) | 1 line
 - add global nav bar

* r4952 | buchan | 2012-06-15 10:54:47 +0200 (Ven, 15 jui 2012) | 2 lines
 - Fix charset in fr.po

* r4953 | buchan | 2012-06-15 11:00:19 +0200 (Ven, 15 jui 2012) | 2 lines
 - Fix charset for cs and ro as well

* r4993 | akien | 2012-06-20 14:35:40 +0200 (Mer, 20 jui 2012) | 1 line
 - Update of three pt.po files from the i18n-pt team