diff --git a/debian/po/bg.po b/debian/po/bg.po index b8b59ed7477..c4a52d31048 100644 --- a/debian/po/bg.po +++ b/debian/po/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/ca.po b/debian/po/ca.po index 277525e763b..d83dad535b9 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/cs.po b/debian/po/cs.po index c8d4327e19a..8b8f9f0e943 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/da.po b/debian/po/da.po index 3c1ab98b5c4..b656e329af0 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/de.po b/debian/po/de.po index db89f7ca666..3079de41243 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/el.po b/debian/po/el.po index 30ab6f392ca..a95226b6bb1 100644 --- a/debian/po/el.po +++ b/debian/po/el.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po index 64be141c7c9..4188564ceb0 100644 --- a/debian/po/en_GB.po +++ b/debian/po/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/es.po b/debian/po/es.po index af18e467d53..5025a67b192 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po index 2cac6a953a1..454fa9705eb 100644 --- a/debian/po/es_CL.po +++ b/debian/po/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po index 5e12c661bce..4e221ba2c73 100644 --- a/debian/po/es_EC.po +++ b/debian/po/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/fa.po b/debian/po/fa.po index f02901cb4c6..74c7d386521 100644 --- a/debian/po/fa.po +++ b/debian/po/fa.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/fi.po b/debian/po/fi.po index ead16bd6dff..4af4f533ddf 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/fr.po b/debian/po/fr.po index 7294520b38e..50f4bd33d56 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/gl.po b/debian/po/gl.po index 5d5861d3253..7b091419269 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/he.po b/debian/po/he.po index b6abd19c4f3..935838ebb97 100644 --- a/debian/po/he.po +++ b/debian/po/he.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/hr.po b/debian/po/hr.po index 1d64614f75a..83457705987 100644 --- a/debian/po/hr.po +++ b/debian/po/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/hu.po b/debian/po/hu.po index ec27e63c66c..9455447a512 100644 --- a/debian/po/hu.po +++ b/debian/po/hu.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/it.po b/debian/po/it.po index c0c55387657..e4e70cddcc7 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/ja.po b/debian/po/ja.po index 2b0b8ecae9d..b060104d807 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/ko.po b/debian/po/ko.po index 535f76d42ee..a080f159ee6 100644 --- a/debian/po/ko.po +++ b/debian/po/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/lv.po b/debian/po/lv.po index 4006ca8e7aa..2470ad8d487 100644 --- a/debian/po/lv.po +++ b/debian/po/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/mn.po b/debian/po/mn.po index aa80ced1387..eee8600609c 100644 --- a/debian/po/mn.po +++ b/debian/po/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/nb.po b/debian/po/nb.po index 22167473f37..488baaf8e03 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/nl.po b/debian/po/nl.po index 0139ddfd1c9..3b9fc417eba 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/pl.po b/debian/po/pl.po index efa21e2cb9e..6d9211b41a5 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/pt.po b/debian/po/pt.po index 870a10982ea..e055d3f059f 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 4ebb91a03d4..941b61931d1 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/ro.po b/debian/po/ro.po index 454d1208f17..da6babe8c10 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/ru.po b/debian/po/ru.po index a62d56135be..61b4a0b0858 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/sk.po b/debian/po/sk.po index 2e64c468c20..1702240e85a 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/sq.po b/debian/po/sq.po index 2fd401f07b8..c828018e1db 100644 --- a/debian/po/sq.po +++ b/debian/po/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/sr.po b/debian/po/sr.po index d28f2812596..4936cbe6d62 100644 --- a/debian/po/sr.po +++ b/debian/po/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:45+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/sv.po b/debian/po/sv.po index ef404a44c15..11787106bc3 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" "X-Poedit-Language: Swedish\n" #. Type: string diff --git a/debian/po/tr.po b/debian/po/tr.po index 134f48eae01..d2c89ae20f7 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/uk.po b/debian/po/uk.po index 16b418d8c4f..22b0fc04789 100644 --- a/debian/po/uk.po +++ b/debian/po/uk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/vi.po b/debian/po/vi.po index 9495f3be262..4cc7447aafc 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index ce11bdaa420..6a16c115e3d 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" #. Type: string #. Description diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po index 0594a718c6e..17230e8c04d 100644 --- a/debian/po/zh_TW.po +++ b/debian/po/zh_TW.po @@ -12,8 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" -"X-Generator: Launchpad (build 13674)\n" +"X-Launchpad-Export-Date: 2011-09-01 04:46+0000\n" +"X-Generator: Launchpad (build 13827)\n" "X-Poedit-Country: TAIWAN\n" "X-Poedit-Language: Chinese\n" "X-Poedit-SourceCharset: utf-8\n" diff --git a/openerp-server b/openerp-server index 00da3ac640a..9303ed68f73 100755 --- a/openerp-server +++ b/openerp-server @@ -30,9 +30,6 @@ GNU Public Licence. (c) 2003-TODAY, Fabien Pinckaers - OpenERP s.a. """ -#---------------------------------------------------------- -# python imports -#---------------------------------------------------------- import logging import os import signal @@ -45,139 +42,140 @@ import openerp __author__ = openerp.release.author __version__ = openerp.release.version -if os.name == 'posix': - import pwd - # We DON't log this using the standard logger, because we might mess - # with the logfile's permissions. Just do a quick exit here. - if pwd.getpwuid(os.getuid())[0] == 'root' : - sys.stderr.write("Attempted to run OpenERP server as root. This is not good, aborting.\n") +def check_root_user(): + """ Exit if the process's user is 'root' (on POSIX system).""" + if os.name == 'posix': + import pwd + if pwd.getpwuid(os.getuid())[0] == 'root' : + sys.stderr.write("Running as user 'root' is a security risk, aborting.\n") + sys.exit(1) + +def check_postgres_user(): + """ Exit if the configured database user is 'postgres'. + + This function assumes the configuration has been initialized. + """ + config = openerp.tools.config + if config['db_user'] == 'postgres': + sys.stderr.write("Using the database user 'postgres' is a security risk, aborting.") sys.exit(1) -#----------------------------------------------------------------------- -# parse the command line -#----------------------------------------------------------------------- -openerp.tools.config.parse_config(sys.argv[1:]) -config = openerp.tools.config +def report_configuration(): + """ Log the server version and some configuration values. -#---------------------------------------------------------- -# get logger -#---------------------------------------------------------- -openerp.netsvc.init_logger() -logger = logging.getLogger('server') + This function assumes the configuration has been initialized. + """ + config = openerp.tools.config + logger = logging.getLogger('server') + logger.info("OpenERP version %s", __version__) + for name, value in [('addons paths', config['addons_path']), + ('database hostname', config['db_host'] or 'localhost'), + ('database port', config['db_port'] or '5432'), + ('database user', config['db_user'])]: + logger.info("%s: %s", name, value) -logger.info("OpenERP version - %s", __version__) -for name, value in [('addons_path', config['addons_path']), - ('database hostname', config['db_host'] or 'localhost'), - ('database port', config['db_port'] or '5432'), - ('database user', config['db_user'])]: - logger.info("%s - %s", name, value) +def setup_pid_file(): + """ Create a file with the process id written in it. -# Don't allow if the connection to PostgreSQL done by postgres user -if config['db_user'] == 'postgres': - logger.error("Connecting to the database as 'postgres' user is forbidden, as it present major security issues. Shutting down.") - sys.exit(1) + This function assumes the configuration has been initialized. + """ + config = openerp.tools.config + if config['pidfile']: + fd = open(config['pidfile'], 'w') + pidtext = "%d" % (os.getpid()) + fd.write(pidtext) + fd.close() -#---------------------------------------------------------- -# init net service -#---------------------------------------------------------- -logger.info('initialising distributed objects services') +def preload_registry(dbname): + """ Preload a registry, and start the cron.""" + db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) + pool.get('ir.cron').restart(db.dbname) -#---------------------------------------------------------- -# Load and update databases if requested -#---------------------------------------------------------- +def run_test_file(dbname, test_file): + """ Preload a registry, possibly run a test file, and start the cron.""" + db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) -if not ( config["stop_after_init"] or \ - config["translate_in"] or \ - config["translate_out"] ): - openerp.osv.osv.start_object_proxy() - openerp.service.web_services.start_web_services() + cr = db.cursor() + logger = logging.getLogger('server') + logger.info('loading test file %s', test_file) + openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True) + cr.rollback() + cr.close() + +def export_translation(): + config = openerp.tools.config + dbname = config['db_name'] + logger = logging.getLogger('server') + + if config["language"]: + msg = "language %s" % (config["language"],) + else: + msg = "new language" + logger.info('writing translation file for %s to %s', msg, + config["translate_out"]) + + fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower() + buf = file(config["translate_out"], "w") + cr = openerp.pooler.get_db(dbname).cursor() + openerp.tools.trans_export(config["language"], + config["translate_modules"] or ["all"], buf, fileformat, cr) + cr.close() + buf.close() + + logger.info('translation file written successfully') + +def import_translation(): + config = openerp.tools.config + context = {'overwrite': config["overwrite_existing_translations"]} + dbname = config['db_name'] + + cr = openerp.pooler.get_db(dbname).cursor() + openerp.tools.trans_load( cr, config["translate_in"], config["language"], + context=context) + openerp.tools.trans_update_res_ids(cr) + cr.commit() + cr.close() + +def start_services(): http_server = openerp.service.http_server netrpc_server = openerp.service.netrpc_server + + # Instantiate local services (this is a legacy design). + openerp.osv.osv.start_object_proxy() + # Export (for RPC) services. + openerp.service.web_services.start_web_services() + + # Initialize the HTTP stack. http_server.init_servers() http_server.init_xmlrpc() http_server.init_static_http() netrpc_server.init_servers() -if config['db_name']: - for dbname in config['db_name'].split(','): - db, pool = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False) - cr = db.cursor() + # Start the main cron thread. + openerp.netsvc.start_agent() - if config["test_file"]: - logger.info('loading test file %s', config["test_file"]) - openerp.tools.convert_yaml_import(cr, 'base', file(config["test_file"]), {}, 'test', True) - cr.rollback() - - pool.get('ir.cron').restart(db.dbname) - - cr.close() - -#---------------------------------------------------------- -# translation stuff -#---------------------------------------------------------- -if config["translate_out"]: - if config["language"]: - msg = "language %s" % (config["language"],) - else: - msg = "new language" - logger.info('writing translation file for %s to %s', msg, config["translate_out"]) - - fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower() - buf = file(config["translate_out"], "w") - dbname = config['db_name'] - cr = openerp.pooler.get_db(dbname).cursor() - openerp.tools.trans_export(config["language"], config["translate_modules"] or ["all"], buf, fileformat, cr) - cr.close() - buf.close() - - logger.info('translation file written successfully') - sys.exit(0) - -if config["translate_in"]: - context = {'overwrite': config["overwrite_existing_translations"]} - dbname = config['db_name'] - cr = openerp.pooler.get_db(dbname).cursor() - openerp.tools.trans_load(cr, - config["translate_in"], - config["language"], - context=context) - openerp.tools.trans_update_res_ids(cr) - cr.commit() - cr.close() - sys.exit(0) - -#---------------------------------------------------------------------------------- -# if we don't want the server to continue to run after initialization, we quit here -#---------------------------------------------------------------------------------- -if config["stop_after_init"]: - sys.exit(0) - -openerp.netsvc.start_agent() - -#---------------------------------------------------------- -# Launch Servers -#---------------------------------------------------------- - -LST_SIGNALS = ['SIGINT', 'SIGTERM'] - -SIGNALS = dict( - [(getattr(signal, sign), sign) for sign in LST_SIGNALS] -) + # Start the top-level servers threads (normally HTTP, HTTPS, and NETRPC). + openerp.netsvc.Server.startAll() +# Variable keeping track of the number of calls to the signal handler defined +# below. This variable is monitored by ``quit_on_signals()``. quit_signals_received = 0 -def handler(signum, frame): - """ - :param signum: the signal number +def signal_handler(sig, frame): + """ Signal handler: exit ungracefully on the second handled signal. + + :param sig: the signal number :param frame: the interrupted stack frame or None """ global quit_signals_received quit_signals_received += 1 if quit_signals_received > 1: + # logging.shutdown was already called at this point. sys.stderr.write("Forced shutdown.\n") os._exit(0) -def dumpstacks(signum, frame): +def dumpstacks(sig, frame): + """ Signal handler: dump a stack trace for each existing thread.""" # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696 # modified for python 2.5 compatibility thread_map = dict(threading._active, **threading._limbo) @@ -191,20 +189,33 @@ def dumpstacks(signum, frame): code.append(" %s" % (line.strip())) logging.getLogger('dumpstacks').info("\n".join(code)) -for signum in SIGNALS: - signal.signal(signum, handler) +def setup_signal_handlers(): + """ Register the signal handler defined above. """ + SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split()) + map(lambda sig: signal.signal(sig, signal_handler), SIGNALS) + if os.name == 'posix': + signal.signal(signal.SIGQUIT, dumpstacks) -if os.name == 'posix': - signal.signal(signal.SIGQUIT, dumpstacks) +def quit_on_signals(): + """ Wait for one or two signals then shutdown the server. + + The first SIGINT or SIGTERM signal will initiate a graceful shutdown while + a second one if any will force an immediate exit. + + """ + # Wait for a first signal to be handled. (time.sleep will be interrupted + # by the signal handler.) + while quit_signals_received == 0: + time.sleep(60) -def quit(): openerp.netsvc.Agent.quit() openerp.netsvc.Server.quitAll() + config = openerp.tools.config if config['pidfile']: os.unlink(config['pidfile']) - logger = logging.getLogger('shutdown') - logger.info("Initiating OpenERP Server shutdown") - logger.info("Hit CTRL-C again or send a second signal to immediately terminate the server...") + logger = logging.getLogger('server') + logger.info("Initiating shutdown") + logger.info("Hit CTRL-C again or send a second signal to force the shutdown.") logging.shutdown() # manually join() all threads before calling sys.exit() to allow a second signal @@ -219,19 +230,45 @@ def quit(): time.sleep(0.05) sys.exit(0) -if config['pidfile']: - fd = open(config['pidfile'], 'w') - pidtext = "%d" % (os.getpid()) - fd.write(pidtext) - fd.close() +if __name__ == "__main__": -openerp.netsvc.Server.startAll() + check_root_user() + openerp.tools.config.parse_config(sys.argv[1:]) + check_postgres_user() + openerp.netsvc.init_logger() + report_configuration() -logger.info('OpenERP server is running, waiting for connections...') + config = openerp.tools.config -while quit_signals_received == 0: - time.sleep(60) + setup_signal_handlers() -quit() + if config["test_file"]: + run_test_file(config['db_name'], config['test_file']) + sys.exit(0) + + if config["translate_out"]: + export_translation() + sys.exit(0) + + if config["translate_in"]: + import_translation() + sys.exit(0) + + if not config["stop_after_init"]: + # Some module register themselves when they are loaded so we need the + # services to be running before loading any registry. + start_services() + + if config['db_name']: + for dbname in config['db_name'].split(','): + preload_registry(dbname) + + if config["stop_after_init"]: + sys.exit(0) + + setup_pid_file() + logger = logging.getLogger('server') + logger.info('OpenERP server is running, waiting for connections...') + quit_on_signals() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py index 574ade21c6d..7e5714a9375 100644 --- a/openerp/addons/base/__openerp__.py +++ b/openerp/addons/base/__openerp__.py @@ -59,18 +59,18 @@ 'res/res_request_view.xml', 'res/res_lang_view.xml', 'res/res_log_view.xml', - 'res/partner/partner_report.xml', - 'res/partner/partner_view.xml', - 'res/partner/partner_shortcut_data.xml', - 'res/partner/bank_view.xml', - 'res/country_view.xml', + 'res/res_partner_report.xml', + 'res/res_partner_view.xml', + 'res/res_partner_shortcut_data.xml', + 'res/res_bank_view.xml', + 'res/res_country_view.xml', 'res/res_currency_view.xml', - 'res/partner/crm_view.xml', - 'res/partner/wizard/partner_sms_send_view.xml', - 'res/partner/wizard/partner_wizard_spam_view.xml', - 'res/partner/wizard/partner_clear_ids_view.xml', - 'res/partner/wizard/partner_wizard_ean_check_view.xml', - 'res/partner/partner_data.xml', + 'res/res_partner_event_view.xml', + 'res/wizard/partner_sms_send_view.xml', + 'res/wizard/partner_wizard_massmail_view.xml', + 'res/wizard/partner_clear_ids_view.xml', + 'res/wizard/partner_wizard_ean_check_view.xml', + 'res/res_partner_data.xml', 'res/ir_property_view.xml', 'security/base_security.xml', 'publisher_warranty/publisher_warranty_view.xml', @@ -81,8 +81,7 @@ ], 'demo_xml': [ 'base_demo.xml', - 'res/partner/partner_demo.xml', - 'res/partner/crm_demo.xml', + 'res/res_partner_demo.xml', 'res/res_widget_demo.xml', ], 'test': [ diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index b5dab5a38b3..febc7ff82aa 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -1608,7 +1608,14 @@ 691.3153 - + + + + localhost + localhost + + + MUR diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index 6f4dbf6a1f9..b87c0ef4382 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -111,7 +111,8 @@ - + + @@ -224,16 +225,18 @@ - - - - - + + + + + + - + +