Thierry Carrez a7798c2962 Fixing merge conflicts

2011-08-22 09:54:28 +02:00

..

ast.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

cs.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

da.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

de.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

en_AU.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

en_GB.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

es.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

fr.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

it.po

Launchpad automatic translations update.

2011-08-22 04:48:50 +00:00

ja.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

nova.pot

removing compute monitor

2011-08-02 10:09:58 -04:00

pt_BR.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

ru.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

tl.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

uk.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00

zh_CN.po

Launchpad automatic translations update.

2011-08-20 05:06:37 +00:00

zh_TW.po

Launchpad automatic translations update.

2011-08-03 04:44:31 +00:00