[Fusionforge-commits] r15613 - in trunk: . src/common/include src/common/widget src/deb-specific src/debian src/debian/dsf-helper src/debian/dsf-in src/debian/dsf-po src/plugins/authopenid/bin src/plugins/contribtracker/bin src/plugins/externalsearch/bin src/plugins/extratabs/bin src/plugins/extsubproj/bin src/plugins/forumml/bin src/plugins/globaldashboard/bin src/plugins/globalsearch/bin src/plugins/helloworld/bin src/plugins/hudson/bin src/plugins/mailman/bin src/plugins/mantisbt/bin src/plugins/mediawiki/bin src/plugins/oauthprovider/bin src/plugins/projectimport src/plugins/projectlabels/bin src/plugins/projects-hierarchy/bin src/plugins/scmcvs src/plugins/scmdarcs/bin src/plugins/scmgit/bin src/plugins/scmsvn src/plugins/soapadmin/bin src/plugins/wiki/www src/utils src/www/tabber

Roland Mas lolando at fusionforge.org
Wed May 30 14:44:55 CEST 2012


Author: lolando
Date: 2012-05-30 14:44:54 +0200 (Wed, 30 May 2012)
New Revision: 15613

Added:
   trunk/src/debian/dsf-in/common.config
   trunk/src/debian/dsf-in/common.templates
   trunk/src/debian/dsf-in/db-postgresql.config
   trunk/src/debian/dsf-in/db-postgresql.postinst
   trunk/src/debian/dsf-in/db-postgresql.templates
   trunk/src/debian/dsf-in/dns-bind9.templates
   trunk/src/debian/dsf-in/mta-exim4.config
   trunk/src/debian/dsf-in/web-apache2-vhosts.postinst
   trunk/src/debian/dsf-in/web-apache2-vhosts.postrm
   trunk/src/debian/dsf-in/web-apache2.postinst
Removed:
   trunk/src/deb-specific/fusionforge-config
   trunk/src/debian/dsf-helper/common-variables.config
   trunk/src/debian/dsf-helper/common-variables.templates
   trunk/src/debian/dsf-helper/create-random-pw.config
   trunk/src/debian/dsf-helper/dbhost-variables.config
   trunk/src/debian/dsf-helper/dbhost-variables.templates
   trunk/src/debian/dsf-helper/dbpasswd-variables.config
   trunk/src/debian/dsf-helper/dbpasswd-variables.templates
   trunk/src/debian/dsf-helper/downloadhost-variables.config
   trunk/src/debian/dsf-helper/downloadhost-variables.templates
   trunk/src/debian/dsf-helper/ftpuploadhost-variables.config
   trunk/src/debian/dsf-helper/ftpuploadhost-variables.templates
   trunk/src/debian/dsf-helper/get-pw-from-debconf.config
   trunk/src/debian/dsf-helper/groupid-variables.config
   trunk/src/debian/dsf-helper/groupid-variables.templates
   trunk/src/debian/dsf-helper/handle-mainconffile.config
   trunk/src/debian/dsf-helper/handle-mainconffile.postinst
   trunk/src/debian/dsf-helper/handle-mainconffile.postrm
   trunk/src/debian/dsf-helper/host-variables.config
   trunk/src/debian/dsf-helper/host-variables.templates
   trunk/src/debian/dsf-helper/jabberhost-variables.config
   trunk/src/debian/dsf-helper/jabberhost-variables.templates
   trunk/src/debian/dsf-helper/lists-variables.config
   trunk/src/debian/dsf-helper/lists-variables.templates
   trunk/src/debian/dsf-helper/shellhost-variables.config
   trunk/src/debian/dsf-helper/shellhost-variables.templates
   trunk/src/debian/dsf-helper/ucf-choices.templates
   trunk/src/debian/dsf-helper/uploadhost-variables.config
   trunk/src/debian/dsf-helper/uploadhost-variables.templates
   trunk/src/debian/dsf-helper/users-variables.config
   trunk/src/debian/dsf-helper/users-variables.templates
   trunk/src/debian/dsf-helper/web-variables.config
   trunk/src/debian/dsf-helper/web-variables.templates
   trunk/src/debian/dsf-in/common.config.dsfh-in
   trunk/src/debian/dsf-in/common.templates.dsfh-in
   trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in
   trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
   trunk/src/debian/dsf-in/db-postgresql.templates.dsfh-in
   trunk/src/debian/dsf-in/dns-bind9.config.dsfh-in
   trunk/src/debian/dsf-in/dns-bind9.templates.dsfh-in
   trunk/src/debian/dsf-in/mta-exim4.config.dsfh-in
   trunk/src/debian/dsf-in/mta-exim4.templates.dsfh-in
   trunk/src/debian/dsf-in/mta-postfix.config.dsfh-in
   trunk/src/debian/dsf-in/mta-postfix.templates.dsfh-in
   trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in
   trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in
   trunk/src/debian/dsf-in/web-apache2.config.dsfh-in
   trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in
   trunk/src/debian/dsf-in/web-apache2.templates.dsfh-in
Modified:
   trunk/
   trunk/src/common/include/config-vars.php
   trunk/src/common/widget/WidgetLayout.class.php
   trunk/src/deb-specific/db-convert-to-unicode.pl
   trunk/src/deb-specific/gforge-inject.pl
   trunk/src/deb-specific/old-db-upgrade.pl
   trunk/src/debian/README.Debian.tmpl
   trunk/src/debian/changelog
   trunk/src/debian/dsf-in/common.manpages
   trunk/src/debian/dsf-in/common.postinst
   trunk/src/debian/dsf-po/POTFILES.in
   trunk/src/debian/dsf-po/cs.po
   trunk/src/debian/dsf-po/de.po
   trunk/src/debian/dsf-po/es.po
   trunk/src/debian/dsf-po/fi.po
   trunk/src/debian/dsf-po/fr.po
   trunk/src/debian/dsf-po/gl.po
   trunk/src/debian/dsf-po/nl.po
   trunk/src/debian/dsf-po/pt.po
   trunk/src/debian/dsf-po/ru.po
   trunk/src/debian/dsf-po/sv.po
   trunk/src/debian/dsf-po/templates.pot
   trunk/src/debian/dsf-po/vi.po
   trunk/src/debian/rules
   trunk/src/plugins/authopenid/bin/db-delete.pl
   trunk/src/plugins/authopenid/bin/db-upgrade.pl
   trunk/src/plugins/contribtracker/bin/db-delete.pl
   trunk/src/plugins/contribtracker/bin/db-upgrade.pl
   trunk/src/plugins/externalsearch/bin/db-delete.pl
   trunk/src/plugins/externalsearch/bin/db-upgrade.pl
   trunk/src/plugins/extratabs/bin/db-delete.pl
   trunk/src/plugins/extratabs/bin/db-upgrade.pl
   trunk/src/plugins/extsubproj/bin/db-delete.pl
   trunk/src/plugins/extsubproj/bin/db-upgrade.pl
   trunk/src/plugins/forumml/bin/db-upgrade.pl
   trunk/src/plugins/globaldashboard/bin/db-delete.pl
   trunk/src/plugins/globaldashboard/bin/db-upgrade.pl
   trunk/src/plugins/globalsearch/bin/db-delete.pl
   trunk/src/plugins/globalsearch/bin/db-upgrade.pl
   trunk/src/plugins/helloworld/bin/db-delete.pl
   trunk/src/plugins/helloworld/bin/db-upgrade.pl
   trunk/src/plugins/hudson/bin/db-delete.pl
   trunk/src/plugins/hudson/bin/db-upgrade.pl
   trunk/src/plugins/mailman/bin/db-delete.pl
   trunk/src/plugins/mailman/bin/db-upgrade.pl
   trunk/src/plugins/mantisbt/bin/db-delete.pl
   trunk/src/plugins/mantisbt/bin/db-upgrade.pl
   trunk/src/plugins/mediawiki/bin/db-delete.pl
   trunk/src/plugins/mediawiki/bin/db-upgrade.pl
   trunk/src/plugins/oauthprovider/bin/db-delete.pl
   trunk/src/plugins/oauthprovider/bin/db-upgrade.pl
   trunk/src/plugins/projectimport/INSTALL
   trunk/src/plugins/projectlabels/bin/db-delete.pl
   trunk/src/plugins/projectlabels/bin/db-upgrade.pl
   trunk/src/plugins/projects-hierarchy/bin/db-delete.pl
   trunk/src/plugins/projects-hierarchy/bin/db-upgrade.pl
   trunk/src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
   trunk/src/plugins/scmdarcs/bin/db-delete.pl
   trunk/src/plugins/scmdarcs/bin/db-upgrade.pl
   trunk/src/plugins/scmgit/bin/db-delete.pl
   trunk/src/plugins/scmgit/bin/db-upgrade.pl
   trunk/src/plugins/scmsvn/fusionforge-plugin-scmsvn.spec
   trunk/src/plugins/soapadmin/bin/db-delete.pl
   trunk/src/plugins/soapadmin/bin/db-upgrade.pl
   trunk/src/plugins/wiki/www/g
   trunk/src/utils/include.pl
   trunk/src/www/tabber/example-ajax.html
   trunk/src/www/tabber/example-cookies.html
   trunk/src/www/tabber/example2.html
Log:
Merged from 5.2: removed fusionforge.conf file and related code


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/tracker_attachement_move_in_fs:14977-14978
/branches/tests:15589
/trunk:8721-8727
/shelves/aljeux:15005,15012,15150,15154-15160,15177-15179,15203,15232,15276-15277,15306
/branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/shelves/alain_peyrat:14997-15003
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8662,8674,8751,8754,8756,8760-8761,8812,8850,8945,8995,8998,9004-9006,9124,9137,9141,9317,9443,9469,9670,9701,9726,9934,10013,10310,10314,10366,12790,13085
/branches/Branch_5_2:15217,15219,15221,15224,15227-15229,15234,15239,15279,15286,15325,15328-15329,15331,15347-15348,15352,15356,15359,15362,15364-15365,15370,15374,15381,15383,15386,15389,15392,15398,15400-15401,15404-15405,15407-15411,15495,15497,15500,15503-15505,15531,15533-15536,15538,15544,15546,15549,15557-15558,15568,15571,15573-15581,15583-15585,15586,15588,15595
/branches/Branch_5_1:11607-11609,11621,11625,11627,11631,11638,11644,11647-11651,11677,11680-11681,11683-11684,11719-11720,11724,11754,11780,11783,11792,11794,11802,11808-11816,11818,11822-11824,11827-11829,11834-11835,11847,11849,11851-11852,11855,11858,11862,11867,11869-11872,11876,11880,11893,11902-11905,11915,11923-11927,11929-11930,11932,11934-11941,11943,11948-11949,11952-11954,11956-11960,11962,11965-11966,11972,11975,11980,11983-11984,11986-11987,11990,11992-11997,12003-12004,12010-12013,12015,12018-12024,12043-12044,12046-12061,12063,12065,12070,12073-12076,12081-12083,12093-12094,12102,12105,12118,12124,12127-12128,12139,12141,12143,12148-12149,12153,12157-12159,12168-12169,12175-12180,12190,12194-12198,12203,12208-12213,12217-12258,12262,12264-12266,12274-12277,12281-12282,12287-12290,12340,12345-12346,12352,12359,12472-12473,12594,12634,12636-12638,12658-12659,12684-12712,12714-12715,12733,12780-12783,12785-12786,12795,12797,12800-12802,12815-12816,12840-12856,12860,12882-12883,12888-12892,12897,12904,12914-12917,12922-12926,12929-12936,12939,12959-12965,12967-12971,13011,13022,13025,13031-13032,13034,13043-13046,13048-13050,13053,13056,13058,13061,13068-13070,13075,13088,13090-13091,13101,13103-13104,13106,13108-13109,13111-13114,13116-13117,13120,13125,13127-13128,13148,13153-13161,13163,13165-13166,13174-13175,13188,13190,13211-13212,13219,13221,13231-13234,13236-13238,13253,13257-13270,13272-13274,13287-13300,13302-13342,13355-13374,13377-13379,13386-13389,13391-13400,13404,13408,13410,13412,13415-13416,13420,13422-13426,13429-13432,13452,13456,13461-13464,13466,13468-13470,13472-13477,13492,13517-13519,13527-13532,13589-13590,13624-13628,13645,13661-13663,13666,13684,13689-13690,13697,13699,13704,13745,13761,13766-13767,13769-13770,13772-13801,13808,13817-13818,13820-13823,13830-13831,13838,13854,13861,13984,13986-13988,14009,14013-14015,14020-14021,14036,14039-14045,14047,14051-14053,14056-14059,14065,14072,14080-14084,14086-14090,14095-14099,14101-14121,14130-14136,14162-14167,14172-14173,14184,14215-14220,14238-14241,14266-14269,14273-14278,14285,14288-14289,14303,14305,14307,14309,14311,14313-14316,14318-14320,14322,14358,14391-14392,14444-14446,14461-14462,14472,14476-14480,14496,14498,14505-14506,14511,14515,14538-14554,14558-14574,14577-14578,14582-14597,14599-14602,14614-14616,14686-14687,14698,14702,14705,14736,14738,14740,14742-14743,14747,14784-14786,14802-14809,14812-14813,14898-14904,14908-14909,14929-14931,15014-15015,15024-15028,15032,15044-15049,15056-15058,15070,15081-15082,15087,15092-15095,15121-15125,15128-15135,15138-15139,15141,15144,15147-15148,15169-15173,15175,15182,15186-15188,15190,15223,15238,15282,15304,15330,15335,15337,15354,15360-15361,15367-15368,15373,15380,15382,15388,15402-15403,15433,15447-15448,15457,15460,15499,15502,15506-15508,15523-15525,15537,15545,15548,15554-15556,15570
/branches/Branch_5_0:8892,8895,8897-8898,8900,8903-8904,8906-8907,8910,8915,8922,8924,8926,8929,8931-8933,8941,8946,8951,8955,8972-8977,8981,8997,8999,9002,9031-9032,9050,9080-9081,9084-9086,9093-9095,9102-9104,9108,9113-9115,9117-9118,9123,9125,9127-9131,9135-9136,9139,9146,9148-9150,9179-9191,9193-9195,9198,9200,9202,9204,9207,9209,9211,9213,9215,9220-9222,9231,9234-9235,9243,9251,9254,9259,9287,9315,9318,9347-9349,9358,9396,9427,9429,9431-9433,9441-9442,9444-9445,9462,9464,9468,9522-9523,9549,9551-9552,9576-9577,9579,9615,9633-9634,9672-9673,9675-9676,9684,9686-9687,9689,9699,9727,9729,9731,9930-9932,9935,9956,9980,10005-10006,10021,10024,10027,10064,10081-10082,10273,10285,10820-10824,10868,10872,10876-10878,10880,10918,11015,11017,11058-11060,11085-11086,11160-11165,11252-11253,11287,11294,11581,11619-11620,11679,11722-11723,11907,11974,12789,12940,12986,13023-13024,13086,13121-13122,13162,13465,13496,13501,13503,13660

   + /branches/tracker_attachement_move_in_fs:14977-14978
/branches/tests:15589
/branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/shelves/aljeux:15005,15012,15150,15154-15160,15177-15179,15203,15232,15276-15277,15306
/trunk:8721-8727
/shelves/alain_peyrat:14997-15003
/branches/Branch_5_1:11607-11609,11621,11625,11627,11631,11638,11644,11647-11651,11677,11680-11681,11683-11684,11719-11720,11724,11754,11780,11783,11792,11794,11802,11808-11816,11818,11822-11824,11827-11829,11834-11835,11847,11849,11851-11852,11855,11858,11862,11867,11869-11872,11876,11880,11893,11902-11905,11915,11923-11927,11929-11930,11932,11934-11941,11943,11948-11949,11952-11954,11956-11960,11962,11965-11966,11972,11975,11980,11983-11984,11986-11987,11990,11992-11997,12003-12004,12010-12013,12015,12018-12024,12043-12044,12046-12061,12063,12065,12070,12073-12076,12081-12083,12093-12094,12102,12105,12118,12124,12127-12128,12139,12141,12143,12148-12149,12153,12157-12159,12168-12169,12175-12180,12190,12194-12198,12203,12208-12213,12217-12258,12262,12264-12266,12274-12277,12281-12282,12287-12290,12340,12345-12346,12352,12359,12472-12473,12594,12634,12636-12638,12658-12659,12684-12712,12714-12715,12733,12780-12783,12785-12786,12795,12797,12800-12802,12815-12816,12840-12856,12860,12882-12883,12888-12892,12897,12904,12914-12917,12922-12926,12929-12936,12939,12959-12965,12967-12971,13011,13022,13025,13031-13032,13034,13043-13046,13048-13050,13053,13056,13058,13061,13068-13070,13075,13088,13090-13091,13101,13103-13104,13106,13108-13109,13111-13114,13116-13117,13120,13125,13127-13128,13148,13153-13161,13163,13165-13166,13174-13175,13188,13190,13211-13212,13219,13221,13231-13234,13236-13238,13253,13257-13270,13272-13274,13287-13300,13302-13342,13355-13374,13377-13379,13386-13389,13391-13400,13404,13408,13410,13412,13415-13416,13420,13422-13426,13429-13432,13452,13456,13461-13464,13466,13468-13470,13472-13477,13492,13517-13519,13527-13532,13589-13590,13624-13628,13645,13661-13663,13666,13684,13689-13690,13697,13699,13704,13745,13761,13766-13767,13769-13770,13772-13801,13808,13817-13818,13820-13823,13830-13831,13838,13854,13861,13984,13986-13988,14009,14013-14015,14020-14021,14036,14039-14045,14047,14051-14053,14056-14059,14065,14072,14080-14084,14086-14090,14095-14099,14101-14121,14130-14136,14162-14167,14172-14173,14184,14215-14220,14238-14241,14266-14269,14273-14278,14285,14288-14289,14303,14305,14307,14309,14311,14313-14316,14318-14320,14322,14358,14391-14392,14444-14446,14461-14462,14472,14476-14480,14496,14498,14505-14506,14511,14515,14538-14554,14558-14574,14577-14578,14582-14597,14599-14602,14614-14616,14686-14687,14698,14702,14705,14736,14738,14740,14742-14743,14747,14784-14786,14802-14809,14812-14813,14898-14904,14908-14909,14929-14931,15014-15015,15024-15028,15032,15044-15049,15056-15058,15070,15081-15082,15087,15092-15095,15121-15125,15128-15135,15138-15139,15141,15144,15147-15148,15169-15173,15175,15182,15186-15188,15190,15223,15238,15282,15304,15330,15335,15337,15354,15360-15361,15367-15368,15373,15380,15382,15388,15402-15403,15433,15447-15448,15457,15460,15499,15502,15506-15508,15523-15525,15537,15545,15548,15554-15556,15570
/branches/Branch_5_2:15217,15219,15221,15224,15227-15229,15234,15239,15279,15286,15325,15328-15329,15331,15347-15348,15352,15356,15359,15362,15364-15365,15370,15374,15381,15383,15386,15389,15392,15398,15400-15401,15404-15405,15407-15411,15495,15497,15500,15503-15505,15531,15533-15536,15538,15544,15546,15549,15557-15558,15568,15571,15573-15581,15583-15585,15586,15588,15595,15597-15609
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8662,8674,8751,8754,8756,8760-8761,8812,8850,8945,8995,8998,9004-9006,9124,9137,9141,9317,9443,9469,9670,9701,9726,9934,10013,10310,10314,10366,12790,13085
/branches/Branch_5_0:8892,8895,8897-8898,8900,8903-8904,8906-8907,8910,8915,8922,8924,8926,8929,8931-8933,8941,8946,8951,8955,8972-8977,8981,8997,8999,9002,9031-9032,9050,9080-9081,9084-9086,9093-9095,9102-9104,9108,9113-9115,9117-9118,9123,9125,9127-9131,9135-9136,9139,9146,9148-9150,9179-9191,9193-9195,9198,9200,9202,9204,9207,9209,9211,9213,9215,9220-9222,9231,9234-9235,9243,9251,9254,9259,9287,9315,9318,9347-9349,9358,9396,9427,9429,9431-9433,9441-9442,9444-9445,9462,9464,9468,9522-9523,9549,9551-9552,9576-9577,9579,9615,9633-9634,9672-9673,9675-9676,9684,9686-9687,9689,9699,9727,9729,9731,9930-9932,9935,9956,9980,10005-10006,10021,10024,10027,10064,10081-10082,10273,10285,10820-10824,10868,10872,10876-10878,10880,10918,11015,11017,11058-11060,11085-11086,11160-11165,11252-11253,11287,11294,11581,11619-11620,11679,11722-11723,11907,11974,12789,12940,12986,13023-13024,13086,13121-13122,13162,13465,13496,13501,13503,13660

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:10013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8751
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8756
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:9141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10006
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10064
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10824
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11017
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11165
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11253
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11294
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8895
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8898
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8900
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9131
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9150
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9188
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9195
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9198
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9207
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9209
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9213
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9243
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9254
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9358
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9433
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9549
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9552
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9579
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9675
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9676
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11631
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11638
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11651
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11684
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11724
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11754
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11794
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11802
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11818
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11835
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11855
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11858
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11872
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11876
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11905
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11930
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11962
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11966
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11975
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11984
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11987
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11997
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12015
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12022
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12073
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12105
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12143
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12169
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12180
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12203
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12266
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12282
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12594
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12659
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12715
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12816
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12843
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12856
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12892
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12917
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12971
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13011
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13056
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13058
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13061
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13091
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13104
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13117
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13120
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13163
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13212
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13232
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13238
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13274
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13287
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13300
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13307
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13312
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13314
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13316
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13325
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13373
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13404
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13412
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13426
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13432
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13466
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13492
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13532
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13590
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13690
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13699
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13704
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13770
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13808
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13821
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13822
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13823
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13854
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13986
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13988
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14045
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14047
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14053
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14057
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14065
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14072
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14084
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14090
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14109
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14111
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14112
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14116
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14121
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14130
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14162
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14167
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14173
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14184
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14215
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14218
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14220
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14241
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14269
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14275
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14278
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14289
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14303
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14305
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14307
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14309
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14311
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14320
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14322
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14392
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14462
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14472
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14498
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14515
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14541
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14550
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14554
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14616
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14705
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14743
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14747
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14805
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14806
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14809
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14813
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14904
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14909
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14931
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15028
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15032
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15056
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15058
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15070
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15087
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15092
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15093
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15095
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15125
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15135
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15144
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15148
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15175
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15182
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15219
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15221
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15229
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15239
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15286
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15331
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15356
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15370
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15374
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15383
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15386
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15389
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15392
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15405
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15411
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15538
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15558
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15568
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15571
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15583
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15584
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15595
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:10013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8751
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8756
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:9141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10006
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10064
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10824
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11017
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11165
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11253
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11294
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8895
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8898
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8900
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9131
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9150
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9188
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9195
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9198
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9207
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9209
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9213
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9243
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9254
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9358
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9433
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9549
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9552
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9579
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9675
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9676
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11631
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11638
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11651
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11684
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11724
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11754
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11794
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11802
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11818
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11835
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11855
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11858
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11872
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11876
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11905
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11930
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11962
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11966
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11975
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11984
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11987
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11997
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12015
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12022
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12073
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12105
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12143
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12169
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12180
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12203
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12266
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12282
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12594
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12659
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12715
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12816
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12843
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12856
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12892
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12917
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12971
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13011
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13056
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13058
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13061
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13091
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13104
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13117
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13120
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13163
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13212
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13232
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13238
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13274
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13287
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13300
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13307
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13312
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13314
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13316
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13325
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13373
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13404
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13412
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13426
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13432
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13466
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13492
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13532
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13590
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13690
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13699
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13704
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13770
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13808
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13821
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13822
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13823
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13854
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13986
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:13988
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14045
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14047
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14053
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14057
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14065
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14072
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14084
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14090
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14109
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14111
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14112
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14116
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14121
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14130
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14162
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14167
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14173
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14184
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14215
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14218
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14220
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14241
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14269
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14275
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14278
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14289
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14303
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14305
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14307
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14309
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14311
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14320
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14322
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14392
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14462
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14472
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14498
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14515
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14541
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14550
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14554
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14616
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14705
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14743
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14747
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14805
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14806
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14809
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14813
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14904
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14909
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:14931
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15028
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15032
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15056
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15058
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15070
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15087
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15092
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15093
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15095
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15125
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15135
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15144
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15148
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15175
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15182
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:15190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15219
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15221
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15229
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15239
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15286
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15331
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15356
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15370
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15374
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15383
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15386
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15389
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15392
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15405
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15411
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15538
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15558
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15568
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15571
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15583
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15584
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15595
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_2:15609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727


Modified: trunk/src/common/include/config-vars.php
===================================================================
--- trunk/src/common/include/config-vars.php	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/common/include/config-vars.php	2012-05-30 12:44:54 UTC (rev 15613)
@@ -103,7 +103,6 @@
 	forge_set_config_item_bool ('use_project_database', 'core') ;
 	forge_define_config_item ('use_project_multimedia', 'core', $GLOBALS['sys_use_project_multimedia']) ;
 	forge_set_config_item_bool ('use_project_multimedia', 'core') ;
-	forge_define_config_item ('download_host', 'core', $GLOBALS['sys_download_host']) ;
 	forge_define_config_item ('shell_host', 'core', $GLOBALS['sys_shell_host']) ;
 	forge_define_config_item ('users_host', 'core', $GLOBALS['sys_users_host']) ;
 	forge_define_config_item ('lists_host', 'core', $GLOBALS['sys_lists_host']) ;

Modified: trunk/src/deb-specific/db-convert-to-unicode.pl
===================================================================
--- trunk/src/deb-specific/db-convert-to-unicode.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/deb-specific/db-convert-to-unicode.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_scm_host $sys_download_host
+use vars qw/$sys_default_domain $sys_scm_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 
 sub debug ( $ ) ;

Deleted: trunk/src/deb-specific/fusionforge-config
===================================================================
--- trunk/src/deb-specific/fusionforge-config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/deb-specific/fusionforge-config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,34 +0,0 @@
-#! /bin/sh
-#
-# Parse all template files and expand them into real files
-# Roland Mas, debian-sf (Sourceforge for Debian)
-#
-# For apache2 we have to remove the Listen 80 directive 
-# This is to test if apache2 is started and listen on port 80
-#
-# -dovhost will create vhosts
-[ -f /etc/default/apache2 ] && . /etc/default/apache2
-if [ "x$NO_START" = "x0" ]
-then
-	/usr/share/gforge/bin/setup -fhs -noapache $@ -system pgsql -nolisten80
-else
-	/usr/share/gforge/bin/setup -fhs -noapache $@ -system pgsql -listen80
-fi	
-
-[ -f /etc/gforge/local.inc ] && chmod 644 /etc/gforge/local.inc
-[ -f /etc/gforge/httpd.conf ] && chmod 644 /etc/gforge/httpd.conf
-
-[ -f /etc/gforge/database.inc ] && chown gforge:gforge /etc/gforge/database.inc
-[ -f /etc/gforge/database.inc ] && chmod 640 /etc/gforge/database.inc
-
-if getent group list > /dev/null
-then
-	[ -f /etc/gforge/database.py ] && chgrp list /etc/gforge/database.py
-fi
-[ -f /etc/gforge/database.py ] && chmod 640 /etc/gforge/database.py
-
-[ -f /etc/gforge/local.pl ] && chmod go+rx /etc/gforge
-[ -f /etc/gforge/local.pl ] && chown gforge:gforge /etc/gforge/local.pl
-[ -f /etc/gforge/local.pl ] && chmod 640 /etc/gforge/local.pl
-
-[ -f /etc/gforge/templates/httpd.conf.template ] && rm -f /etc/gforge/templates/*.template || true

Modified: trunk/src/deb-specific/gforge-inject.pl
===================================================================
--- trunk/src/deb-specific/gforge-inject.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/deb-specific/gforge-inject.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -16,13 +16,13 @@
 use DBI ;
 use Data::Dumper ;
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_scm_host $sys_download_host
+use vars qw/$sys_default_domain $sys_scm_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 
 sub debug ( $ ) ;

Modified: trunk/src/deb-specific/old-db-upgrade.pl
===================================================================
--- trunk/src/deb-specific/old-db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/deb-specific/old-db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -14,13 +14,13 @@
 use Digest::MD5 ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_scm_host $sys_download_host
+use vars qw/$sys_default_domain $sys_scm_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $libdir $sqldir/ ;
 
 $libdir="/usr/share/gforge/lib";

Modified: trunk/src/debian/README.Debian.tmpl
===================================================================
--- trunk/src/debian/README.Debian.tmpl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/README.Debian.tmpl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -87,27 +87,17 @@
 --------------------------
 With default Debian settings, a set of conf files have been generated,
 and will contain the desired settings for runtime :
- - /etc/gforge/local.inc
- - ... (TO BE DOCUMENTED PROPERLY !)
+ - /etc/fusionforge/config.ini
+ - /etc/fusionforge/config.ini.d/*.ini
 
-Should these settings not suit you, it is possible to change
-configuration options by :
+They are standard Windows-style *.ini files, and can be updated with
+any text editor.  They should be taken into account immediately by the
+web part of the forge and any subsequent runs of the cron jobs.  Note
+however that some require manual intervention: for instance, if you
+change the name of the database, you will need to perform the
+appropriate steps in the database server too.
 
- 1. modifying /etc/@PACKAGE@/@PACKAGE at .conf which contains the
-    basic settings
- ( 2. Optional : copy some template files from
-     /usr/share/gforge/etc/local.d/ to /etc/gforge/local.d/ (TO BE
-     DOCUMENTED PROPERLY !) )
- 3. regenerate the runtime config files by issueing :
-      # fusionforge-config
 
-Customizations in /etc/@PACKAGE@/@PACKAGE at .conf may include :
- - switching to HTTPS with 'sys_use_ssl=true',
- - setting a custom URL prefix with 'sys_urlprefix=/@PACKAGE@/' for
-   instance, 
- etc.
-
-
 Adminning notes
 ---------------
   Once @FORGENAME@ is setup, it pretty much runs by itself.  There

Modified: trunk/src/debian/changelog
===================================================================
--- trunk/src/debian/changelog	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/changelog	2012-05-30 12:44:54 UTC (rev 15613)
@@ -6,9 +6,12 @@
 
 fusionforge (5.1.50+svn15558-2) UNRELEASED; urgency=low
 
-  * 
+  * Ripped out all but the most important Debconf questions in order to
+    simplify installation and get rid of the legacy fusionforge.conf
+    configuration file (which is no longer created on new installs).
+  * Stop shipping fusionforge-config manpage.
 
- -- Roland Mas <lolando at debian.org>  Fri, 25 May 2012 17:16:48 +0200
+ -- Roland Mas <lolando at debian.org>  Tue, 29 May 2012 18:37:43 +0200
 
 fusionforge (5.1.50+svn15558-1) experimental; urgency=low
 

Deleted: trunk/src/debian/dsf-helper/common-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/common-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/common-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,23 +0,0 @@
-#- beginning of included section from common-variables.config
-db_get @PACKAGE@/shared/domain_name || true
-if [ -z "$RET" ] ; then
-   hostname=$(hostname -f 2>/dev/null) || hostname=localhost
-   db_set @PACKAGE@/shared/domain_name $hostname
-fi
-db_input medium @PACKAGE@/shared/domain_name || true
-db_go || true
-
-db_get @PACKAGE@/shared/server_admin || true
-if [ -z "$RET" ] ; then
-  db_get @PACKAGE@/shared/domain_name || true
-  db_set @PACKAGE@/shared/server_admin "webmaster@$RET"
-fi
-
-db_input medium @PACKAGE@/shared/server_admin || true
-db_input low @PACKAGE@/shared/system_name || true
-
-db_go || true
-
-vars="system_name domain_name server_admin"
-update_mainconffile $vars
-#- end of included section from common-variables.config

Deleted: trunk/src/debian/dsf-helper/common-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/common-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/common-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,28 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/domain_name
-Type: string
-_Description: @FORGENAME@ domain or subdomain name:
- Please enter the domain that will host the @FORGENAME@ installation. Some
- services (scm, lists, etc.) will be given their own subdomain in that
- domain.
-
-Template: @PACKAGE@/shared/server_admin
-Type: string
-_Description: @FORGENAME@ administrator e-mail address:
- Please enter the e-mail address of the @FORGENAME@ administrator of this site. It
- will be used when problems occur.
-
-Template: @PACKAGE@/shared/system_name
-Type: string
-Default: @FORGENAME@
-_Description: @FORGENAME@ system name:
- Please enter the name of the @FORGENAME@ system. It is used in various places
- throughout the system.

Deleted: trunk/src/debian/dsf-helper/create-random-pw.config
===================================================================
--- trunk/src/debian/dsf-helper/create-random-pw.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/create-random-pw.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,13 +0,0 @@
-#- beginning of included section from create-random-pw.config
-gen_random_pw () {		# Generate a random password
-    if [ -c /dev/urandom ]; then  # ...using /dev/urandom when possible
-	tmp=$(dd if=/dev/urandom count=1 bs=8 2> /dev/null | md5sum | cut -b1-8)
-    else			# ...or something else if need be.
-	# Last I was told, the Hurd had no /dev/urandom
-	# (Correct me if it has changed)
-	# Suggestions form something more random than $(date) are welcome
-	tmp=$(date | md5sum | cut -b1-8)
-    fi
-    echo $tmp
-}
-#- end of included section from create-random-pw.config

Deleted: trunk/src/debian/dsf-helper/dbhost-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/dbhost-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/dbhost-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,16 +0,0 @@
-#- beginning of included section from dbhost-variables.config
-db_fget @PACKAGE@/shared/db_host seen || true
-[ "$RET" = "false" ] && db_set @PACKAGE@/shared/db_host 127.0.0.1
-db_input medium @PACKAGE@/shared/db_host || true
-
-db_fget @PACKAGE@/shared/db_name seen || true
-db_input medium @PACKAGE@/shared/db_name || true
-
-db_fget @PACKAGE@/shared/db_user seen || true
-db_input medium @PACKAGE@/shared/db_user || true
-
-db_go || true
-
-vars="db_host db_name db_user"
-update_mainconffile $vars
-#- end of included section from dbhost-variables.config

Deleted: trunk/src/debian/dsf-helper/dbhost-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/dbhost-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/dbhost-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,27 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/db_host
-Type: string
-_Description: Database server:
- Please enter the IP address (or hostname) of the server that will
- host the @FORGENAME@ database.
-
-Template: @PACKAGE@/shared/db_name
-Type: string
-Default: @PACKAGE@
-_Description: Database name:
- Please enter the name of the database that will host the @FORGENAME@ database.
-
-Template: @PACKAGE@/shared/db_user
-Type: string
-Default: @PACKAGE@
-_Description: Database administrator username:
- Please enter the username of the database administrator for the server
- that will host the @FORGENAME@ database.

Deleted: trunk/src/debian/dsf-helper/dbpasswd-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/dbpasswd-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/dbpasswd-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,25 +0,0 @@
-#- beginning of included section from dbpasswd-variables.config
-db_fget @PACKAGE@/shared/db_password seen || true
-if [ "$RET" = "false" ]; then
-    pw=$(gen_random_pw)
-    if [ -e /etc/gforge/config.ini.d/debian-install-secrets.ini ]; then
-        pw=$(grep '^database_password=' /etc/gforge/config.ini.d/debian-install-secrets.ini | sed 's/database_password=//')
-        echo "Since you asked not to see all the debconf questions, I reused the" 
-	echo "password for the database that was already set in "
-	echo "/etc/gforge/config.ini.d/debian-install-secrets.ini."
-	echo "Use it if you want to have a peek at the database by hand."
-    else
-        echo "Since you asked not to see all the debconf questions, I generated a random"
-	echo "password for the database.  Use it if you want to have a peek at the"
-	echo "database by hand.  It is '$pw'."
-    fi    
-    db_set @PACKAGE@/shared/db_password $pw
-    db_get @PACKAGE@/shared/db_password || true
-    db_fset @PACKAGE@/shared/db_password seen true
-fi
-
-db_go || true
-
-vars="db_password"
-update_mainconffile $vars
-#- end of included section from dbpasswd-variables.config

Deleted: trunk/src/debian/dsf-helper/dbpasswd-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/dbpasswd-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/dbpasswd-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,20 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/db_password
-Type: password
-_Description: Password used for the database:
- Connections to the database system are authenticated by a password.
- .
- Please choose the connection password.
-
-Template: @PACKAGE@/shared/db_password_confirm
-Type: password
-_Description: Password confirmation:
- Please re-type the password for confirmation.

Deleted: trunk/src/debian/dsf-helper/downloadhost-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/downloadhost-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/downloadhost-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,13 +0,0 @@
-#- beginning of included section from downloadhost-variables.config
-db_fget @PACKAGE@/shared/download_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/download_host download.$RET
-fi
-
-db_input low @PACKAGE@/shared/download_host || true
-db_go || true
-
-vars="download_host"
-update_mainconffile $vars
-#- end of included section from downloadhost-variables.config

Deleted: trunk/src/debian/dsf-helper/downloadhost-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/downloadhost-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/downloadhost-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,15 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/download_host
-Type: string
-_Description: Download server:
- Please enter the host name of the server that will host the @FORGENAME@ packages.
- .
- It should not be the same as the main @FORGENAME@ host.

Deleted: trunk/src/debian/dsf-helper/ftpuploadhost-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/ftpuploadhost-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/ftpuploadhost-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,11 +0,0 @@
-db_fget @PACKAGE@/shared/ftpuploadhost seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/ftpuploadhost upload.$RET
-fi
-
-db_input low @PACKAGE@/shared/ftpuploadhost || true
-db_go || true
-
-vars="ftpuploadhost"
-update_mainconffile $vars

Deleted: trunk/src/debian/dsf-helper/ftpuploadhost-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/ftpuploadhost-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/ftpuploadhost-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,5 +0,0 @@
-Template: @PACKAGE@/shared/ftpuploadhost
-Type: string
-_Description: Your upload server for released files:
- The hostname of the server where you will upload files
- to release

Deleted: trunk/src/debian/dsf-helper/get-pw-from-debconf.config
===================================================================
--- trunk/src/debian/dsf-helper/get-pw-from-debconf.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/get-pw-from-debconf.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,39 +0,0 @@
-#- beginning of included section from get-pw-from-debconf.config
-get_pw () {			# Use Debconf to get a password
-    get_pw__pwname=$1
-    get_pw__priority=$2
-    get_pw__ok=''
-    while [ -z "$get_pw__ok" ] ; do
-	db_input ${get_pw__priority} ${get_pw__pwname} || get_pw__retcode=$? || true
-	db_input ${get_pw__priority} ${get_pw__pwname}_confirm || true
-	db_go
-	if [ "$get_pw__retcode" = 30 ] ; then
-	    get_pw__ok="not-asked"
-	else
-	    db_get ${get_pw__pwname} || true
-	    get_pw__PW1=$RET
-	    db_get ${get_pw__pwname}_confirm || true
-	    get_pw__PW2=$RET
-	    if [ "$get_pw__PW1" = "$get_pw__PW2" ] ; then
-		get_pw__ok="confirmed"
-	    else
-		get_pw__ok="mismatch"
-		db_fset ${get_pw__pwname} seen false
-		db_fset ${get_pw__pwname}_confirm seen false
-	    fi
-	fi
-    done
-    case $get_pw__ok in
-	not-asked)
-	    echo "not-asked"
-	;;
-	confirmed)
-	    echo "confirmed"
-	;;
-	*)
-	    echo "SHOULDN'T HAVE HAPPENED"
-	    exit 1
-	;;
-    esac
-}
-#- end of included section from get-pw-from-debconf.config

Deleted: trunk/src/debian/dsf-helper/groupid-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/groupid-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/groupid-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,10 +0,0 @@
-#- beginning of included section from groupid-variables.config
-db_input low @PACKAGE@/shared/newsadmin_groupid || true
-db_input low @PACKAGE@/shared/statsadmin_groupid || true
-db_input low @PACKAGE@/shared/peerrating_groupid || true
-
-db_go || true
-
-vars="newsadmin_groupid statsadmin_groupid peerrating_groupid"
-update_mainconffile $vars
-#- end of included section from groupid-variables.config

Deleted: trunk/src/debian/dsf-helper/groupid-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/groupid-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/groupid-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,26 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/newsadmin_groupid
-Type: string
-Default: 2
-_Description: News administrative group ID:
- The members of the news admin group can approve news for the @FORGENAME@ main
- page. This group's ID must not be 1. This should be changed only if
- you upgrade from a previous version and want to keep the data.
-
-Template: @PACKAGE@/shared/statsadmin_groupid
-Type: string
-Default: 3
-_Description: Statistics administrative group ID:
-
-Template: @PACKAGE@/shared/peerrating_groupid
-Type: string
-Default: 4
-_Description: Peer rating administrative group ID:

Deleted: trunk/src/debian/dsf-helper/handle-mainconffile.config
===================================================================
--- trunk/src/debian/dsf-helper/handle-mainconffile.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/handle-mainconffile.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,63 +0,0 @@
-#- beginning of included section from handle-mainconffile.config
-###
-# Functions to handle the main @FORGENAME@ configuration file
-###
-mainconfdir=/etc/@PACKAGE@
-mainconffile=$mainconfdir/@PACKAGE at .conf
-create_mainconffile () {
-    if [ ! -e $mainconfdir ] ; then
-	mkdir -p $mainconfdir
-    fi
-    if [ ! -e $mainconffile ] ; then
-	if [ -e /etc/gforge/gforge.conf ] ; then
-	    cp -a /etc/gforge/gforge.conf $mainconffile
-	else
-            touch $mainconffile
-	fi
-        chmod 600 $mainconffile
-    fi
-}
-init_debconf_from_mainconffile () {
-    for i in $(grep -v "^ *#" $mainconffile | sort -u | cut -d= -f1) ; do
-	update_onevar_from_mainconfile $i
-    done
-}
-update_onevar_from_mainconfile () {
-    key=$1
-    update_onevar_from_mainconfile__retcode=0
-    value=$(grep ^$key= $mainconffile | tail -1 | cut -d= -f2-)
-    if [ ! -z "$value" ] ; then
-	db_set @PACKAGE@/shared/$key $value || update_onevar_from_mainconfile__retcode=$? || true
-#     case $update_onevar_from_mainconfile__retcode in
-# 	0)
-# 	    echo "$key = $value injected into Debconf OK"
-# 	    db_fset @PACKAGE@/shared/$key seen true || true
-# 	    ;;
-# 	10)
-# 	    echo "$key = $value not injected into Debconf (non-existing question maybe?)"
-# 	    ;;
-# 	*)
-# 	    echo "Something wicked happened"
-# 	    exit 1
-# 	    ;;
-#     esac
-    fi
-}
-update_mainconffile () {
-    for key in $@ ; do
-	db_get @PACKAGE@/shared/$key
-	val=$RET
-	update_onevar_mainconffile $key $val
-    done
-}
-update_onevar_mainconffile () {
-    key=$1
-    val=$2
-    if grep -q "^$key=" $mainconffile ; then
-	newval=$(echo $val | sed -e 's/@/\\@/g' -e 's/\$/\\$/g' -e 's/\//\\\//g')
-	perl -pi -e "s/^$key=.*/$key=$newval/" $mainconffile
-    else
-	echo "$key=$val" >> $mainconffile
-    fi
-}
-#- end of included section from handle-mainconffile.config

Deleted: trunk/src/debian/dsf-helper/handle-mainconffile.postinst
===================================================================
--- trunk/src/debian/dsf-helper/handle-mainconffile.postinst	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/handle-mainconffile.postinst	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,35 +0,0 @@
-###
-# Functions to handle the main @FORGENAME@ configuration file
-###
-mainconffile=/etc/@PACKAGE@/@PACKAGE at .conf
-# Update it for the variables received as parameters
-create_mainconffile () {
-    if [ ! -e $mainconffile ] ; then
-        touch $mainconffile
-        chmod 600 $mainconffile
-    fi
-}
-update_mainconffile () {
-    for key in $@ ; do
-	db_get @PACKAGE@/shared/$key
-	val=$RET
-	update_onevar_mainconffile $key $val
-    done
-}
-update_onevar_mainconfile () {
-    key=$1
-    val=$2
-    if grep -q "^$key=" $mainconffile ; then
-	newval=$(echo $val | sed -e 's/@/\\@/g' -e 's/\$/\\$/g' -e 's/\//\\\//g')
-	perl -pi -e "s/^$key=.*/$key=$newval/" $mainconffile
-    else
-	echo "$key=$val" >> $mainconffile
-    fi
-}
-add_onevar_mainconfile () {
-    key=$1
-    val=$2
-    if ! grep -q "^$key=" $mainconffile ; then
-	echo "$key=$val" >> $mainconffile
-    fi
-}

Deleted: trunk/src/debian/dsf-helper/handle-mainconffile.postrm
===================================================================
--- trunk/src/debian/dsf-helper/handle-mainconffile.postrm	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/handle-mainconffile.postrm	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,8 +0,0 @@
-###
-# Functions to handle the main @FORGENAME@ confguration file
-###
-mainconffile=/etc/@PACKAGE@/@PACKAGE at .conf
-# Delete the main configuration file
-delete_mainconffile () {
-    rm -f $mainconffile
-}

Deleted: trunk/src/debian/dsf-helper/host-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/host-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/host-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,15 +0,0 @@
-#- beginning of included section from host-variables.config
-db_fget @PACKAGE@/shared/ip_address seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/ip_address $(hostname -i | cut -f1 -d" ")
-fi
-
-db_input medium @PACKAGE@/shared/ip_address || true
-db_input medium @PACKAGE@/shared/server_admin || true
-db_go || true
-
-
-vars="ip_address server_admin"
-update_mainconffile $vars
-#- end of included section from host-variables.config

Deleted: trunk/src/debian/dsf-helper/host-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/host-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/host-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/ip_address
-Type: string
-_Description: IP address:
- Please enter the IP address of the server that will host the @FORGENAME@
- installation.
- .
- This is needed for the configuration of Apache virtual hosting.

Deleted: trunk/src/debian/dsf-helper/jabberhost-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/jabberhost-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/jabberhost-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,11 +0,0 @@
-db_fget @PACKAGE@/shared/jabber_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/jabber_host jabber.$RET
-fi
-
-db_input low @PACKAGE@/shared/jabber_host || true
-db_go || true
-
-vars="jabber_host"
-update_mainconffile $vars

Deleted: trunk/src/debian/dsf-helper/jabberhost-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/jabberhost-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/jabberhost-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,4 +0,0 @@
-Template: @PACKAGE@/shared/jabber_host
-Type: string
-_Description: Your jabber server:
- The hostname of the server that will host your Jabber server

Deleted: trunk/src/debian/dsf-helper/lists-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/lists-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/lists-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,14 +0,0 @@
-#- beginning of included section from lists-variables.config
-db_fget @PACKAGE@/shared/lists_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/lists_host lists.$RET
-fi
-
-db_input medium @PACKAGE@/shared/lists_host || true
-
-db_go || true
-
-vars="lists_host"
-update_mainconffile $vars
-#- end of included section from lists-variables.config

Deleted: trunk/src/debian/dsf-helper/lists-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/lists-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/lists-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/lists_host
-Type: string
-_Description: Mailing lists server:
- Please enter the host name of the server that will host the @FORGENAME@
- mailing lists.
- .
- It should not be the same as the main @FORGENAME@ host.

Deleted: trunk/src/debian/dsf-helper/shellhost-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/shellhost-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/shellhost-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,13 +0,0 @@
-#- beginning of included section from shellhost-variables.config
-db_fget @PACKAGE@/shared/shell_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/shell_host shell.$RET
-fi
-
-db_input low @PACKAGE@/shared/shell_host || true
-db_go || true
-
-vars="shell_host"
-update_mainconffile $vars
-#- end of included section from shellhost-variables.config

Deleted: trunk/src/debian/dsf-helper/shellhost-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/shellhost-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/shellhost-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,14 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/shell_host
-Type: string
-_Description: Shell server:
- Please enter the host name of the server that will host the @FORGENAME@
- shell accounts.

Deleted: trunk/src/debian/dsf-helper/ucf-choices.templates
===================================================================
--- trunk/src/debian/dsf-helper/ucf-choices.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/ucf-choices.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,17 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/ucfchangeprompt
-Type: select
-__Choices: install the new version configured by @PACKAGE@, keep the local version currently installed, show the differences between the versions, show a side-by-side difference between the versions, start a new shell to examine the situation
-Choices-C: install_new, keep_current, diff, sdiff, shell
-Default: install_new
-_Description: What do you want to do about configuration file ${BASENAME}?
- The configuration file ${FILE} needs to be modified by @PACKAGE@,
- whereas it is also a configuration file of the postgresql package.

Deleted: trunk/src/debian/dsf-helper/uploadhost-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/uploadhost-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/uploadhost-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,11 +0,0 @@
-db_fget @PACKAGE@/shared/upload_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/upload_host upload.$RET
-fi
-
-db_input low @PACKAGE@/shared/upload_host || true
-db_go || true
-
-vars="upload_host"
-update_mainconffile $vars

Deleted: trunk/src/debian/dsf-helper/uploadhost-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/uploadhost-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/uploadhost-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,5 +0,0 @@
-Template: @PACKAGE@/shared/upload_host
-Type: string
-_Description: Your upload server:
- The hostname of the server where you will upload files available
- in ftp space

Deleted: trunk/src/debian/dsf-helper/users-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/users-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/users-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,14 +0,0 @@
-#- beginning of included section from users-variables.config
-db_fget @PACKAGE@/shared/users_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/users_host users.$RET
-fi
-
-db_input medium @PACKAGE@/shared/users_host || true
-
-db_go || true
-
-vars="users_host"
-update_mainconffile $vars
-#- end of included section from users-variables.config

Deleted: trunk/src/debian/dsf-helper/users-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/users-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/users-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/users_host
-Type: string
-_Description: User mail redirector server:
- Please enter the host name of the server that will host the @FORGENAME@ user mail
- redirector.
- .
- It should not be the same as the main @FORGENAME@ host.

Deleted: trunk/src/debian/dsf-helper/web-variables.config
===================================================================
--- trunk/src/debian/dsf-helper/web-variables.config	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/web-variables.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,7 +0,0 @@
-db_input low @PACKAGE@/shared/sys_lang || true
-db_input low @PACKAGE@/shared/sys_theme || true
-
-db_go || true
-
-vars="sys_lang sys_theme newsadmin_groupid statsadmin_groupid peerrating_groupid"
-update_mainconffile $vars

Deleted: trunk/src/debian/dsf-helper/web-variables.templates
===================================================================
--- trunk/src/debian/dsf-helper/web-variables.templates	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-helper/web-variables.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,22 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/sys_lang
-Type: select
-__Choices: English, Bulgarian, Catalan, Chinese (Traditional), Dutch, Esperanto, French, German, Greek, Hebrew, Indonesian, Italian, Japanese, Korean, Latin, Norwegian, Polish, Portuguese (Brazilian), Portuguese, Russian, Chinese (Simplified), Spanish, Swedish, Thai
-_DefaultChoice: English[ Default language]
-_Description: Default language:
- Please choose the default language for web pages.
-
-Template: @PACKAGE@/shared/sys_theme
-Type: string
-Default: @PACKAGE@
-_Description: Default theme:
- Please choose the default theme for web pages. This must be a valid
- name.

Copied: trunk/src/debian/dsf-in/common.config (from rev 15612, trunk/src/debian/dsf-in/common.config.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/common.config	                        (rev 0)
+++ trunk/src/debian/dsf-in/common.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+db_get @PACKAGE@/shared/web_host || true
+if [ -z "$RET" ] ; then
+   hostname=$(hostname -f 2>/dev/null) || hostname=localhost
+   db_set @PACKAGE@/shared/web_host $hostname
+fi
+db_input medium @PACKAGE@/shared/web_host || true
+db_go || true
+
+db_get @PACKAGE@/shared/server_admin || true
+if [ -z "$RET" ] ; then
+  db_get @PACKAGE@/shared/web_host || true
+  db_set @PACKAGE@/shared/server_admin "webmaster@$RET"
+fi
+
+db_input medium @PACKAGE@/shared/server_admin || true
+db_input low @PACKAGE@/shared/forge_name || true
+
+db_go || true

Deleted: trunk/src/debian/dsf-in/common.config.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/common.config.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/common.config.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:common-variables#

Modified: trunk/src/debian/dsf-in/common.manpages
===================================================================
--- trunk/src/debian/dsf-in/common.manpages	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/common.manpages	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,2 +1 @@
- at PACKAGE@-config.1
 cvssh.1

Modified: trunk/src/debian/dsf-in/common.postinst
===================================================================
--- trunk/src/debian/dsf-in/common.postinst	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/common.postinst	2012-05-30 12:44:54 UTC (rev 15613)
@@ -46,18 +46,30 @@
 
 	if [ "$2" = "" ] ; then
 	    # Installation from scratch, let's generate initial config files
-	    if [ ! -e /etc/gforge/config.ini.d/debian-install.ini ] ; then
-		cat > /etc/gforge/config.ini.d/debian-install.ini <<EOF
+	    if [ ! -e /etc/@PACKAGE@/config.ini.d/debian-install.ini ] ; then
+		db_get @PACKAGE@/shared/forge_name || true
+		if [ -z "$RET" ] ; then
+		    forge_name=FusionForge
+		else
+		    forge_name=$RET
+		fi
+		db_get @PACKAGE@/shared/web_host || true
+		if [ -z "$RET" ] ; then
+		    web_host=$(hostname -f)
+		else
+		    web_host=$RET
+		fi
+		cat > /etc/@PACKAGE@/config.ini.d/debian-install.ini <<EOF
 ; This file was generated by the Debian installation system.
 ; You can edit the values here or move them to other files.
 
 [core]
-forge_name=FusionForge
-web_host=$(hostname -f)
+forge_name=$forge_name
+web_host=$web_host
 EOF
 	    fi
-	    if [ ! -e /etc/gforge/config.ini.d/debian-install-secrets.ini ] ; then
-		t=$(mktemp /etc/gforge/config.ini.d/debian-install-secrets.ini.XXXXXX)
+	    if [ ! -e /etc/@PACKAGE@/config.ini.d/debian-install-secrets.ini ] ; then
+		t=$(mktemp /etc/@PACKAGE@/config.ini.d/debian-install-secrets.ini.XXXXXX)
 		pw=
 		db_fget @PACKAGE@/shared/db_password seen || true
 		seen="$RET"
@@ -97,7 +109,7 @@
 
 session_key=$sk
 EOF
-		mv $t /etc/gforge/config.ini.d/debian-install-secrets.ini
+		mv $t /etc/@PACKAGE@/config.ini.d/debian-install-secrets.ini
 	    fi
 	elif dpkg --compare-versions $2 lt 5.0.51-1 ; then
 	    echo "Migrating existing configuration to *.ini files"

Copied: trunk/src/debian/dsf-in/common.templates (from rev 15612, trunk/src/debian/dsf-in/common.templates.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/common.templates	                        (rev 0)
+++ trunk/src/debian/dsf-in/common.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,22 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: @PACKAGE@/shared/web_host
+Type: string
+_Description: @FORGENAME@ domain or subdomain name:
+ Please enter the domain that will host the @FORGENAME@ installation. Some
+ services (scm, lists, etc.) will be given their own subdomain in that
+ domain.
+
+Template: @PACKAGE@/shared/forge_name
+Type: string
+Default: @FORGENAME@
+_Description: @FORGENAME@ system name:
+ Please enter the name of the @FORGENAME@ system. It is used in various places
+ throughout the system.

Deleted: trunk/src/debian/dsf-in/common.templates.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/common.templates.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/common.templates.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,10 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-#DSFHELPER:common-variables#

Copied: trunk/src/debian/dsf-in/db-postgresql.config (from rev 15612, trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.config	                        (rev 0)
+++ trunk/src/debian/dsf-in/db-postgresql.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,68 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+gen_random_pw () {		# Generate a random password
+    if [ -c /dev/urandom ]; then  # ...using /dev/urandom when possible
+	tmp=$(dd if=/dev/urandom count=1 bs=8 2> /dev/null | md5sum | cut -b1-8)
+    else			# ...or something else if need be.
+	# Last I was told, the Hurd had no /dev/urandom
+	# (Correct me if it has changed)
+	# Suggestions form something more random than $(date) are welcome
+	tmp=$(date | md5sum | cut -b1-8)
+    fi
+    echo $tmp
+}
+
+get_pw () {			# Use Debconf to get a password
+    get_pw__pwname=$1
+    get_pw__priority=$2
+    get_pw__ok=''
+    while [ -z "$get_pw__ok" ] ; do
+	db_input ${get_pw__priority} ${get_pw__pwname} || get_pw__retcode=$? || true
+	db_input ${get_pw__priority} ${get_pw__pwname}_confirm || true
+	db_go
+	if [ "$get_pw__retcode" = 30 ] ; then
+	    get_pw__ok="not-asked"
+	else
+	    db_get ${get_pw__pwname} || true
+	    get_pw__PW1=$RET
+	    db_get ${get_pw__pwname}_confirm || true
+	    get_pw__PW2=$RET
+	    if [ "$get_pw__PW1" = "$get_pw__PW2" ] ; then
+		get_pw__ok="confirmed"
+	    else
+		get_pw__ok="mismatch"
+		db_fset ${get_pw__pwname} seen false
+		db_fset ${get_pw__pwname}_confirm seen false
+	    fi
+	fi
+    done
+    case $get_pw__ok in
+	not-asked)
+	    echo "not-asked"
+	;;
+	confirmed)
+	    echo "confirmed"
+	;;
+	*)
+	    echo "SHOULDN'T HAVE HAPPENED"
+	    exit 1
+	;;
+    esac
+}
+
+db_fget @PACKAGE@/shared/admin_password seen || true
+if [ "$RET" = "false" ]; then
+    if [ "$(get_pw @PACKAGE@/shared/admin_password high)" = "not-asked" ] ; then
+	db_set @PACKAGE@/shared/admin_password $(gen_random_pw)
+	db_get @PACKAGE@/shared/admin_password || true
+	echo "Since you asked not to see all the debconf questions, I generated a random"
+	echo "password for the admin user.  It is '${RET}'." ;
+	db_fset @PACKAGE@/shared/admin_password seen true
+    fi
+fi
+
+db_go || true
+db_stop

Deleted: trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/db-postgresql.config.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,40 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:get-pw-from-debconf#
-#DSFHELPER:create-random-pw#
-#DSFHELPER:common-variables#
-#DSFHELPER:dbhost-variables#
-#DSFHELPER:dbpasswd-variables#
-
-db_fget @PACKAGE@/shared/admin_password seen || true
-if [ "$RET" = "false" ]; then
-    if [ "$(get_pw @PACKAGE@/shared/admin_password high)" = "not-asked" ] ; then
-	db_set @PACKAGE@/shared/admin_password $(gen_random_pw)
-	db_get @PACKAGE@/shared/admin_password || true
-	echo "Since you asked not to see all the debconf questions, I generated a random"
-	echo "password for the admin user.  It is '${RET}'." ;
-	db_fset @PACKAGE@/shared/admin_password seen true
-    fi
-fi
-
-#DSFHELPER:host-variables#
-#DSFHELPER:shellhost-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-#DSFHELPER:downloadhost-variables#
-#DSFHELPER:groupid-variables#
-
-db_go || true
-
-vars="admin_password"
-update_mainconffile $vars
-
-db_stop

Copied: trunk/src/debian/dsf-in/db-postgresql.postinst (from rev 15612, trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.postinst	                        (rev 0)
+++ trunk/src/debian/dsf-in/db-postgresql.postinst	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,118 @@
+#! /bin/sh
+# postinst script for @OLDPACKAGE@
+#
+# see: dh_installdeb(1)
+
+# Support for new place for pg_hba.conf
+# I only try to upgrade on the default cluster
+if [ -x /usr/bin/pg_lsclusters ]
+then 
+	# We are with new postgresql working with clusters
+	# This is probably not te most elegant way to deal with database
+	# I install or upgrade on the default cluster if it is online
+	# or I quit gently with a big message
+	pg_version=`pg_lsclusters | grep 5432 | grep online | cut -d' ' -f1`
+	if [ "x$pg_version" != "x" ] 
+	then 
+		export pg_hba_dir=/etc/postgresql/${pg_version}/main
+	else
+		echo "No database found online on port 5432"
+		echo "Couldn't initialize or upgrade @OLDPACKAGE@ database."
+		echo "Please see postgresql documentation"
+		echo "and run dpkg-reconfigure -plow @OLDPACKAGE at -db-postgresql"
+		echo "once the problem is solved"
+		echo "exiting without error, but @OLDPACKAGE@ db will not work"
+		echo "right now"
+		exit 0
+	fi
+else
+    	export pg_hba_dir=/etc/postgresql
+fi
+
+set -e
+#set -x				# Be verbose, be very verbose.
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+        # Patch DB configuration files
+	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure-files
+
+	# At first, the pg_hba.conf file is not yet handled by ucf, so
+	# we don't display the usual template, but instead a custom
+	# one (fusionforge/ucfchangeprompt)
+	ucf_package=`ucfq -w ${pg_hba_dir}/pg_hba.conf | cut -d ':' -f 2`
+	if [ "x$ucf_package" != "x at OLDPACKAGE@-db-postgresql" ]
+	then
+	    ucf --debconf-ok --debconf-template fusionforge/ucfchangeprompt ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new ${pg_hba_dir}/pg_hba.conf
+	else
+	    ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new ${pg_hba_dir}/pg_hba.conf
+	fi
+	# register it with ucfr/ucfq so that next time the normal ucf template is used, in case of user changes (or another package's)
+	ucfr @OLDPACKAGE at -db-postgresql ${pg_hba_dir}/pg_hba.conf
+	rm ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new
+
+	# Make sure the database accepts connections from these new users
+	pg_name=postgresql-$pg_version
+	# Trying "postgresql" init script...
+	v=0
+	invoke-rc.d postgresql reload || v=$?
+	if test x"$v" = x"100"; then
+		# No "postgresql" init script (for packages << 8.4.4-2)
+		pg_name=postgresql-$pg_version
+		invoke-rc.d ${pg_name} reload
+	elif test x"$v" != x"0"; then
+		# Needed, since we run under "set -e"...
+		exit $v
+	fi
+
+        # Setup our DB
+	v=0
+	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure || v=$?
+	if test x"$v" = x"100"; then
+	    db_get @PACKAGE@/shared/admin_password || true
+	    /usr/share/gforge/bin/forge_set_password admin "$RET"
+	elif test x"$v" != x"0"; then
+	    exit $v
+	fi
+
+	if [ -n "$2" ] && dpkg --compare-versions $2 lt 5.1-8 ; then
+            echo "Normalizing all roles and permissions"
+            PATH=$PATH:/usr/share/gforge/bin normalize_roles.php
+        fi
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Deleted: trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,121 +0,0 @@
-#! /bin/sh
-# postinst script for @OLDPACKAGE@
-#
-# see: dh_installdeb(1)
-
-# Support for new place for pg_hba.conf
-# I only try to upgrade on the default cluster
-if [ -x /usr/bin/pg_lsclusters ]
-then 
-	# We are with new postgresql working with clusters
-	# This is probably not te most elegant way to deal with database
-	# I install or upgrade on the default cluster if it is online
-	# or I quit gently with a big message
-	pg_version=`pg_lsclusters | grep 5432 | grep online | cut -d' ' -f1`
-	if [ "x$pg_version" != "x" ] 
-	then 
-		export pg_hba_dir=/etc/postgresql/${pg_version}/main
-	else
-		echo "No database found online on port 5432"
-		echo "Couldn't initialize or upgrade @OLDPACKAGE@ database."
-		echo "Please see postgresql documentation"
-		echo "and run dpkg-reconfigure -plow @OLDPACKAGE at -db-postgresql"
-		echo "once the problem is solved"
-		echo "exiting without error, but @OLDPACKAGE@ db will not work"
-		echo "right now"
-		exit 0
-	fi
-else
-    	export pg_hba_dir=/etc/postgresql
-fi
-
-set -e
-#set -x				# Be verbose, be very verbose.
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-case "$1" in
-    configure)
-	add_onevar_mainconfile default_trove_cat 18
-
-        # Patch DB configuration files
-	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure-files
-
-	# At first, the pg_hba.conf file is not yet handled by ucf, so
-	# we don't display the usual template, but instead a custom
-	# one (fusionforge/ucfchangeprompt)
-	ucf_package=`ucfq -w ${pg_hba_dir}/pg_hba.conf | cut -d ':' -f 2`
-	if [ "x$ucf_package" != "x at OLDPACKAGE@-db-postgresql" ]
-	then
-	    ucf --debconf-ok --debconf-template fusionforge/ucfchangeprompt ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new ${pg_hba_dir}/pg_hba.conf
-	else
-	    ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new ${pg_hba_dir}/pg_hba.conf
-	fi
-	# register it with ucfr/ucfq so that next time the normal ucf template is used, in case of user changes (or another package's)
-	ucfr @OLDPACKAGE at -db-postgresql ${pg_hba_dir}/pg_hba.conf
-	rm ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new
-
-	# Make sure the database accepts connections from these new users
-	pg_name=postgresql-$pg_version
-	# Trying "postgresql" init script...
-	v=0
-	invoke-rc.d postgresql reload || v=$?
-	if test x"$v" = x"100"; then
-		# No "postgresql" init script (for packages << 8.4.4-2)
-		pg_name=postgresql-$pg_version
-		invoke-rc.d ${pg_name} reload
-	elif test x"$v" != x"0"; then
-		# Needed, since we run under "set -e"...
-		exit $v
-	fi
-
-        # Setup our DB
-	v=0
-	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure || v=$?
-	if test x"$v" = x"100"; then
-	    db_get @PACKAGE@/shared/admin_password || true
-	    /usr/share/gforge/bin/forge_set_password admin "$RET"
-	elif test x"$v" != x"0"; then
-	    exit $v
-	fi
-
-	if [ -n "$2" ] && dpkg --compare-versions $2 lt 5.1-8 ; then
-            echo "Normalizing all roles and permissions"
-            PATH=$PATH:/usr/share/gforge/bin normalize_roles.php
-        fi
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Copied: trunk/src/debian/dsf-in/db-postgresql.templates (from rev 15612, trunk/src/debian/dsf-in/db-postgresql.templates.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.templates	                        (rev 0)
+++ trunk/src/debian/dsf-in/db-postgresql.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,30 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: @PACKAGE@/shared/admin_password
+Type: password
+_Description: @FORGENAME@ administrator password:
+ The @FORGENAME@ administrator account will have full privileges on the
+ forge. It will be used to approve the creation of new projects.
+ .
+ Please choose the password for this forge account.
+
+Template: @PACKAGE@/shared/admin_password_confirm
+Type: password
+_Description: Password confirmation:
+ Please re-type the password for confirmation.
+
+Template: @PACKAGE@/ucfchangeprompt
+Type: select
+__Choices: install the new version configured by @PACKAGE@, keep the local version currently installed, show the differences between the versions, show a side-by-side difference between the versions, start a new shell to examine the situation
+Choices-C: install_new, keep_current, diff, sdiff, shell
+Default: install_new
+_Description: What do you want to do about configuration file ${BASENAME}?
+ The configuration file ${FILE} needs to be modified by @PACKAGE@,
+ whereas it is also a configuration file of the postgresql package.

Deleted: trunk/src/debian/dsf-in/db-postgresql.templates.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.templates.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/db-postgresql.templates.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,59 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-#DSFHELPER:common-variables#
-
-Template: @PACKAGE@/shared/shell_host
-Type: string
-_Description: Shell server:
- Please enter the hostname of the server that will host the @FORGENAME@
- shell accounts.
-
-#DSFHELPER:users-variables#
-
-#DSFHELPER:lists-variables#
-
-Template: @PACKAGE@/shared/download_host
-Type: string
-_Description: Download server:
- Please enter the hostname of the server that will host the @FORGENAME@
- packages. 
- .
- It should not be the same as the main @FORGENAME@ host.
-
-#DSFHELPER:dbpasswd-variables#
-
-Template: @PACKAGE@/shared/ip_address
-Type: string
-_Description: IP address:
- Please enter the IP address of the server that will host the @FORGENAME@
- installation.
- .
- This is needed for the configuration of Apache virtual hosting.
-
-Template: @PACKAGE@/shared/admin_password
-Type: password
-_Description: @FORGENAME@ administrator password:
- The @FORGENAME@ administrator account will have full privileges on the
- forge. It will be used to approve the creation of new projects.
- .
- Please choose the password for this forge account.
-
-Template: @PACKAGE@/shared/admin_password_confirm
-Type: password
-_Description: Password confirmation:
- Please re-type the password for confirmation.
-
-#DSFHELPER:dbhost-variables#
-
-#DSFHELPER:web-variables#
-
-#DSFHELPER:groupid-variables#
-
-#DSFHELPER:ucf-choices#

Deleted: trunk/src/debian/dsf-in/dns-bind9.config.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/dns-bind9.config.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/dns-bind9.config.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:common-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-db_stop

Copied: trunk/src/debian/dsf-in/dns-bind9.templates (from rev 15612, trunk/src/debian/dsf-in/dns-bind9.templates.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/dns-bind9.templates	                        (rev 0)
+++ trunk/src/debian/dsf-in/dns-bind9.templates	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,24 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: @PACKAGE@/shared/simple_dns
+Type: boolean
+Default: false
+# Translators: SCM here means "Source Control Management"
+#              (cvs, svn, etc.)
+_Description: Do you want a simple DNS setup for @FORGENAME@?
+ You can use a simple DNS setup with wildcards to map all
+ project web-hosts to a single IP address, and direct all the scm-hosts
+ to a single SCM server, or a complex setup which allows
+ many servers as project web servers or SCM servers.
+ .
+ Even if you use a simple DNS setup, you can still use
+ separate machines as project servers; it just assumes that
+ all the project web directories are on the same server with a single
+ SCM server.

Deleted: trunk/src/debian/dsf-in/dns-bind9.templates.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/dns-bind9.templates.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/dns-bind9.templates.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,32 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-#DSFHELPER:common-variables#
-#DSFHELPER:shellhost-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-#DSFHELPER:downloadhost-variables#
-#DSFHELPER:host-variables#
-#DSFHELPER:web-variables#
-
-Template: @PACKAGE@/shared/simple_dns
-Type: boolean
-Default: false
-# Translators: SCM here means "Source Control Management"
-#              (cvs, svn, etc.)
-_Description: Do you want a simple DNS setup for @FORGENAME@?
- You can use a simple DNS setup with wildcards to map all
- project web-hosts to a single IP address, and direct all the scm-hosts
- to a single SCM server, or a complex setup which allows
- many servers as project web servers or SCM servers.
- .
- Even if you use a simple DNS setup, you can still use
- separate machines as project servers; it just assumes that
- all the project web directories are on the same server with a single
- SCM server.

Copied: trunk/src/debian/dsf-in/mta-exim4.config (from rev 15612, trunk/src/debian/dsf-in/mta-exim4.config.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/mta-exim4.config	                        (rev 0)
+++ trunk/src/debian/dsf-in/mta-exim4.config	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+if [ -f /etc/aliases. at OLDPACKAGE@-new ] 
+then
+	ucf --debconf-ok /etc/aliases. at OLDPACKAGE@-new /etc/aliases
+	rm /etc/aliases. at OLDPACKAGE@-new
+fi
+if [ -f /etc/exim4/exim4.conf. at OLDPACKAGE@-new ]
+then
+	ucf --debconf-ok /etc/exim4/exim4.conf. at OLDPACKAGE@-new /etc/exim4/exim4.conf
+	rm /etc/exim4/exim4.conf. at OLDPACKAGE@-new
+fi
+if [ -f /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new ]
+then
+	ucf --debconf-ok /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new /etc/exim4/exim4.conf.template
+	rm /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new
+fi
+if [ -f /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new ]
+then
+	ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new
+fi
+db_stop
+
+

Deleted: trunk/src/debian/dsf-in/mta-exim4.config.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/mta-exim4.config.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/mta-exim4.config.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,38 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:common-variables#
-#DSFHELPER:get-pw-from-debconf#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-if [ -f /etc/aliases. at OLDPACKAGE@-new ] 
-then
-	ucf --debconf-ok /etc/aliases. at OLDPACKAGE@-new /etc/aliases
-	rm /etc/aliases. at OLDPACKAGE@-new
-fi
-if [ -f /etc/exim4/exim4.conf. at OLDPACKAGE@-new ]
-then
-	ucf --debconf-ok /etc/exim4/exim4.conf. at OLDPACKAGE@-new /etc/exim4/exim4.conf
-	rm /etc/exim4/exim4.conf. at OLDPACKAGE@-new
-fi
-if [ -f /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new ]
-then
-	ucf --debconf-ok /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new /etc/exim4/exim4.conf.template
-	rm /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new
-fi
-if [ -f /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new ]
-then
-	ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
-	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new
-fi
-db_stop
-
-

Deleted: trunk/src/debian/dsf-in/mta-exim4.templates.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/mta-exim4.templates.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/mta-exim4.templates.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,15 +0,0 @@
-#DSFHELPER:common-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-Template: @PACKAGE@/shared/noreply_to_bitbucket
-Type: boolean
-Default: true
-_Description: Do you want mail to ${noreply} to be deleted?
- @FORGENAME@ sends plenty of e-mail from the "${noreply}" address,
- and maybe even some e-mail to that address too.
- .
- It is advised that you let the package direct e-mail to that address to a
- black hole (/dev/null), unless you have another use for that address.
- .
- Accepting this option will perform that redirection.

Deleted: trunk/src/debian/dsf-in/mta-postfix.config.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/mta-postfix.config.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/mta-postfix.config.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:common-variables#
-#DSFHELPER:get-pw-from-debconf#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-db_stop

Deleted: trunk/src/debian/dsf-in/mta-postfix.templates.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/mta-postfix.templates.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/mta-postfix.templates.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,22 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-#DSFHELPER:common-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-Template: @PACKAGE@/shared/noreply_to_bitbucket
-Type: boolean
-Default: true
-_Description: Do you want mail to ${noreply} to be discarded?
- @FORGENAME@ sends and receives plenty of e-mail to and from the
- "${noreply}" address.
- .
- E-mail to that address should be directed to a
- black hole (/dev/null), unless you have another use for that address.

Copied: trunk/src/debian/dsf-in/web-apache2-vhosts.postinst (from rev 15612, trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/web-apache2-vhosts.postinst	                        (rev 0)
+++ trunk/src/debian/dsf-in/web-apache2-vhosts.postinst	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,54 @@
+#! /bin/sh
+# postinst script for @OLDPACKAGE@
+#
+# see: dh_installdeb(1)
+
+set -e
+#set -x				# Be verbose, be very verbose.
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+	db_stop
+        # Setup our Apache
+	touch /var/lib/@OLDPACKAGE@/etc/templates/httpd.vhosts  && \
+		chown @OLDPACKAGE@:@OLDPACKAGE@ /var/lib/@OLDPACKAGE@/etc/templates/httpd.vhosts && \
+		/usr/share/@OLDPACKAGE@/bin/create-vhosts.sh --norestart
+
+	# Make Apache see these new changes
+	invoke-rc.d apache2 reload || true
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Deleted: trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,54 +0,0 @@
-#! /bin/sh
-# postinst script for @OLDPACKAGE@
-#
-# see: dh_installdeb(1)
-
-set -e
-#set -x				# Be verbose, be very verbose.
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-. /usr/share/debconf/confmodule
-
-case "$1" in
-    configure)
-	db_stop
-        # Setup our Apache
-	touch /var/lib/@OLDPACKAGE@/etc/templates/httpd.vhosts  && \
-		chown @OLDPACKAGE@:@OLDPACKAGE@ /var/lib/@OLDPACKAGE@/etc/templates/httpd.vhosts && \
-		/usr/share/@OLDPACKAGE@/bin/create-vhosts.sh --norestart
-
-	# Make Apache see these new changes
-	invoke-rc.d apache2 reload || true
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Copied: trunk/src/debian/dsf-in/web-apache2-vhosts.postrm (from rev 15612, trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/web-apache2-vhosts.postrm	                        (rev 0)
+++ trunk/src/debian/dsf-in/web-apache2-vhosts.postrm	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,34 @@
+#! /bin/sh
+# postrm script for @OLDPACKAGE@
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/share/doc/packaging-manual/
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        # Make Apache see these new changes
+	invoke-rc.d apache2 reload || true
+	;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#

Deleted: trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,34 +0,0 @@
-#! /bin/sh
-# postrm script for @OLDPACKAGE@
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see /usr/share/doc/packaging-manual/
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        # Make Apache see these new changes
-	invoke-rc.d apache2 reload || true
-	;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 0
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#

Deleted: trunk/src/debian/dsf-in/web-apache2.config.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/web-apache2.config.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/web-apache2.config.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
-#DSFHELPER:get-pw-from-debconf#
-#DSFHELPER:create-random-pw#
-
-#DSFHELPER:host-variables#
-#DSFHELPER:common-variables#
-#DSFHELPER:web-variables#
-#DSFHELPER:groupid-variables#
-# [Disabled] DSFHELPER:users-variables#
-# [Disabled] DSFHELPER:lists-variables#
-#DSFHELPER:downloadhost-variables#
-#DSFHELPER:uploadhost-variables#
-#DSFHELPER:ftpuploadhost-variables#
-#DSFHELPER:jabberhost-variables#
-# [Disabled] DSFHELPER:shellhost-variables#
-# [Disabled] DSFHELPER:dbpasswd-variables#
-# [Disabled] DSFHELPER:dbhost-variables#

Copied: trunk/src/debian/dsf-in/web-apache2.postinst (from rev 15612, trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in)
===================================================================
--- trunk/src/debian/dsf-in/web-apache2.postinst	                        (rev 0)
+++ trunk/src/debian/dsf-in/web-apache2.postinst	2012-05-30 12:44:54 UTC (rev 15613)
@@ -0,0 +1,96 @@
+#! /bin/sh
+# postinst script for @OLDPACKAGE@
+#
+# see: dh_installdeb(1)
+
+set -e
+#set -x				# Be verbose, be very verbose.
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+	if [ ! -e /etc/@OLDPACKAGE@/ssl-cert.pem ] || [ ! -e /etc/@OLDPACKAGE@/ssl-cert.key ] ; then
+	    # Uh-oh, no SSL cert, let's make sure at least a dummy one exists.
+	    if [ ! -e /etc/ssl/certs/ssl-cert-snakeoil.pem ] || [ ! -e /etc/ssl/private/ssl-cert-snakeoil.key ] ; then
+		# What, not even the snakeoil cert is there?  Let's generate it
+		make-ssl-cert generate-default-snakeoil
+	    fi
+	    # Right.  At this point, it should be safe to set the symlinks.
+	    ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/@OLDPACKAGE@/ssl-cert.pem
+	    ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/@OLDPACKAGE@/ssl-cert.key
+	fi
+	
+	for i in secrets.inc vhost-list.inc vhost-main.inc vhost-projects.inc ; do
+	    if [ ! -e /etc/gforge/httpd.conf.d/$i ] ; then
+		cp /usr/share/gforge/etc/httpd.conf.d-fhs/$i /etc/gforge/httpd.conf.d/$i
+		if [ $i = "secrets.inc" ] ; then
+		    chmod 700 /etc/gforge/httpd.conf.d/$i
+		fi
+		PATH=/usr/share/gforge/bin:$PATH manage-apache-config.sh install
+		mv /etc/gforge/httpd.conf.d/$i.generated /etc/gforge/httpd.conf.d/$i
+	    fi
+	done
+
+	touch /var/lib/gforge/etc/httpd.vhosts
+
+	db_stop
+
+        # Setup our FRS
+	chown www-data:www-data /var/lib/@OLDPACKAGE@/download
+
+	# Enable required modules
+	DEBIAN_FRONTEND=noninteractive a2enmod php5 || true
+	DEBIAN_FRONTEND=noninteractive a2enmod ssl || true
+	DEBIAN_FRONTEND=noninteractive a2enmod env || true
+	DEBIAN_FRONTEND=noninteractive a2enmod vhost_alias || true
+	DEBIAN_FRONTEND=noninteractive a2enmod headers || true
+	DEBIAN_FRONTEND=noninteractive a2enmod rewrite || true
+	DEBIAN_FRONTEND=noninteractive a2enmod proxy || true
+	DEBIAN_FRONTEND=noninteractive a2enmod proxy_http || true
+	
+	# Enable the @FORGENAME@ configuration
+	if [ -e /etc/apache2/conf.d/@OLDPACKAGE at .httpd.conf ] ; then
+	    rm -f /etc/apache2/conf.d/@OLDPACKAGE at .httpd.conf
+	fi
+	if [ -d /etc/apache2/sites-available ] && [ ! -h /etc/apache2/sites-available/@OLDPACKAGE@ ] ; then
+	    ln -s /etc/@OLDPACKAGE@/httpd.conf /etc/apache2/sites-available/@OLDPACKAGE@
+	fi
+	a2ensite @OLDPACKAGE@
+	
+	# Make Apache see these new changes
+	invoke-rc.d apache2 restart || true
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Deleted: trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,109 +0,0 @@
-#! /bin/sh
-# postinst script for @OLDPACKAGE@
-#
-# see: dh_installdeb(1)
-
-set -e
-#set -x				# Be verbose, be very verbose.
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-. /usr/share/debconf/confmodule
-
-#DSFHELPER:handle-mainconffile#
-
-case "$1" in
-    configure)
-	if [ -c /dev/urandom ]; then  # ...using /dev/urandom when possible
-	    sys_session_key=$(dd if=/dev/urandom count=1 bs=16 2> /dev/null | md5sum | cut -b1-32)
-	else			# ...or something else if need be.
-	    # Last I was told, the Hurd had no /dev/urandom
-	    # (Correct me if it has changed)
-	    sys_session_key=$(dd if=/dev/random count=1 bs=8 2> /dev/null | md5sum | cut -b1-32)
-	fi
-	add_onevar_mainconfile sys_session_key $sys_session_key
-	add_onevar_mainconfile sys_show_source 0
-	add_onevar_mainconfile sys_force_login 0
-
-	if [ ! -e /etc/@OLDPACKAGE@/ssl-cert.pem ] || [ ! -e /etc/@OLDPACKAGE@/ssl-cert.key ] ; then
-	    # Uh-oh, no SSL cert, let's make sure at least a dummy one exists.
-	    if [ ! -e /etc/ssl/certs/ssl-cert-snakeoil.pem ] || [ ! -e /etc/ssl/private/ssl-cert-snakeoil.key ] ; then
-		# What, not even the snakeoil cert is there?  Let's generate it
-		make-ssl-cert generate-default-snakeoil
-	    fi
-	    # Right.  At this point, it should be safe to set the symlinks.
-	    ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/@OLDPACKAGE@/ssl-cert.pem
-	    ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/@OLDPACKAGE@/ssl-cert.key
-	fi
-	
-	for i in secrets.inc vhost-list.inc vhost-main.inc vhost-projects.inc ; do
-	    if [ ! -e /etc/gforge/httpd.conf.d/$i ] ; then
-		cp /usr/share/gforge/etc/httpd.conf.d-fhs/$i /etc/gforge/httpd.conf.d/$i
-		if [ $i = "secrets.inc" ] ; then
-		    chmod 700 /etc/gforge/httpd.conf.d/$i
-		fi
-		PATH=/usr/share/gforge/bin:$PATH manage-apache-config.sh install
-		mv /etc/gforge/httpd.conf.d/$i.generated /etc/gforge/httpd.conf.d/$i
-	    fi
-	done
-
-	touch /var/lib/gforge/etc/httpd.vhosts
-
-	db_stop
-
-        # Setup our FRS
-	chown www-data:www-data /var/lib/@OLDPACKAGE@/download
-
-	# Enable required modules
-	DEBIAN_FRONTEND=noninteractive a2enmod php5 || true
-	DEBIAN_FRONTEND=noninteractive a2enmod ssl || true
-	DEBIAN_FRONTEND=noninteractive a2enmod env || true
-	DEBIAN_FRONTEND=noninteractive a2enmod vhost_alias || true
-	DEBIAN_FRONTEND=noninteractive a2enmod headers || true
-	DEBIAN_FRONTEND=noninteractive a2enmod rewrite || true
-	DEBIAN_FRONTEND=noninteractive a2enmod proxy || true
-	DEBIAN_FRONTEND=noninteractive a2enmod proxy_http || true
-	
-	# Enable the @FORGENAME@ configuration
-	if [ -e /etc/apache2/conf.d/@OLDPACKAGE at .httpd.conf ] ; then
-	    rm -f /etc/apache2/conf.d/@OLDPACKAGE at .httpd.conf
-	fi
-	if [ -d /etc/apache2/sites-available ] && [ ! -h /etc/apache2/sites-available/@OLDPACKAGE@ ] ; then
-	    ln -s /etc/@OLDPACKAGE@/httpd.conf /etc/apache2/sites-available/@OLDPACKAGE@
-	fi
-	a2ensite @OLDPACKAGE@
-	
-	# Make Apache see these new changes
-	invoke-rc.d apache2 restart || true
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

Deleted: trunk/src/debian/dsf-in/web-apache2.templates.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/web-apache2.templates.dsfh-in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-in/web-apache2.templates.dsfh-in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,11 +0,0 @@
-#DSFHELPER:host-variables#
-#DSFHELPER:downloadhost-variables#
-#DSFHELPER:uploadhost-variables#
-#DSFHELPER:ftpuploadhost-variables#
-#DSFHELPER:jabberhost-variables#
-#DSFHELPER:lists-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:shellhost-variables#
-#DSFHELPER:web-variables#
-#DSFHELPER:groupid-variables#
-#DSFHELPER:dbpasswd-variables#

Modified: trunk/src/debian/dsf-po/POTFILES.in
===================================================================
--- trunk/src/debian/dsf-po/POTFILES.in	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/POTFILES.in	2012-05-30 12:44:54 UTC (rev 15613)
@@ -1,14 +1,3 @@
-[type: gettext/rfc822deb] dsf-in/common.templates.dsfh-in
-[type: gettext/rfc822deb] dsf-in/db-postgresql.templates.dsfh-in
-[type: gettext/rfc822deb] dsf-in/dns-bind9.templates.dsfh-in
-[type: gettext/rfc822deb] dsf-in/mta-postfix.templates.dsfh-in
-[type: gettext/rfc822deb] dsf-helper/common-variables.templates
-[type: gettext/rfc822deb] dsf-helper/dbhost-variables.templates
-[type: gettext/rfc822deb] dsf-helper/dbpasswd-variables.templates
-[type: gettext/rfc822deb] dsf-helper/downloadhost-variables.templates
-[type: gettext/rfc822deb] dsf-helper/groupid-variables.templates
-[type: gettext/rfc822deb] dsf-helper/host-variables.templates
-[type: gettext/rfc822deb] dsf-helper/lists-variables.templates
-[type: gettext/rfc822deb] dsf-helper/shellhost-variables.templates
-[type: gettext/rfc822deb] dsf-helper/users-variables.templates
-[type: gettext/rfc822deb] dsf-helper/web-variables.templates
+[type: gettext/rfc822deb] dsf-in/common.templates
+[type: gettext/rfc822deb] dsf-in/db-postgresql.templates
+[type: gettext/rfc822deb] dsf-in/dns-bind9.templates

Modified: trunk/src/debian/dsf-po/cs.po
===================================================================
--- trunk/src/debian/dsf-po/cs.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/cs.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2008-03-30 14:36+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -26,85 +26,52 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Server se shellovými účty:"
+#: ../dsf-in/common.templates:2001
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Název @FORGENAME@ domény nebo subdomény:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "shell accounts."
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
+"Zadejte prosím doménu, která bude hostit vaši instalaci @FORGENAME at . Některé "
+"služby obdrží své vlastní subdomény této domény (scm, lists, atd.)."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Server pro stahování:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Jméno @FORGENAME@ systému:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid "It should not be the same as the main @FORGENAME@ host."
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Měl by to být jiný počítač než je hlavní server @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP adresa:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-#, fuzzy
 #| msgid ""
-#| "Please enter the IP address of the server that will host the @FORGENAME@ "
-#| "installation."
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
 msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Zadejte prosím IP adresu serveru, který bude hostit instalaci @FORGENAME at ."
+"Zadejte prosím jméno @FORGENAME@ systému. Toto jméno je v systému používáno "
+"na několika místech."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "To je vyžadováno pro nastavení virtuálních hostů v Apachi."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -112,7 +79,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -126,7 +93,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -134,23 +101,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Potvrzení hesla:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Zadejte heslo ještě jednou pro potvrzení."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -160,7 +169,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -176,7 +185,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -186,457 +195,300 @@
 "Nastavení bude pouze předpokládat, budete mít všechny adresáře s weby "
 "projektů na jednom počítači a že pro SCM použijete jediný server."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Chcete, aby se pošta doručená na ${noreply} zahazovala?"
+#, fuzzy
+#~| msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Emailová adresa správce @FORGENAME@:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ využívá adresu „${noreply}“ k odesílání i příjmu velkého "
-"množství pošty."
+#~| msgid ""
+#~| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~| "site. It will be used when problems occur."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Zadejte prosím emailovou adresu správce tohoto systému @FORGENAME at . "
+#~ "Adresa se použije v případě výskytu problémů."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Pokud s touto adresou nemáte jiné plány, doporučujeme veškerou příchozí "
-"poštu přesměrovat do černé díry (/dev/null)."
+#~ msgid "Download server:"
+#~ msgstr "Server pro stahování:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Název @FORGENAME@ domény nebo subdomény:"
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Zadejte prosím doménu, která bude hostit vaši instalaci @FORGENAME at . Některé "
-"služby obdrží své vlastní subdomény této domény (scm, lists, atd.)."
+#~| msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Měl by to být jiný počítač než je hlavní server @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-#, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Emailová adresa správce @FORGENAME@:"
+#~ msgid "Database server:"
+#~ msgstr "Databázový server:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
-#| "site. It will be used when problems occur."
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Zadejte prosím emailovou adresu správce tohoto systému @FORGENAME at . Adresa "
-"se použije v případě výskytu problémů."
+#~| msgid ""
+#~| "Please enter the IP address (or hostname) of the server that will host "
+#~| "the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Zadejte prosím IP adresu (nebo jméno) serveru, který bude hostit vaši "
+#~ "@FORGENAME@ databázi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Jméno @FORGENAME@ systému:"
+#~ msgid "Database name:"
+#~ msgstr "Jméno databáze:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Zadejte prosím jméno @FORGENAME@ systému. Toto jméno je v systému používáno "
-"na několika místech."
+#~| msgid ""
+#~| "Please enter the name of the database that will host the @FORGENAME@ "
+#~| "database."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Zadejte prosím jméno databáze, která bude obsahovat databázi @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Databázový server:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Uživatelské jméno správce databáze:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the IP address (or hostname) of the server that will host "
-#| "the @FORGENAME@ database."
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Zadejte prosím IP adresu (nebo jméno) serveru, který bude hostit vaši "
-"@FORGENAME@ databázi."
+#~| msgid ""
+#~| "Please enter the username of the database administrator for the server "
+#~| "that will host the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Zadejte prosím uživatelské jméno správce databáze na serveru, který bude "
+#~ "hostit databázi @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Jméno databáze:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Heslo pro připojení do databáze:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ "
-#| "database."
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Zadejte prosím jméno databáze, která bude obsahovat databázi @FORGENAME at ."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Připojení do databáze je ověřováno heslem."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Uživatelské jméno správce databáze:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Zadejte zde prosím heslo pro připojení."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
+#~ msgid "IP address:"
+#~ msgstr "IP adresa:"
+
 #, fuzzy
-#| msgid ""
-#| "Please enter the username of the database administrator for the server "
-#| "that will host the @FORGENAME@ database."
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Zadejte prosím uživatelské jméno správce databáze na serveru, který bude "
-"hostit databázi @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~| "installation."
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Zadejte prosím IP adresu serveru, který bude hostit instalaci @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Heslo pro připojení do databáze:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "To je vyžadováno pro nastavení virtuálních hostů v Apachi."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Připojení do databáze je ověřováno heslem."
+#~ msgid "Shell server:"
+#~ msgstr "Server se shellovými účty:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Zadejte zde prosím heslo pro připojení."
-
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID skupiny správců novinek:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Server pro poštovní konference:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ "
-#| "main page. This group's ID must not be 1. This should be changed only if "
-#| "you upgrade from a previous version and want to keep the data."
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Členové správcovské skupiny pro novinky mohou schvalovat novinky pro hlavní "
-"stránku @FORGENAME at . Tato skupina nesmí mít ID 1. Toto byste měli měnit jen "
-"v případě, že přecházíte z dřívější verze a chcete zachovat svá data."
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "mailing lists."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Zadejte prosím jméno serveru, který bude hostit poštovní konference "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID skupiny správců pro statistiky:"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID skupiny správců pro hodnocení:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID skupiny správců novinek:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Server pro poštovní konference:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "mailing lists."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Zadejte prosím jméno serveru, který bude hostit poštovní konference "
-"@FORGENAME at ."
+#~| msgid ""
+#~| "The members of the news admin group can approve news for the @FORGENAME@ "
+#~| "main page. This group's ID must not be 1. This should be changed only if "
+#~| "you upgrade from a previous version and want to keep the data."
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Členové správcovské skupiny pro novinky mohou schvalovat novinky pro "
+#~ "hlavní stránku @FORGENAME at . Tato skupina nesmí mít ID 1. Toto byste měli "
+#~ "měnit jen v případě, že přecházíte z dřívější verze a chcete zachovat svá "
+#~ "data."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "shell accounts."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID skupiny správců pro statistiky:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Server pro přesměrování pošty:"
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID skupiny správců pro hodnocení:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Zadejte prosím jméno serveru, který bude hostit přesměrování pošty pro "
-"uživatele @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "angličtina"
+#~ msgid "English"
+#~ msgstr "angličtina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "bulharština"
+#~ msgid "Bulgarian"
+#~ msgstr "bulharština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "katalánština"
+#~ msgid "Catalan"
+#~ msgstr "katalánština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "čínština (tradiční)"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "čínština (tradiční)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "holandština"
+#~ msgid "Dutch"
+#~ msgstr "holandština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "esperanto"
+#~ msgid "Esperanto"
+#~ msgstr "esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "francouzština"
+#~ msgid "French"
+#~ msgstr "francouzština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "němčina"
+#~ msgid "German"
+#~ msgstr "němčina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "řečtina"
+#~ msgid "Greek"
+#~ msgstr "řečtina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "hebrejština"
+#~ msgid "Hebrew"
+#~ msgstr "hebrejština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "indonéština"
+#~ msgid "Indonesian"
+#~ msgstr "indonéština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "italština"
+#~ msgid "Italian"
+#~ msgstr "italština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "japonština"
+#~ msgid "Japanese"
+#~ msgstr "japonština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "korejština"
+#~ msgid "Korean"
+#~ msgstr "korejština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "latina"
+#~ msgid "Latin"
+#~ msgstr "latina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "norština"
+#~ msgid "Norwegian"
+#~ msgstr "norština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "polština"
+#~ msgid "Polish"
+#~ msgstr "polština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "portugalština (brazilská)"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "portugalština (brazilská)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "portugalština"
+#~ msgid "Portuguese"
+#~ msgstr "portugalština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "ruština"
+#~ msgid "Russian"
+#~ msgstr "ruština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "čínština (zjednodušená)"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "čínština (zjednodušená)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "španělština"
+#~ msgid "Spanish"
+#~ msgstr "španělština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "švédština"
+#~ msgid "Swedish"
+#~ msgstr "švédština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "thajština"
+#~ msgid "Thai"
+#~ msgstr "thajština"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "English"
+#~ msgid "English[ Default language]"
+#~ msgstr "English"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Výchozí jazyk:"
+#~ msgid "Default language:"
+#~ msgstr "Výchozí jazyk:"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Vyberte prosím výchozí jazyk pro webové stránky."
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Vyberte prosím výchozí jazyk pro webové stránky."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Výchozí téma:"
+#~ msgid "Default theme:"
+#~ msgstr "Výchozí téma:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Vyberte prosím výchozí téma pro webové stránky. Musí to být platný název."
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Vyberte prosím výchozí téma pro webové stránky. Musí to být platný název."
 
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Chcete, aby se pošta doručená na ${noreply} zahazovala?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ využívá adresu „${noreply}“ k odesílání i příjmu velkého "
+#~ "množství pošty."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Pokud s touto adresou nemáte jiné plány, doporučujeme veškerou příchozí "
+#~ "poštu přesměrovat do černé díry (/dev/null)."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Server pro přesměrování pošty:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Zadejte prosím jméno serveru, který bude hostit přesměrování pošty pro "
+#~ "uživatele @FORGENAME at ."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Přihlašovací jméno správce @FORGENAME@:"

Modified: trunk/src/debian/dsf-po/de.po
===================================================================
--- trunk/src/debian/dsf-po/de.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/de.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@ 4.8.2-1\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2009-12-27 09:30+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -17,83 +17,48 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Shell-Server:"
+#: ../dsf-in/common.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "@FORGENAME@ Domain- oder Subdomain-Name:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Shell-"
-"Konten beherbergen wird."
+"Bitte geben Sie die Domain an, die Ihre @FORGENAME at -Installation beherbergen "
+"wird. Einigen Diensten (scm, lists, usw.) wird innerhalb der Domain eine "
+"eigene Subdomain zugewiesen."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Download-Server:"
+#: ../dsf-in/common.templates:3001
+#, fuzzy
+#| msgid "@FORGENAME@/FusionForge system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME@/FusionForge-Systemname:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
-"Pakete beherbergen wird."
+"Bitte geben Sie den Namen des @FORGENAME at -Systems ein. Er wird an "
+"verschiedenen Stellen im ganzen System verwendet."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr ""
-"Dieser sollte nicht mit dem Namen des Haupt- at FORGENAME@-Rechners "
-"übereinstimmen."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-Adresse:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
-msgstr ""
-"Bitte geben Sie die IP-Adresse des Servers ein, der Ihre @FORGENAME at -"
-"Installation beherbergen wird."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Diese wird für die virtualhosting-Konfiguration des Apache benötigt."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "@FORGENAME at -Administrator-Passwort:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -108,7 +73,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -116,23 +81,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Bestätigung des Passworts:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Bitte geben Sie zur Bestätigung das Passwort erneut ein."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Möchten Sie eine einfache DNS-Installation für @FORGENAME@?"
 
@@ -140,7 +147,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -156,7 +163,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -167,411 +174,257 @@
 "angenommen, dass sich alle Webverzeichnisse der Projekte auf dem gleichen "
 "Server mit einem einzelnen Server für SCM befinden."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Möchten Sie, dass E-Mail an ${noreply} verworfen wird?"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "E-Mail-Adresse des @FORGENAME at -Administrators:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ sendet und empfängt viele E-Mails von und auf der »${noreply}«-"
-"Adresse."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Bitte geben Sie die E-Mail-Adresse des @FORGENAME at -Administrators Ihrer "
+#~ "Site an. Diese wird beim Auftritt von Problemen benötigt."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"E-Mails an diese Adresse sollten an ein schwarzes Loch (/dev/null) "
-"umgeleitet werden, es sei denn, Sie haben für diese Adresse eine andere "
-"Verwendung."
+#~ msgid "Download server:"
+#~ msgstr "Download-Server:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "@FORGENAME@ Domain- oder Subdomain-Name:"
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
+#~ "Pakete beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Bitte geben Sie die Domain an, die Ihre @FORGENAME at -Installation beherbergen "
-"wird. Einigen Diensten (scm, lists, usw.) wird innerhalb der Domain eine "
-"eigene Subdomain zugewiesen."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr ""
+#~ "Dieser sollte nicht mit dem Namen des Haupt- at FORGENAME@-Rechners "
+#~ "übereinstimmen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "E-Mail-Adresse des @FORGENAME at -Administrators:"
+#~ msgid "Database server:"
+#~ msgstr "Datenbank-Server:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Bitte geben Sie die E-Mail-Adresse des @FORGENAME at -Administrators Ihrer Site "
-"an. Diese wird beim Auftritt von Problemen benötigt."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Bitte geben Sie die IP-Adresse (oder den Rechnernamen) des Servers ein, "
+#~ "der die @FORGENAME at -Datenbank beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@/FusionForge system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "@FORGENAME@/FusionForge-Systemname:"
+#~ msgid "Database name:"
+#~ msgstr "Datenbankname:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Bitte geben Sie den Namen des @FORGENAME at -Systems ein. Er wird an "
-"verschiedenen Stellen im ganzen System verwendet."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Bitte geben Sie den Namen der Datenbank an, die die @FORGENAME at -Datenbank "
+#~ "beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Datenbank-Server:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Name des Administrators der Datenbank:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Bitte geben Sie die IP-Adresse (oder den Rechnernamen) des Servers ein, der "
-"die @FORGENAME at -Datenbank beherbergen wird."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Bitte geben Sie den Benutzernamen des Datenbankadministrators für den "
+#~ "Server ein, der die @FORGENAME at -Datenbank beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Datenbankname:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Für die Datenbank verwendetes Passwort:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Bitte geben Sie den Namen der Datenbank an, die die @FORGENAME at -Datenbank "
-"beherbergen wird."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "Verbindungen zum Datenbank-System werden durch ein Passwort "
+#~ "authentifiziert."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Name des Administrators der Datenbank:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Bitte wählen Sie das Passwort für Verbindungen aus."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Bitte geben Sie den Benutzernamen des Datenbankadministrators für den Server "
-"ein, der die @FORGENAME at -Datenbank beherbergen wird."
+#~ msgid "IP address:"
+#~ msgstr "IP-Adresse:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Für die Datenbank verwendetes Passwort:"
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Bitte geben Sie die IP-Adresse des Servers ein, der Ihre @FORGENAME at -"
+#~ "Installation beherbergen wird."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"Verbindungen zum Datenbank-System werden durch ein Passwort authentifiziert."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr ""
+#~ "Diese wird für die virtualhosting-Konfiguration des Apache benötigt."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Bitte wählen Sie das Passwort für Verbindungen aus."
+#~ msgid "Shell server:"
+#~ msgstr "Shell-Server:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
-"Pakete beherbergen wird."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
+#~ "Shell-Konten beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID der News-Administrators-Gruppe:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Mailinglisten-Server:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Mitglieder der News-Administrator-Gruppe können Nachrichten für die "
-"@FORGENAME at -Hauptseite genehmigen. Diese Gruppen-ID darf nicht 1 sein. Dies "
-"sollte nur geändert werden, falls Sie ein Upgrade von einer vorhergehenden "
-"Version durchführen und Ihre Daten behalten möchten."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
+#~ "Mailinglisten beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID der Statistik-Administratorgruppe:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
+#~ "Shell-Konten beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID der »peer rating«-Administratorgruppe:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID der News-Administrators-Gruppe:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Mailinglisten-Server:"
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Mitglieder der News-Administrator-Gruppe können Nachrichten für die "
+#~ "@FORGENAME at -Hauptseite genehmigen. Diese Gruppen-ID darf nicht 1 sein. "
+#~ "Dies sollte nur geändert werden, falls Sie ein Upgrade von einer "
+#~ "vorhergehenden Version durchführen und Ihre Daten behalten möchten."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
-"Mailinglisten beherbergen wird."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID der Statistik-Administratorgruppe:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Shell-"
-"Konten beherbergen wird."
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID der »peer rating«-Administratorgruppe:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Benutzer-E-Mail-Umleitungsserver:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
+#~ "Pakete beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihren @FORGENAME at -"
-"Benutzer-E-Mail-Umleiter beherbergen wird."
+#~ msgid "English"
+#~ msgstr "Englisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Englisch"
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Bulgarisch"
+#~ msgid "Catalan"
+#~ msgstr "Katalanisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Katalanisch"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "(traditionelles) Chinesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "(traditionelles) Chinesisch"
+#~ msgid "Dutch"
+#~ msgstr "Holländisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holländisch"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "French"
+#~ msgstr "Französisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Französisch"
+#~ msgid "German"
+#~ msgstr "Deutsch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Deutsch"
+#~ msgid "Greek"
+#~ msgstr "Griechisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Griechisch"
+#~ msgid "Hebrew"
+#~ msgstr "Hebräisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebräisch"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesisch"
+#~ msgid "Italian"
+#~ msgstr "Italienisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italienisch"
+#~ msgid "Japanese"
+#~ msgstr "Japanisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japanisch"
+#~ msgid "Korean"
+#~ msgstr "Koreanisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Koreanisch"
+#~ msgid "Latin"
+#~ msgstr "Latein"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latein"
+#~ msgid "Norwegian"
+#~ msgstr "Norwegisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Norwegisch"
+#~ msgid "Polish"
+#~ msgstr "Polnisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polnisch"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "brasilianisches Portugiesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "brasilianisches Portugiesisch"
+#~ msgid "Portuguese"
+#~ msgstr "Portugiesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugiesisch"
+#~ msgid "Russian"
+#~ msgstr "Russisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Russisch"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "(vereinfachtes) Chinesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "(vereinfachtes) Chinesisch"
+#~ msgid "Spanish"
+#~ msgstr "Spanisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Spanisch"
+#~ msgid "Swedish"
+#~ msgstr "Schwedisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Schwedisch"
+#~ msgid "Thai"
+#~ msgstr "Thailändisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Thailändisch"
+#~ msgid "English[ Default language]"
+#~ msgstr "German"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "German"
+#~ msgid "Default language:"
+#~ msgstr "Standardsprache:"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Standardsprache:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Bitte wählen Sie die Standardsprache für Webseiten."
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Bitte wählen Sie die Standardsprache für Webseiten."
+#~ msgid "Default theme:"
+#~ msgstr "Standard Thema:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Standard Thema:"
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Bitte wählen Sie das Standard-Thema für Webseiten. Dies muss ein gültiger "
+#~ "Namen sein."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Bitte wählen Sie das Standard-Thema für Webseiten. Dies muss ein gültiger "
-"Namen sein."
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Möchten Sie, dass E-Mail an ${noreply} verworfen wird?"
 
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ sendet und empfängt viele E-Mails von und auf der "
+#~ "»${noreply}«-Adresse."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "E-Mails an diese Adresse sollten an ein schwarzes Loch (/dev/null) "
+#~ "umgeleitet werden, es sei denn, Sie haben für diese Adresse eine andere "
+#~ "Verwendung."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Benutzer-E-Mail-Umleitungsserver:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Bitte geben Sie den Rechnernamen des Servers ein, der Ihren @FORGENAME at -"
+#~ "Benutzer-E-Mail-Umleiter beherbergen wird."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "@FORGENAME at -Administrator-Anmeldung:"
 

Modified: trunk/src/debian/dsf-po/es.po
===================================================================
--- trunk/src/debian/dsf-po/es.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/es.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -31,7 +31,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.7~rc2-7\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2009-04-15 14:37+0200\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -42,88 +42,52 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Servidor de la consola:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "shell accounts."
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
-msgstr ""
-"Introduzca el nombre del servidor que albergará las cuentas de la consola de "
-"@FORGENAME at ."
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "El nombre de dominio o subdominio de @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Servidor de descargas:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "packages."
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Introduzca el nombre del servidor que albergará los paquetes de @FORGENAME at ."
+"Introduzca el dominio que albergará la instalación de @FORGENAME at . Algunos "
+"servicios (scm, lists, etc.) tendrán su propio subdominio en ese dominio."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid "It should not be the same as the main @FORGENAME@ host."
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "No debería ser igual al de la máquina principal de @FORGENAME at ."
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nombre del sistema de @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Dirección IP:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the IP address of the server that will host the @FORGENAME@ "
-#| "installation."
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
 msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Introduzca la dirección IP del servidor que albergará la instalación de "
-"@FORGENAME at ."
+"Introduzca el nombre del sistema de @FORGENAME at . Se utiliza en varios sitios "
+"del sistema."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Es necesario para la configuración del servidor virtual de Apache."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -131,7 +95,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -145,7 +109,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -153,23 +117,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmación de la contraseña:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Escriba nuevamente la contraseña para su confirmación."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -179,7 +185,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -196,7 +202,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -207,464 +213,312 @@
 "que todos los directorios web de los proyectos están en el mismo servidor y "
 "que tiene un único servidor para SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "¿Desea borrar los correos enviados a ${noreply}?"
+#, fuzzy
+#~| msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Dirección de correo electrónico del administrador de @FORGENAME@:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ envía y recibe muchos correos electrónicos hacia y desde la "
-"dirección «${noreply}»."
+#~| msgid ""
+#~| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~| "site. It will be used when problems occur."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Introduzca la dirección de correo electrónico del administrador de "
+#~ "@FORGENAME@ de este sitio. Se utilizará en caso de que ocurra un problema."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Los correos electrónicos que se envíen a esa dirección se deberían "
-"redireccionar a un agujero negro («/dev/null»), a menos que esa dirección "
-"tenga otro uso."
+#~ msgid "Download server:"
+#~ msgstr "Servidor de descargas:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "El nombre de dominio o subdominio de @FORGENAME@:"
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Introduzca el nombre del servidor que albergará los paquetes de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Introduzca el dominio que albergará la instalación de @FORGENAME at . Algunos "
-"servicios (scm, lists, etc.) tendrán su propio subdominio en ese dominio."
+#~| msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "No debería ser igual al de la máquina principal de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-#, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Dirección de correo electrónico del administrador de @FORGENAME@:"
+#~ msgid "Database server:"
+#~ msgstr "Servidor de bases de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
-#| "site. It will be used when problems occur."
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Introduzca la dirección de correo electrónico del administrador de "
-"@FORGENAME@ de este sitio. Se utilizará en caso de que ocurra un problema."
+#~| msgid ""
+#~| "Please enter the IP address (or hostname) of the server that will host "
+#~| "the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Introduzca la dirección IP (o nombre de la máquina) del servidor que "
+#~ "alberga la base de datos de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Nombre del sistema de @FORGENAME@:"
+#~ msgid "Database name:"
+#~ msgstr "Nombre de la base de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Introduzca el nombre del sistema de @FORGENAME at . Se utiliza en varios sitios "
-"del sistema."
+#~| msgid ""
+#~| "Please enter the name of the database that will host the @FORGENAME@ "
+#~| "database."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Introduzca el nombre de la base de datos que albergará la base de datos "
+#~ "de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Servidor de bases de datos:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Nombre de usuario del administrador de la base de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the IP address (or hostname) of the server that will host "
-#| "the @FORGENAME@ database."
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Introduzca la dirección IP (o nombre de la máquina) del servidor que alberga "
-"la base de datos de @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the username of the database administrator for the server "
+#~| "that will host the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Introduzca el nombre de usuario del administrador de la base de datos del "
+#~ "servidor en el que se albergará la base de datos de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Nombre de la base de datos:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Contraseña de la base de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ "
-#| "database."
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Introduzca el nombre de la base de datos que albergará la base de datos de "
-"@FORGENAME at ."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "Las conexiones al sistema de la base de datos se autentican con una "
+#~ "contraseña."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Nombre de usuario del administrador de la base de datos:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Escriba la contraseña de conexión."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
+#~ msgid "IP address:"
+#~ msgstr "Dirección IP:"
+
 #, fuzzy
-#| msgid ""
-#| "Please enter the username of the database administrator for the server "
-#| "that will host the @FORGENAME@ database."
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Introduzca el nombre de usuario del administrador de la base de datos del "
-"servidor en el que se albergará la base de datos de @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~| "installation."
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Introduzca la dirección IP del servidor que albergará la instalación de "
+#~ "@FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Contraseña de la base de datos:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Es necesario para la configuración del servidor virtual de Apache."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"Las conexiones al sistema de la base de datos se autentican con una "
-"contraseña."
+#~ msgid "Shell server:"
+#~ msgstr "Servidor de la consola:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Escriba la contraseña de conexión."
-
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Introduzca el nombre del servidor que albergará los paquetes de @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Introduzca el nombre del servidor que albergará las cuentas de la consola "
+#~ "de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID del grupo de administración de las noticias:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Servidor de las listas de correo:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ "
-#| "main page. This group's ID must not be 1. This should be changed only if "
-#| "you upgrade from a previous version and want to keep the data."
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Los miembros del grupo de administradores de noticias pueden aprobar nuevas "
-"noticias en la página principal de @FORGENAME at . El identificador de este "
-"grupo no debe ser «1». Esto se debería cambiar sólo si actualiza desde una "
-"versión previa y quiere mantener los datos."
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "mailing lists."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Introduzca el nombre del servidor que albergará las listas de correo de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID del grupo de administración de estadísticas:"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Introduzca el nombre del servidor que albergará las cuentas de la consola "
+#~ "de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID del grupo de administradores de las calificaciones comunitarias:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID del grupo de administración de las noticias:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Servidor de las listas de correo:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "mailing lists."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Introduzca el nombre del servidor que albergará las listas de correo de "
-"@FORGENAME at ."
+#~| msgid ""
+#~| "The members of the news admin group can approve news for the @FORGENAME@ "
+#~| "main page. This group's ID must not be 1. This should be changed only if "
+#~| "you upgrade from a previous version and want to keep the data."
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Los miembros del grupo de administradores de noticias pueden aprobar "
+#~ "nuevas noticias en la página principal de @FORGENAME at . El identificador "
+#~ "de este grupo no debe ser «1». Esto se debería cambiar sólo si actualiza "
+#~ "desde una versión previa y quiere mantener los datos."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "shell accounts."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Introduzca el nombre del servidor que albergará las cuentas de la consola de "
-"@FORGENAME at ."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID del grupo de administración de estadísticas:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Servidor de reenvío de los correos de usuarios:"
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID del grupo de administradores de las calificaciones comunitarias:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Introduzca el nombre del servidor que albergará el redirector de los correos "
-"electrónicos de usuarios de @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Introduzca el nombre del servidor que albergará los paquetes de "
+#~ "@FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Inglés"
+#~ msgid "English"
+#~ msgstr "Inglés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Búlgaro"
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Catalán"
+#~ msgid "Catalan"
+#~ msgstr "Catalán"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Chino (Tradicional)"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Chino (Tradicional)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holandés"
+#~ msgid "Dutch"
+#~ msgstr "Holandés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Francés"
+#~ msgid "French"
+#~ msgstr "Francés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Alemán"
+#~ msgid "German"
+#~ msgstr "Alemán"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Griego"
+#~ msgid "Greek"
+#~ msgstr "Griego"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebreo"
+#~ msgid "Hebrew"
+#~ msgstr "Hebreo"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesio"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesio"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italiano"
+#~ msgid "Italian"
+#~ msgstr "Italiano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japonés"
+#~ msgid "Japanese"
+#~ msgstr "Japonés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Coreano"
+#~ msgid "Korean"
+#~ msgstr "Coreano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latín"
+#~ msgid "Latin"
+#~ msgstr "Latín"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Noruego"
+#~ msgid "Norwegian"
+#~ msgstr "Noruego"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polaco"
+#~ msgid "Polish"
+#~ msgstr "Polaco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasileño)"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugués (Brasileño)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugués"
+#~ msgid "Portuguese"
+#~ msgstr "Portugués"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Ruso"
+#~ msgid "Russian"
+#~ msgstr "Ruso"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Chino (Simplificado)"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Chino (Simplificado)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Español"
+#~ msgid "Spanish"
+#~ msgstr "Español"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Sueco"
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Tailandés"
+#~ msgid "Thai"
+#~ msgstr "Tailandés"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Inglés [Idioma predeterminado]"
+#~ msgid "English[ Default language]"
+#~ msgstr "Inglés [Idioma predeterminado]"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Idioma predeterminado:"
+#~ msgid "Default language:"
+#~ msgstr "Idioma predeterminado:"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Elija el idioma predeterminado para las páginas web."
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Elija el idioma predeterminado para las páginas web."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Tema predeterminado:"
+#~ msgid "Default theme:"
+#~ msgstr "Tema predeterminado:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Elija el tema predeterminado para las páginas web. Debe ser un nombre válido."
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Elija el tema predeterminado para las páginas web. Debe ser un nombre "
+#~ "válido."
 
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "¿Desea borrar los correos enviados a ${noreply}?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ envía y recibe muchos correos electrónicos hacia y desde la "
+#~ "dirección «${noreply}»."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Los correos electrónicos que se envíen a esa dirección se deberían "
+#~ "redireccionar a un agujero negro («/dev/null»), a menos que esa dirección "
+#~ "tenga otro uso."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Servidor de reenvío de los correos de usuarios:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Introduzca el nombre del servidor que albergará el redirector de los "
+#~ "correos electrónicos de usuarios de @FORGENAME at ."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Usuario del administrador de @FORGENAME@:"

Modified: trunk/src/debian/dsf-po/fi.po
===================================================================
--- trunk/src/debian/dsf-po/fi.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/fi.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2008-03-24 17:41+0200\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -15,84 +15,53 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Komentorivipalvelin:"
+#: ../dsf-in/common.templates:2001
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "@FORGENAME at n verkkotunnus tai aliverkkotunnus:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "shell accounts."
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
+"Anna @FORGENAME at -asennuksen verkkotunnus. Joillekin palveluille "
+"(versionhallinta, listat, jne.) annetaan oma aliverkkotunnus tämän "
+"verkkotunnuksen alta."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Latauspalvelin:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Anna @FORGENAME at -paketteja isännöivän palvelimen verkkonimi."
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME at n järjestelmänimi:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid "It should not be the same as the main @FORGENAME@ host."
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Tämän ei tulisi olla @FORGENAME at n pääpalvelin."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-osoite:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-#, fuzzy
 #| msgid ""
-#| "Please enter the IP address of the server that will host the @FORGENAME@ "
-#| "installation."
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
 msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
-msgstr "Anna @FORGENAME at -asennusta isännöivän palvelimen IP-osoite."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Anna @FORGENAME at -järjestelmän nimi. Tätä käytetään eri paikoissa ympäri "
+"järjestelmää."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Tätä tarvitaan Apachen näennäiskoneiden asetukseen."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -100,7 +69,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -114,7 +83,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -122,23 +91,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Salasanan vahvistus:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Anna salasana uudestaan vahvistukseksi."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -148,7 +159,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -165,7 +176,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -176,455 +187,295 @@
 "projektien verkkohakemistot ovat samalla palvelimella yhden "
 "versionhallintapalvelimen kanssa."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr ""
-"Haluatko, että osoitteeseen ${noreply} tuleva sähköposti heitetään pois?"
+#, fuzzy
+#~| msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "@FORGENAME at n ylläpidon sähköpostiosoite:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ lähettää ja vastaanottaa paljon sähköpostia osoitteen "
-"”${noreply}” kautta."
+#~| msgid ""
+#~| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~| "site. It will be used when problems occur."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Anna @FORGENAME at n ylläpidon sähköpostiosoite. Tätä käytetään, kun "
+#~ "ongelmia ilmaantuu."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Tuohon osoitteeseen tuleva sähköposti tulisi ohjata mustaan aukkoon (/dev/"
-"null), jos osoitteelle ei ole muuta käyttöä."
+#~ msgid "Download server:"
+#~ msgstr "Latauspalvelin:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "@FORGENAME at n verkkotunnus tai aliverkkotunnus:"
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr "Anna @FORGENAME at -paketteja isännöivän palvelimen verkkonimi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Anna @FORGENAME at -asennuksen verkkotunnus. Joillekin palveluille "
-"(versionhallinta, listat, jne.) annetaan oma aliverkkotunnus tämän "
-"verkkotunnuksen alta."
+#~| msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Tämän ei tulisi olla @FORGENAME at n pääpalvelin."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-#, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "@FORGENAME at n ylläpidon sähköpostiosoite:"
+#~ msgid "Database server:"
+#~ msgstr "Tietokantapalvelin:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
-#| "site. It will be used when problems occur."
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Anna @FORGENAME at n ylläpidon sähköpostiosoite. Tätä käytetään, kun ongelmia "
-"ilmaantuu."
+#~| msgid ""
+#~| "Please enter the IP address (or hostname) of the server that will host "
+#~| "the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Anna @FORGENAME at n tietokantaa isännöivän palvelimen IP-osoite (tai "
+#~ "verkkonimi)."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "@FORGENAME at n järjestelmänimi:"
+#~ msgid "Database name:"
+#~ msgstr "Tietokannan nimi:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Anna @FORGENAME at -järjestelmän nimi. Tätä käytetään eri paikoissa ympäri "
-"järjestelmää."
+#~| msgid ""
+#~| "Please enter the name of the database that will host the @FORGENAME@ "
+#~| "database."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr "Anna @FORGENAME at n tietokantaa isännöivän tietokannan nimi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Tietokantapalvelin:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Tietokannan ylläpitotunnus:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the IP address (or hostname) of the server that will host "
-#| "the @FORGENAME@ database."
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Anna @FORGENAME at n tietokantaa isännöivän palvelimen IP-osoite (tai "
-"verkkonimi)."
+#~| msgid ""
+#~| "Please enter the username of the database administrator for the server "
+#~| "that will host the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Anna @FORGENAME at n tietokantaa isännöivän palvelimen tietokannan "
+#~ "ylläpitokäyttäjätunnus."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Tietokannan nimi:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Tietokannan salasana:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ "
-#| "database."
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr "Anna @FORGENAME at n tietokantaa isännöivän tietokannan nimi."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Yhteydet tietokantaan todennetaan salasanalla."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Tietokannan ylläpitotunnus:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Anna yhteyssalasana."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
+#~ msgid "IP address:"
+#~ msgstr "IP-osoite:"
+
 #, fuzzy
-#| msgid ""
-#| "Please enter the username of the database administrator for the server "
-#| "that will host the @FORGENAME@ database."
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Anna @FORGENAME at n tietokantaa isännöivän palvelimen tietokannan "
-"ylläpitokäyttäjätunnus."
+#~| msgid ""
+#~| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~| "installation."
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr "Anna @FORGENAME at -asennusta isännöivän palvelimen IP-osoite."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Tietokannan salasana:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Tätä tarvitaan Apachen näennäiskoneiden asetukseen."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Yhteydet tietokantaan todennetaan salasanalla."
+#~ msgid "Shell server:"
+#~ msgstr "Komentorivipalvelin:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Anna yhteyssalasana."
-
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Anna @FORGENAME at n paketteja isännöivän palvelimen verkkonimi."
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Uutisten ylläpitäjäryhmän ID:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Postituslistapalvelin:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ "
-#| "main page. This group's ID must not be 1. This should be changed only if "
-#| "you upgrade from a previous version and want to keep the data."
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Uutisten ylläpitäjäryhmän jäsenet voivat hyväksyä uutisia @FORGENAME at n "
-"pääsivulle. Tämän ryhmän ID:n ei tule olla 1. Tätä tulisi muuttaa vain, jos "
-"päivität aikaisemmasta versiosta ja haluat säilyttää tiedot."
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "mailing lists."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr "Anna @FORGENAME at n postituslistoja isännöivän palvelimen verkkonimi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Tilastojen ylläpitäjäryhmän ID:"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Vertaisarvioiden ylläpitäjäryhmän ID:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "Uutisten ylläpitäjäryhmän ID:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Postituslistapalvelin:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "mailing lists."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr "Anna @FORGENAME at n postituslistoja isännöivän palvelimen verkkonimi."
+#~| msgid ""
+#~| "The members of the news admin group can approve news for the @FORGENAME@ "
+#~| "main page. This group's ID must not be 1. This should be changed only if "
+#~| "you upgrade from a previous version and want to keep the data."
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Uutisten ylläpitäjäryhmän jäsenet voivat hyväksyä uutisia @FORGENAME at n "
+#~ "pääsivulle. Tämän ryhmän ID:n ei tule olla 1. Tätä tulisi muuttaa vain, "
+#~ "jos päivität aikaisemmasta versiosta ja haluat säilyttää tiedot."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "shell accounts."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Tilastojen ylläpitäjäryhmän ID:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Käyttäjäpostien edelleenohjaajapalvelin:"
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "Vertaisarvioiden ylläpitäjäryhmän ID:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Anna @FORGENAME at n käyttäjäpostien edelleenohjaajaa isännöivän palvelimen "
-"verkkonimi."
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr "Anna @FORGENAME at n paketteja isännöivän palvelimen verkkonimi."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "englanti"
+#~ msgid "English"
+#~ msgstr "englanti"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "bulgaria"
+#~ msgid "Bulgarian"
+#~ msgstr "bulgaria"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "katalaani"
+#~ msgid "Catalan"
+#~ msgstr "katalaani"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "kiina (perinteinen)"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "kiina (perinteinen)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "hollanti"
+#~ msgid "Dutch"
+#~ msgstr "hollanti"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "esperanto"
+#~ msgid "Esperanto"
+#~ msgstr "esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "ranska"
+#~ msgid "French"
+#~ msgstr "ranska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "saksa"
+#~ msgid "German"
+#~ msgstr "saksa"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "kreikka"
+#~ msgid "Greek"
+#~ msgstr "kreikka"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "heprea"
+#~ msgid "Hebrew"
+#~ msgstr "heprea"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "indonesia"
+#~ msgid "Indonesian"
+#~ msgstr "indonesia"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "italia"
+#~ msgid "Italian"
+#~ msgstr "italia"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "japani"
+#~ msgid "Japanese"
+#~ msgstr "japani"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "korea"
+#~ msgid "Korean"
+#~ msgstr "korea"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "latina"
+#~ msgid "Latin"
+#~ msgstr "latina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "norja"
+#~ msgid "Norwegian"
+#~ msgstr "norja"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "puola"
+#~ msgid "Polish"
+#~ msgstr "puola"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "portugali (Brasilian)"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "portugali (Brasilian)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "portugali"
+#~ msgid "Portuguese"
+#~ msgstr "portugali"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "venäjä"
+#~ msgid "Russian"
+#~ msgstr "venäjä"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "kiina (yksinkertaistettu)"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "kiina (yksinkertaistettu)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "espanja"
+#~ msgid "Spanish"
+#~ msgstr "espanja"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "ruotsi"
+#~ msgid "Swedish"
+#~ msgstr "ruotsi"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "thai"
+#~ msgid "Thai"
+#~ msgstr "thai"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "englanti"
+#~ msgid "English[ Default language]"
+#~ msgstr "englanti"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Oletuskieli:"
+#~ msgid "Default language:"
+#~ msgstr "Oletuskieli:"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Valitse verkkosivujen oletuskieli."
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Valitse verkkosivujen oletuskieli."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Oletusteema:"
+#~ msgid "Default theme:"
+#~ msgstr "Oletusteema:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr "Valitse verkkosivujen oletusteema. Tämän tulee olla käypä nimi."
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr "Valitse verkkosivujen oletusteema. Tämän tulee olla käypä nimi."
 
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr ""
+#~ "Haluatko, että osoitteeseen ${noreply} tuleva sähköposti heitetään pois?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ lähettää ja vastaanottaa paljon sähköpostia osoitteen "
+#~ "”${noreply}” kautta."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Tuohon osoitteeseen tuleva sähköposti tulisi ohjata mustaan aukkoon (/dev/"
+#~ "null), jos osoitteelle ei ole muuta käyttöä."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Käyttäjäpostien edelleenohjaajapalvelin:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Anna @FORGENAME at n käyttäjäpostien edelleenohjaajaa isännöivän palvelimen "
+#~ "verkkonimi."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "@FORGENAME at n ylläpitotunnus:"

Modified: trunk/src/debian/dsf-po/fr.po
===================================================================
--- trunk/src/debian/dsf-po/fr.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/fr.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
-"PO-Revision-Date: 2009-12-29 13:36+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
+"PO-Revision-Date: 2012-05-29 18:33+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "Language: fr\n"
@@ -20,118 +20,118 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Serveur interactif (« shell server ») :"
+#: ../dsf-in/common.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Nom de domaine ou de sous-domaine @FORGENAME@ :"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Veuillez indiquer le nom du serveur qui hébergera les comptes interactifs "
-"@FORGENAME at ."
+"Veuillez indiquer le nom de domaine qui hébergera le serveur @FORGENAME at . "
+"Certains services auront leur propre sous-domaine à l'intérieur de ce "
+"domaine (scm, lists, etc.)."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Serveur de téléchargement :"
+#: ../dsf-in/common.templates:3001
+msgid "@FORGENAME@ system name:"
+msgstr "Nom du système @FORGENAME@ :"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Veuillez indiquer le nom du serveur qui hébergera les paquets de @FORGENAME at ."
+"Veuillez indiquer le nom du système @FORGENAME at . Il est utilisé dans "
+"plusieurs parties du serveur."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Ce nom devrait être différent du nom d'hôte principal de @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Adresse IP :"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
-msgstr "Veuillez indiquer l'adresse IP du serveur qui hébergera @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr ""
-"Cette information est indispensable à la configuration des hôtes virtuels "
-"pour Apache."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Mot de passe de l'administrateur de @FORGENAME@ :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#, fuzzy
-#| msgid ""
-#| "The @FORGENAME@ administrator account will have full privileges on the "
-#| "system. It will be used to approve the creation of new projects."
+#: ../dsf-in/db-postgresql.templates:2001
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "forge. It will be used to approve the creation of new projects."
-msgstr ""
-"Le compte d'administration de @FORGENAME@ aura tous les privilèges sur le "
-"système @FORGENAME at . Il servira à approuver la création de projets."
+msgstr "Le compte d'administration de @FORGENAME@ aura tous les privilèges sur la forge. Il servira à approuver la création de projets."
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#, fuzzy
-#| msgid "Please choose the password for this account."
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "Please choose the password for this forge account."
 msgstr "Veuillez choisir le mot de passe de ce compte."
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Veuillez entrer à nouveau le mot de passe, pour confirmation."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr "installer la nouvelle version proposée par @PACKAGE@"
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr "conserver la version actuelle"
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr "afficher les différences entre les versions"
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr "afficher les différences côte à côte"
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr "suspendre ce processus pour examiner la situation"
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr "Que voulez-vous faire du ficher de configuration ${BASENAME}?"
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr "Le fichier de configuration ${FILE} doit être modifié pour permettre le fonctionnement de @PACKAGE@, mais il appartien au paquet postgresql."
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Souhaitez-vous une configuration DNS simplifiée ?"
 
@@ -139,7 +139,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -157,7 +157,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -168,409 +168,254 @@
 "choix n'apporte qu'une restriction : tous les répertoires web sont sur un "
 "seul serveur, ainsi que tous les entrepôts SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Faut-il supprimer les courriers pour ${noreply} ?"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Adresse électronique de l'administrateur @FORGENAME@ :"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ envoie fréquemment des courriers de et vers l'adresse "
-"« ${noreply} »."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Veuillez indiquer l'adresse de l'administrateur de @FORGENAME at . Elle est "
+#~ "utilisée quand un problème se produit."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Il est conseillé de rediriger les courriers adressés à cette adresse vers un "
-"trou noir (/dev/null), sauf si elle est utilisée par ailleurs."
+#~ msgid "Download server:"
+#~ msgstr "Serveur de téléchargement :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Nom de domaine ou de sous-domaine @FORGENAME@ :"
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Veuillez indiquer le nom du serveur qui hébergera les paquets de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Veuillez indiquer le nom de domaine qui hébergera le serveur @FORGENAME at . "
-"Certains services auront leur propre sous-domaine à l'intérieur de ce "
-"domaine (scm, lists, etc.)."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr ""
+#~ "Ce nom devrait être différent du nom d'hôte principal de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Adresse électronique de l'administrateur @FORGENAME@ :"
+#~ msgid "Database server:"
+#~ msgstr "Serveur de base de données :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Veuillez indiquer l'adresse de l'administrateur de @FORGENAME at . Elle est "
-"utilisée quand un problème se produit."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Veuillez indiquer l'adresse IP ou le nom du serveur qui hébergera la base "
+#~ "de données de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@/FusionForge system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Nom du système @FORGENAME@/FusionForge :"
+#~ msgid "Database name:"
+#~ msgstr "Nom de la base de données :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Veuillez indiquer le nom du système @FORGENAME at . Il est utilisé dans "
-"plusieurs parties du serveur."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr "Veuillez indiquer le nom de la base de données pour @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Serveur de base de données :"
+#~ msgid "Database administrator username:"
+#~ msgstr "Identifiant de l'administrateur du serveur de bases de données :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Veuillez indiquer l'adresse IP ou le nom du serveur qui hébergera la base de "
-"données de @FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Veuillez indiquer l'identifiant de l'administrateur du serveur de bases "
+#~ "de données qui hébergera la base de données de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Nom de la base de données :"
+#~ msgid "Password used for the database:"
+#~ msgstr "Mot de passe de connexion au serveur de bases de données :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr "Veuillez indiquer le nom de la base de données pour @FORGENAME at ."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "Les connexions au serveur de bases de données sont protégées par un mot "
+#~ "de passe."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Identifiant de l'administrateur du serveur de bases de données :"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Veuillez choisir ce mot de passe de connexion."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Veuillez indiquer l'identifiant de l'administrateur du serveur de bases de "
-"données qui hébergera la base de données de @FORGENAME at ."
+#~ msgid "IP address:"
+#~ msgstr "Adresse IP :"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Mot de passe de connexion au serveur de bases de données :"
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Veuillez indiquer l'adresse IP du serveur qui hébergera @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"Les connexions au serveur de bases de données sont protégées par un mot de "
-"passe."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr ""
+#~ "Cette information est indispensable à la configuration des hôtes virtuels "
+#~ "pour Apache."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Veuillez choisir ce mot de passe de connexion."
+#~ msgid "Shell server:"
+#~ msgstr "Serveur interactif (« shell server ») :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Veuillez indiquer le nom du serveur qui hébergera les paquets de @FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Veuillez indiquer le nom du serveur qui hébergera les comptes interactifs "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Numéro du groupe (GID) d'administration des nouvelles :"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Serveur de listes de diffusion :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Les membres du groupe d'administration des nouvelles peuvent approuver des "
-"nouvelles pour les publier sur la page d'accueil de @FORGENAME at . Le numéro "
-"de ce groupe ne doit pas être 1. Cette information n'est requise que si vous "
-"mettez à jour une installation précédente et que vous voulez garder vos "
-"données."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Veuillez indiquer le nom d'hôte du serveur qui hébergera les listes de "
+#~ "diffusion de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Numéro du groupe d'administration des statistiques :"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Veuillez indiquer le nom d'hôte du serveur qui hébergera les comptes "
+#~ "interactifs @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Numéro du groupe d'administration des notations (« rating ») :"
+#~ msgid "News administrative group ID:"
+#~ msgstr "Numéro du groupe (GID) d'administration des nouvelles :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Serveur de listes de diffusion :"
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Les membres du groupe d'administration des nouvelles peuvent approuver "
+#~ "des nouvelles pour les publier sur la page d'accueil de @FORGENAME at . Le "
+#~ "numéro de ce groupe ne doit pas être 1. Cette information n'est requise "
+#~ "que si vous mettez à jour une installation précédente et que vous voulez "
+#~ "garder vos données."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Veuillez indiquer le nom d'hôte du serveur qui hébergera les listes de "
-"diffusion de @FORGENAME at ."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Numéro du groupe d'administration des statistiques :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Veuillez indiquer le nom d'hôte du serveur qui hébergera les comptes "
-"interactifs @FORGENAME at ."
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "Numéro du groupe d'administration des notations (« rating ») :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Redirecteur des courriers des utilisateurs :"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Veuillez indiquer le nom du serveur qui hébergera les paquets de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Veuillez indiquer le nom du serveur qui hébergera le redirecteur du courriel "
-"utilisateurs de @FORGENAME at ."
+#~ msgid "English"
+#~ msgstr "French"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "French"
+#~ msgid "Bulgarian"
+#~ msgstr "bulgare"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "bulgare"
+#~ msgid "Catalan"
+#~ msgstr "catalan"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "catalan"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "chinois traditionnel"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "chinois traditionnel"
+#~ msgid "Dutch"
+#~ msgstr "néerlandais"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "néerlandais"
+#~ msgid "Esperanto"
+#~ msgstr "espéranto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "espéranto"
+#~ msgid "French"
+#~ msgstr "français"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "français"
+#~ msgid "German"
+#~ msgstr "allemand"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "allemand"
+#~ msgid "Greek"
+#~ msgstr "grec"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "grec"
+#~ msgid "Hebrew"
+#~ msgstr "hébreu"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "hébreu"
+#~ msgid "Indonesian"
+#~ msgstr "indonésien"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "indonésien"
+#~ msgid "Italian"
+#~ msgstr "italien"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "italien"
+#~ msgid "Japanese"
+#~ msgstr "japonais"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "japonais"
+#~ msgid "Korean"
+#~ msgstr "coréen"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "coréen"
+#~ msgid "Latin"
+#~ msgstr "latin"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "latin"
+#~ msgid "Norwegian"
+#~ msgstr "norvégien"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "norvégien"
+#~ msgid "Polish"
+#~ msgstr "polonais"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "polonais"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "portugais du Brésil"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "portugais du Brésil"
+#~ msgid "Portuguese"
+#~ msgstr "portugais"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "portugais"
+#~ msgid "Russian"
+#~ msgstr "russe"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "russe"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "chinois simplifié"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "chinois simplifié"
+#~ msgid "Spanish"
+#~ msgstr "espagnol"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "espagnol"
+#~ msgid "Swedish"
+#~ msgstr "suédois"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "suédois"
+#~ msgid "Thai"
+#~ msgstr "thaï"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "thaï"
+#~ msgid "English[ Default language]"
+#~ msgstr "French"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "French"
+#~ msgid "Default language:"
+#~ msgstr "Langue par défaut :"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Langue par défaut :"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Veuillez choisir la langue par défaut des pages web."
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Veuillez choisir la langue par défaut des pages web."
+#~ msgid "Default theme:"
+#~ msgstr "Thème par défaut :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Thème par défaut :"
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Veuillez choisir le thème par défaut des pages web. Veillez à indiquer un "
+#~ "nom valable."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Veuillez choisir le thème par défaut des pages web. Veillez à indiquer un "
-"nom valable."
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Faut-il supprimer les courriers pour ${noreply} ?"
 
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ envoie fréquemment des courriers de et vers l'adresse "
+#~ "« ${noreply} »."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Il est conseillé de rediriger les courriers adressés à cette adresse vers "
+#~ "un trou noir (/dev/null), sauf si elle est utilisée par ailleurs."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Redirecteur des courriers des utilisateurs :"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Veuillez indiquer le nom du serveur qui hébergera le redirecteur du "
+#~ "courriel utilisateurs de @FORGENAME at ."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Identifiant de l'administrateur de @FORGENAME@ :"
 

Modified: trunk/src/debian/dsf-po/gl.po
===================================================================
--- trunk/src/debian/dsf-po/gl.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/gl.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2008-03-25 03:47+0000\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -17,87 +17,53 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Servidor de shell:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "shell accounts."
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
-msgstr ""
-"Introduza o nome do servidor que ha hospedar as contas shell de @FORGENAME at ."
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Nome de dominio ou subdominio de @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Servidor de descargas:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "packages."
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
+"Introduza o dominio que ha hospedar a instalación de @FORGENAME at . Algúns "
+"servizos (scm, listas, etc.) han ter o seu propio subdominio dentro dese "
+"dominio."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid "It should not be the same as the main @FORGENAME@ host."
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Non debería ser o mesmo que o servidor principal de @FORGENAME at ."
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nome do sistema @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Enderezo IP:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the IP address of the server that will host the @FORGENAME@ "
-#| "installation."
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
 msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Introduza o enderezo IP do servidor que ha hospedar a instalación de "
-"@FORGENAME at ."
+"Introduza o nome do sistema @FORGENAME at . Emprégase en varios lugares do "
+"sistema."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Isto é preciso para configurar a hospedaxe virtual de Apache."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -105,7 +71,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -119,7 +85,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -127,23 +93,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmación do contrasinal:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Volva introducir o contrasinal para confirmalo."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -153,7 +161,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -169,7 +177,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -179,462 +187,308 @@
 "os servidores dos proxectos; só supón que tódolos directorios web dos "
 "proxectos están no mesmo servidor cun só servidor para SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "¿Quere que se descarten as mensaxes enviadas a ${noreply}?"
+#, fuzzy
+#~| msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Enderezo de email do administrador de @FORGENAME@:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ envía e recibe moito email desde e para o enderezo "
-"\"${noreply}\"."
+#~| msgid ""
+#~| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~| "site. It will be used when problems occur."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Introduza o enderezo de email do administrador de @FORGENAME@ deste "
+#~ "sitio. Hase empregar se aparecen problemas."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"O email dirixido a ese enderezo debería ser enviado a un burato negro (/dev/"
-"null), a menos que empregue ese enderezo para outra cousa."
+#~ msgid "Download server:"
+#~ msgstr "Servidor de descargas:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Nome de dominio ou subdominio de @FORGENAME@:"
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Introduza o dominio que ha hospedar a instalación de @FORGENAME at . Algúns "
-"servizos (scm, listas, etc.) han ter o seu propio subdominio dentro dese "
-"dominio."
+#~| msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Non debería ser o mesmo que o servidor principal de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-#, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Enderezo de email do administrador de @FORGENAME@:"
+#~ msgid "Database server:"
+#~ msgstr "Servidor de bases de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
-#| "site. It will be used when problems occur."
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Introduza o enderezo de email do administrador de @FORGENAME@ deste sitio. "
-"Hase empregar se aparecen problemas."
+#~| msgid ""
+#~| "Please enter the IP address (or hostname) of the server that will host "
+#~| "the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Introduza o enderezo IP (ou nome) do servidor que ha hospedar a base de "
+#~ "datos de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Nome do sistema @FORGENAME@:"
+#~ msgid "Database name:"
+#~ msgstr "Nome da base de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Introduza o nome do sistema @FORGENAME at . Emprégase en varios lugares do "
-"sistema."
+#~| msgid ""
+#~| "Please enter the name of the database that will host the @FORGENAME@ "
+#~| "database."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Introduza o nome da base de datos que ha hospedar as contas shell de "
+#~ "@FORGENAME@"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Servidor de bases de datos:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Nome de usuario do administrador da base de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the IP address (or hostname) of the server that will host "
-#| "the @FORGENAME@ database."
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Introduza o enderezo IP (ou nome) do servidor que ha hospedar a base de "
-"datos de @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the username of the database administrator for the server "
+#~| "that will host the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Introduza o nome de usuario do administrador de bases de datos do "
+#~ "servidor que ha hospedar a base de datos de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Nome da base de datos:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Contrasinal para a base de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ "
-#| "database."
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Introduza o nome da base de datos que ha hospedar as contas shell de "
-"@FORGENAME@"
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "As conexións ao sistema de bases de datos van autenticadas cun "
+#~ "contrasinal."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Nome de usuario do administrador da base de datos:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Escolla o contrasinal para a conexión."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
+#~ msgid "IP address:"
+#~ msgstr "Enderezo IP:"
+
 #, fuzzy
-#| msgid ""
-#| "Please enter the username of the database administrator for the server "
-#| "that will host the @FORGENAME@ database."
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Introduza o nome de usuario do administrador de bases de datos do servidor "
-"que ha hospedar a base de datos de @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~| "installation."
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Introduza o enderezo IP do servidor que ha hospedar a instalación de "
+#~ "@FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Contrasinal para a base de datos:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Isto é preciso para configurar a hospedaxe virtual de Apache."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"As conexións ao sistema de bases de datos van autenticadas cun contrasinal."
+#~ msgid "Shell server:"
+#~ msgstr "Servidor de shell:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Escolla o contrasinal para a conexión."
-
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Introduza o nome do servidor que ha hospedar as contas shell de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID do grupo de administradores de novas:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Servidor de listas de correo:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ "
-#| "main page. This group's ID must not be 1. This should be changed only if "
-#| "you upgrade from a previous version and want to keep the data."
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Os membros do grupo de administradores de novas poden aprobar as novas da "
-"páxina principal de @FORGENAME at . Este ID de grupo non debe ser 1. Só se "
-"debería cambiar se está a se actualizar dunha versión anterior e quere "
-"conservar os datos."
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "mailing lists."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Introduza o nome do servidor que ha hospedar as listas de correo de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID do grupo de administradores de estatísticas:"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Introduza o nome do servidor que ha hospedar as contas shell de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID do grupo de administradores de calificacións de iguais:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID do grupo de administradores de novas:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Servidor de listas de correo:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "mailing lists."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Introduza o nome do servidor que ha hospedar as listas de correo de "
-"@FORGENAME at ."
+#~| msgid ""
+#~| "The members of the news admin group can approve news for the @FORGENAME@ "
+#~| "main page. This group's ID must not be 1. This should be changed only if "
+#~| "you upgrade from a previous version and want to keep the data."
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Os membros do grupo de administradores de novas poden aprobar as novas da "
+#~ "páxina principal de @FORGENAME at . Este ID de grupo non debe ser 1. Só se "
+#~ "debería cambiar se está a se actualizar dunha versión anterior e quere "
+#~ "conservar os datos."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "shell accounts."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Introduza o nome do servidor que ha hospedar as contas shell de @FORGENAME at ."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID do grupo de administradores de estatísticas:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Redirector de correo dos usuarios:"
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID do grupo de administradores de calificacións de iguais:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Introduza o nome do servidor que ha hospedar o redirector do correo dos "
-"usuarios de @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Inglés"
+#~ msgid "English"
+#~ msgstr "Inglés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Búlgaro"
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Catalán"
+#~ msgid "Catalan"
+#~ msgstr "Catalán"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Chinés (Tradicional)"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Chinés (Tradicional)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holandés"
+#~ msgid "Dutch"
+#~ msgstr "Holandés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Francés"
+#~ msgid "French"
+#~ msgstr "Francés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Alemán"
+#~ msgid "German"
+#~ msgstr "Alemán"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Grego"
+#~ msgid "Greek"
+#~ msgstr "Grego"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebreo"
+#~ msgid "Hebrew"
+#~ msgstr "Hebreo"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesio"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesio"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italiano"
+#~ msgid "Italian"
+#~ msgstr "Italiano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Xaponés"
+#~ msgid "Japanese"
+#~ msgstr "Xaponés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Coreano"
+#~ msgid "Korean"
+#~ msgstr "Coreano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latín"
+#~ msgid "Latin"
+#~ msgstr "Latín"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Noruegués"
+#~ msgid "Norwegian"
+#~ msgstr "Noruegués"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polaco"
+#~ msgid "Polish"
+#~ msgstr "Polaco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasil)"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugués (Brasil)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugués"
+#~ msgid "Portuguese"
+#~ msgstr "Portugués"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Ruso"
+#~ msgid "Russian"
+#~ msgstr "Ruso"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Chinés (Simplificado)"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Chinés (Simplificado)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Español"
+#~ msgid "Spanish"
+#~ msgstr "Español"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Sueco"
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Thai"
+#~ msgid "Thai"
+#~ msgstr "Thai"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Inglés"
+#~ msgid "English[ Default language]"
+#~ msgstr "Inglés"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Idioma por defecto:"
+#~ msgid "Default language:"
+#~ msgstr "Idioma por defecto:"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Escolla o idioma por defecto para as páxinas web."
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Escolla o idioma por defecto para as páxinas web."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Tema por defecto:"
+#~ msgid "Default theme:"
+#~ msgstr "Tema por defecto:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Escolla o tema por defecto para as páxinas web. Debe ser un nome válido."
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Escolla o tema por defecto para as páxinas web. Debe ser un nome válido."
 
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "¿Quere que se descarten as mensaxes enviadas a ${noreply}?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ envía e recibe moito email desde e para o enderezo "
+#~ "\"${noreply}\"."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "O email dirixido a ese enderezo debería ser enviado a un burato negro (/"
+#~ "dev/null), a menos que empregue ese enderezo para outra cousa."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Redirector de correo dos usuarios:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Introduza o nome do servidor que ha hospedar o redirector do correo dos "
+#~ "usuarios de @FORGENAME at ."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Nome do usuario administrador de @FORGENAME@:"

Modified: trunk/src/debian/dsf-po/nl.po
===================================================================
--- trunk/src/debian/dsf-po/nl.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/nl.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2008-03-28 14:19+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -29,101 +29,61 @@
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Shell-server:"
+#: ../dsf-in/common.templates:2001
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "De @FORGENAME at -domeinnaam (of subdomeinnaam):"
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "shell accounts."
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -shellaccounts gaat "
-"aanbieden?"
+"Wat is het domein waarop uw @FORGENAME at -installatie gehost wordt? Sommige "
+"diensten (broncodebeheer, lijsten, ...) zullen hun eigen subdomein krijgen "
+"binnen dat domein."
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Downloadserver:"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Wat is de computernaam van de server waarop de @FORGENAME at -pakketten gehost "
-"gaan worden?"
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Naam van het @FORGENAME at -systeem:"
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
-#| msgid "It should not be the same as the main @FORGENAME@ host."
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Dit dient te verschillen van de hoofd- at FORGENAME@-server."
-
 #  Type: string
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-adres:"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the IP address of the server that will host the @FORGENAME@ "
-#| "installation."
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
 msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -installatie gaat "
-"hosten?"
+"Wat is de naam van het @FORGENAME at -systeem? Deze naam wordt op verschillende "
+"plaatsen in het systeem gebruikt."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Dit is nodig voor om de 'virtual hosting' van Apache in te stellen."
-
 #  Type: password
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -133,7 +93,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -149,7 +109,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -159,8 +119,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Wachtwoordbevestiging:"
 
@@ -168,18 +127,61 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Ter bevestiging dient het wachtwoord nogmaals ingevoerd te worden."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #  Type: boolean
 #  Description
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -191,7 +193,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -210,7 +212,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -221,566 +223,415 @@
 "dat alle project-webmappen op dezelfde server staan, en dat u een enkele "
 "server heeft voor bronbeheer (SCM)."
 
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Wilt u dat e-mail voor ${noreply} weggegooid wordt?"
-
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-#, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ verstuurt en ontvangt een heleboel e-mails van en naar  het "
-"adres '${noreply}'."
-
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Tenzij u dat adres voor iets anders gebruikt is het aan te raden om de e-"
-"mail naar dat adres om te leiden naar een zwart gat (/dev/null)."
-
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "De @FORGENAME at -domeinnaam (of subdomeinnaam):"
+#~| msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "E-mailadres van de @FORGENAME at -beheerder:"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Wat is het domein waarop uw @FORGENAME at -installatie gehost wordt? Sommige "
-"diensten (broncodebeheer, lijsten, ...) zullen hun eigen subdomein krijgen "
-"binnen dat domein."
+#~| msgid ""
+#~| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~| "site. It will be used when problems occur."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Wat is het e-mail-adres van de @FORGENAME at -beheerder op dit systeem? "
+#~ "Wordt gebruikt wanneer er problemen optreden."
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-#, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "E-mailadres van de @FORGENAME at -beheerder:"
+#~ msgid "Download server:"
+#~ msgstr "Downloadserver:"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
-#| "site. It will be used when problems occur."
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Wat is het e-mail-adres van de @FORGENAME at -beheerder op dit systeem? Wordt "
-"gebruikt wanneer er problemen optreden."
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server waarop de @FORGENAME at -pakketten "
+#~ "gehost gaan worden?"
 
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Naam van het @FORGENAME at -systeem:"
+#~| msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Dit dient te verschillen van de hoofd- at FORGENAME@-server."
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Wat is de naam van het @FORGENAME at -systeem? Deze naam wordt op verschillende "
-"plaatsen in het systeem gebruikt."
+#~ msgid "Database server:"
+#~ msgstr "Databaseserver:"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Databaseserver:"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the IP address (or hostname) of the server that will host "
-#| "the @FORGENAME@ database."
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Wat is het IP-adres (of de computernaam) van de server die de @FORGENAME at -"
-"database gaat hosten?"
+#~| msgid ""
+#~| "Please enter the IP address (or hostname) of the server that will host "
+#~| "the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Wat is het IP-adres (of de computernaam) van de server die de @FORGENAME at -"
+#~ "database gaat hosten?"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Databasenaam:"
+#~ msgid "Database name:"
+#~ msgstr "Databasenaam:"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ "
-#| "database."
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Wat is de naam van de database die als de @FORGENAME at -database gebruikt gaat "
-"worden?"
+#~| msgid ""
+#~| "Please enter the name of the database that will host the @FORGENAME@ "
+#~| "database."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Wat is de naam van de database die als de @FORGENAME at -database gebruikt "
+#~ "gaat worden?"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Gebruikersnaam van de databasebeheerder:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Gebruikersnaam van de databasebeheerder:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
 #, fuzzy
-#| msgid ""
-#| "Please enter the username of the database administrator for the server "
-#| "that will host the @FORGENAME@ database."
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Wat is de gebruikersnaam van de database-beheerder van de server die de "
-"@FORGENAME at -database gaat hosten?"
+#~| msgid ""
+#~| "Please enter the username of the database administrator for the server "
+#~| "that will host the @FORGENAME@ database."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Wat is de gebruikersnaam van de database-beheerder van de server die de "
+#~ "@FORGENAME at -database gaat hosten?"
 
 #  Type: password
 #  Description
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Databasewachtwoord:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Databasewachtwoord:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"Verbindingen met het databasesysteem worden geauthentificeerd via een "
-"wachtwoord."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "Verbindingen met het databasesysteem worden geauthentificeerd via een "
+#~ "wachtwoord."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Wat is het wachtwoord voor de verbinding?"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Wat is het wachtwoord voor de verbinding?"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#~ msgid "IP address:"
+#~ msgstr "IP-adres:"
+
+#  Type: string
+#  Description
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -pakketten gaat "
-"hosten?"
+#~| msgid ""
+#~| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~| "installation."
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -installatie gaat "
+#~ "hosten?"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Groep-ID van de nieuws-beheerdersgroep:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Dit is nodig voor om de 'virtual hosting' van Apache in te stellen."
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
+#~ msgid "Shell server:"
+#~ msgstr "Shell-server:"
+
+#  Type: string
+#  Description
 #, fuzzy
-#| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ "
-#| "main page. This group's ID must not be 1. This should be changed only if "
-#| "you upgrade from a previous version and want to keep the data."
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"De leden van de niews-beheerdersgroep kunnen nieuws voor de @FORGENAME at -"
-"hoofdpagina goedkeuren. Deze groep-ID mag niet 1 zijn. Dit optie is enkel "
-"van belang als u opwaardeerd van een eerdere versie en uw gegevens wilt "
-"bewaren."
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -shellaccounts "
+#~ "gaat aanbieden?"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Groep-ID van de statistiekbeheerdersgroep:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "E-maillijst-server:"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "groep-ID van de 'peer rating'-beheerdersgroep:"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "mailing lists."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -e-maillijsten "
+#~ "gaat hosten?"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "E-maillijst-server:"
-
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "mailing lists."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -e-maillijsten gaat "
-"hosten?"
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -shellaccounts "
+#~ "gaat aanbieden?"
 
+#~ msgid "News administrative group ID:"
+#~ msgstr "Groep-ID van de nieuws-beheerdersgroep:"
+
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "shell accounts."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -shellaccounts gaat "
-"aanbieden?"
+#~| msgid ""
+#~| "The members of the news admin group can approve news for the @FORGENAME@ "
+#~| "main page. This group's ID must not be 1. This should be changed only if "
+#~| "you upgrade from a previous version and want to keep the data."
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "De leden van de niews-beheerdersgroep kunnen nieuws voor de @FORGENAME at -"
+#~ "hoofdpagina goedkeuren. Deze groep-ID mag niet 1 zijn. Dit optie is enkel "
+#~ "van belang als u opwaardeerd van een eerdere versie en uw gegevens wilt "
+#~ "bewaren."
 
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Groep-ID van de statistiekbeheerdersgroep:"
+
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "De e-mail-doorstuur-server:"
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "groep-ID van de 'peer rating'-beheerdersgroep:"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Wat is de computernaam van de server verantwoordelijk voor het doorsturen "
-"van de mail voor @FORGENAME at -gebruikers?"
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -pakketten gaat "
+#~ "hosten?"
 
 #  Type: select
 #  DefaultChoice
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Engels"
+#~ msgid "English"
+#~ msgstr "Engels"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Bulgaars"
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgaars"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Catalaans"
+#~ msgid "Catalan"
+#~ msgstr "Catalaans"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Traditioneel Chinees"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Traditioneel Chinees"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Nederlands"
+#~ msgid "Dutch"
+#~ msgstr "Nederlands"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Frans"
+#~ msgid "French"
+#~ msgstr "Frans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Duits"
+#~ msgid "German"
+#~ msgstr "Duits"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Grieks"
+#~ msgid "Greek"
+#~ msgstr "Grieks"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebreeuws"
+#~ msgid "Hebrew"
+#~ msgstr "Hebreeuws"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesisch"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesisch"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italiaans"
+#~ msgid "Italian"
+#~ msgstr "Italiaans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japans"
+#~ msgid "Japanese"
+#~ msgstr "Japans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Koreaans"
+#~ msgid "Korean"
+#~ msgstr "Koreaans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latijns"
+#~ msgid "Latin"
+#~ msgstr "Latijns"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Noors"
+#~ msgid "Norwegian"
+#~ msgstr "Noors"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Pools"
+#~ msgid "Polish"
+#~ msgstr "Pools"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Braziliaans Portugees"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Braziliaans Portugees"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugees"
+#~ msgid "Portuguese"
+#~ msgstr "Portugees"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Russisch"
+#~ msgid "Russian"
+#~ msgstr "Russisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Vereenvoudigd Chinees"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Vereenvoudigd Chinees"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Spaans"
+#~ msgid "Spanish"
+#~ msgstr "Spaans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Zweeds"
+#~ msgid "Swedish"
+#~ msgstr "Zweeds"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Thais"
+#~ msgid "Thai"
+#~ msgstr "Thais"
 
 #  Type: select
 #  Description
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Dutch"
+#~ msgid "English[ Default language]"
+#~ msgstr "Dutch"
 
 #  Type: select
 #  Description
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Standaardtaal:"
+#~ msgid "Default language:"
+#~ msgstr "Standaardtaal:"
 
 #  Type: select
 #  Description
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Wat wordt de standaardtaal voor webpagina's?"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Wat wordt de standaardtaal voor webpagina's?"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Standaardthema:"
+#~ msgid "Default theme:"
+#~ msgstr "Standaardthema:"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Wat wordt het standaardthema voor webpagina's? Dit dient een geldige naam te "
-"zijn."
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Wat wordt het standaardthema voor webpagina's? Dit dient een geldige naam "
+#~ "te zijn."
 
+#  Type: boolean
+#  Description
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Wilt u dat e-mail voor ${noreply} weggegooid wordt?"
+
+#  Type: boolean
+#  Description
+#, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ verstuurt en ontvangt een heleboel e-mails van en naar  het "
+#~ "adres '${noreply}'."
+
+#  Type: boolean
+#  Description
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Tenzij u dat adres voor iets anders gebruikt is het aan te raden om de e-"
+#~ "mail naar dat adres om te leiden naar een zwart gat (/dev/null)."
+
 #  Type: string
 #  Description
+#~ msgid "User mail redirector server:"
+#~ msgstr "De e-mail-doorstuur-server:"
+
+#  Type: string
+#  Description
 #, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server verantwoordelijk voor het doorsturen "
+#~ "van de mail voor @FORGENAME at -gebruikers?"
+
+#  Type: string
+#  Description
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Gebruikersnaam @FORGENAME at -beheerder:"

Modified: trunk/src/debian/dsf-po/pt.po
===================================================================
--- trunk/src/debian/dsf-po/pt.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/pt.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2010-10-03 21:23+0200\n"
 "Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -18,89 +18,46 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Servidor de shells:"
+#: ../dsf-in/common.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "O nome do domínio ou subdomínio do @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#, fuzzy
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "shell accounts."
+#: ../dsf-in/common.templates:2001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Por favor introduza o nome da máquina do servidor onde ficarão as contas "
-"shell do @FORGENAME at ."
+"Por favor introduza o domínio que vai conter a instalação do @FORGENAME at . "
+"Alguns serviços (scm, listas de mail, etc.) terão o seu próprio subdomínio "
+"nesse domínio."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Servidor de downloads:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Por favor introduza o nome do servidor que irá guardar os pacotes "
-"@FORGENAME at ."
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nome do sistema @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
+#: ../dsf-in/common.templates:3001
 #, fuzzy
-#| msgid "It should not be the same as the main @FORGENAME@ host."
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Não deve ser o mesmo que o host principal do @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Endereço IP:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-#, fuzzy
 #| msgid ""
-#| "Please enter the IP address of the server that will host the @FORGENAME@ "
-#| "installation."
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
 msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Por favor introduza o endereço IP do servidor onde será feita a instalação "
-"do @FORGENAME at ."
+"Por favor introduza o nome do sistema @FORGENAME at . Este nome é utilizado em "
+"vários lugares pelo sistema."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Isto é necessário para a configuração de 'virtual hosts' do Apache."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -108,7 +65,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -122,7 +79,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -130,23 +87,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmação da palavra-passe:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Por favor, reescreva a palavra-passe para confirmação."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Deseja uma configuração simples de DNS no @FORGENAME@?"
 
@@ -154,7 +153,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -171,7 +170,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -182,441 +181,294 @@
 "tem os directórios de projectos no mesmo servidor e tem um único servidor "
 "SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Deseja que o mail para ${noreply} seja apagado?"
+#, fuzzy
+#~| msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Endereço de email do administrador do @FORGENAME@:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"O @FORGENAME@ envia e recebe bastante e-mail para e a partir do endereço "
-"\"${noreply}\"."
+#~| msgid ""
+#~| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~| "site. It will be used when problems occur."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Por favor introduza o endereço de email do administrador @FORGENAME@ "
+#~ "neste site. Será usado quando houverem problemas."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Os e-mails para esse endereço devem ser redireccionados para um buraco negro "
-"(/dev/null), a não ser que tenha outro uso para esse endereço."
+#~ msgid "Download server:"
+#~ msgstr "Servidor de downloads:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "O nome do domínio ou subdomínio do @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Por favor introduza o domínio que vai conter a instalação do @FORGENAME at . "
-"Alguns serviços (scm, listas de mail, etc.) terão o seu próprio subdomínio "
-"nesse domínio."
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Endereço de email do administrador do @FORGENAME@:"
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Por favor introduza o nome do servidor que irá guardar os pacotes "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
-#| "site. It will be used when problems occur."
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Por favor introduza o endereço de email do administrador @FORGENAME@ neste "
-"site. Será usado quando houverem problemas."
+#~| msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Não deve ser o mesmo que o host principal do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Nome do sistema @FORGENAME@:"
+#~ msgid "Database server:"
+#~ msgstr "Servidor de bases de dados:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Por favor introduza o endereço IP (ou nome da máquina) do servidor que "
+#~ "irá guardar a base de dados do @FORGENAME at ."
+
+#~ msgid "Database name:"
+#~ msgstr "Nome da sua base de dados:"
+
 #, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Por favor introduza o nome do sistema @FORGENAME at . Este nome é utilizado em "
-"vários lugares pelo sistema."
+#~| msgid ""
+#~| "Please enter the name of the database that will host the @FORGENAME@ "
+#~| "database."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Por favor introduza o nome da base de dados que irá guardar a base de "
+#~ "dados do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Servidor de bases de dados:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Nome do administrador da sua base de dados:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Por favor introduza o endereço IP (ou nome da máquina) do servidor que irá "
-"guardar a base de dados do @FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Por favor introduza o nome de utilizador do administrador do servidor que "
+#~ "irá guardar a base de dados do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Nome da sua base de dados:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Palavra-passe utilizada na base de dados:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "As ligações à base de dados são autenticadas por uma palavra-passe."
+
+#~ msgid "Please choose the connection password."
+#~ msgstr "Por favor escolha a palavra-passe da ligação."
+
+#~ msgid "IP address:"
+#~ msgstr "Endereço IP:"
+
 #, fuzzy
-#| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ "
-#| "database."
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Por favor introduza o nome da base de dados que irá guardar a base de dados "
-"do @FORGENAME at ."
+#~| msgid ""
+#~| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~| "installation."
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Por favor introduza o endereço IP do servidor onde será feita a "
+#~ "instalação do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Nome do administrador da sua base de dados:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Isto é necessário para a configuração de 'virtual hosts' do Apache."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Por favor introduza o nome de utilizador do administrador do servidor que "
-"irá guardar a base de dados do @FORGENAME at ."
+#~ msgid "Shell server:"
+#~ msgstr "Servidor de shells:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Palavra-passe utilizada na base de dados:"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Por favor introduza o nome da máquina do servidor onde ficarão as contas "
+#~ "shell do @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "As ligações à base de dados são autenticadas por uma palavra-passe."
+#~ msgid "Mailing lists server:"
+#~ msgstr "Servidor de listas de email:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Por favor escolha a palavra-passe da ligação."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Por favor introduza o nome do servidor que irá guardar as listas de email "
+#~ "do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Por favor introduza o nome do servidor que irá guardar os pacotes do "
-"@FORGENAME at ."
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "shell accounts."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Por favor introduza o nome do servidor onde irão ficar as contas de shell "
+#~ "do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Identificador do grupo de administradores de notícias:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "Identificador do grupo de administradores de notícias:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
-#| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ "
-#| "main page. This group's ID must not be 1. This should be changed only if "
-#| "you upgrade from a previous version and want to keep the data."
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Os membros do grupo de administradores de notícias podem aprovar notícias "
-"afixadas na página principal do @FORGENAME at . Este identificador de grupo não "
-"pode ser 1. Isto deve ser mudado apenas se actualizar a partir de uma versão "
-"antiga e quiser manter os seus dados."
+#~| msgid ""
+#~| "The members of the news admin group can approve news for the @FORGENAME@ "
+#~| "main page. This group's ID must not be 1. This should be changed only if "
+#~| "you upgrade from a previous version and want to keep the data."
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Os membros do grupo de administradores de notícias podem aprovar notícias "
+#~ "afixadas na página principal do @FORGENAME at . Este identificador de grupo "
+#~ "não pode ser 1. Isto deve ser mudado apenas se actualizar a partir de uma "
+#~ "versão antiga e quiser manter os seus dados."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Identificador do grupo de administradores de estatísticas:"
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Identificador do grupo de administradores de estatísticas:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Identificador do grupo de administradores de classificação por pares:"
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr ""
+#~ "Identificador do grupo de administradores de classificação por pares:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Servidor de listas de email:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Por favor introduza o nome do servidor que irá guardar os pacotes do "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Por favor introduza o nome do servidor que irá guardar as listas de email do "
-"@FORGENAME at ."
+#~ msgid "English"
+#~ msgstr "Inglês"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "shell accounts."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Por favor introduza o nome do servidor onde irão ficar as contas de shell do "
-"@FORGENAME at ."
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Servidor de redireccionamento de mail dos utilizadores:"
+#~ msgid "Catalan"
+#~ msgstr "Catalão"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Por favor introduza o nome do servidor que fará o redireccionamento do mail "
-"dos utilizadores do @FORGENAME at ."
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Chinês (Tradicional)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Inglês"
+#~ msgid "Dutch"
+#~ msgstr "Holandês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Búlgaro"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Catalão"
+#~ msgid "French"
+#~ msgstr "Francês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Chinês (Tradicional)"
+#~ msgid "German"
+#~ msgstr "Alemão"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holandês"
+#~ msgid "Greek"
+#~ msgstr "Grego"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Hebrew"
+#~ msgstr "Hebraico"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Francês"
+#~ msgid "Indonesian"
+#~ msgstr "Indonésio"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Alemão"
+#~ msgid "Italian"
+#~ msgstr "Italiano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Grego"
+#~ msgid "Japanese"
+#~ msgstr "Japonês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebraico"
+#~ msgid "Korean"
+#~ msgstr "Coreano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonésio"
+#~ msgid "Latin"
+#~ msgstr "Latim"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italiano"
+#~ msgid "Norwegian"
+#~ msgstr "Norueguês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japonês"
+#~ msgid "Polish"
+#~ msgstr "Polaco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Coreano"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Português do Brasil"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latim"
+#~ msgid "Portuguese"
+#~ msgstr "Português"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Norueguês"
+#~ msgid "Russian"
+#~ msgstr "Russo"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polaco"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Chinês (Simplificado)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Português do Brasil"
+#~ msgid "Spanish"
+#~ msgstr "Espanhol"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Português"
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Russo"
+#~ msgid "Thai"
+#~ msgstr "Tailandês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Chinês (Simplificado)"
+#~ msgid "English[ Default language]"
+#~ msgstr "Inglês[ Idioma pré-definido]"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Espanhol"
+#~ msgid "Default language:"
+#~ msgstr "Idioma pré-definido:"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Sueco"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Por favor escolha o idioma pré-definido das páginas web."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Tailandês"
+#~ msgid "Default theme:"
+#~ msgstr "Tema pré-definido:"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Inglês[ Idioma pré-definido]"
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Por favor escolha o tema pré-definido para as páginas web. Tem de "
+#~ "introduzir um nome válido."
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Idioma pré-definido:"
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Deseja que o mail para ${noreply} seja apagado?"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Por favor escolha o idioma pré-definido das páginas web."
+#, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "O @FORGENAME@ envia e recebe bastante e-mail para e a partir do endereço "
+#~ "\"${noreply}\"."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Tema pré-definido:"
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Os e-mails para esse endereço devem ser redireccionados para um buraco "
+#~ "negro (/dev/null), a não ser que tenha outro uso para esse endereço."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Por favor escolha o tema pré-definido para as páginas web. Tem de introduzir "
-"um nome válido."
+#~ msgid "User mail redirector server:"
+#~ msgstr "Servidor de redireccionamento de mail dos utilizadores:"
 
 #, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Por favor introduza o nome do servidor que fará o redireccionamento do "
+#~ "mail dos utilizadores do @FORGENAME at ."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Login do administrador do @FORGENAME@:"

Modified: trunk/src/debian/dsf-po/ru.po
===================================================================
--- trunk/src/debian/dsf-po/ru.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/ru.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@ 4.8.2-1\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2010-01-02 10:03+0300\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -22,79 +22,48 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Сервер оболочек:"
+#: ../dsf-in/common.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Имя домена или поддомена @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Введите имя сервера, на котором будут расположены учётные записи оболочек "
-"для @FORGENAME at ."
+"Введите домен, который будет обслуживать установку @FORGENAME at . В этом "
+"домене некоторым сервисам (scm, lists и т.д.) будут присвоены свои "
+"собственные поддомены."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Сервер загрузок:"
+#: ../dsf-in/common.templates:3001
+#, fuzzy
+#| msgid "@FORGENAME@/FusionForge system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Имя системы @FORGENAME@/FusionForge:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Введите имя сервера, на котором будут расположены пакеты @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Оно не должно совпадать с главным хостом @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-адрес:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Введите IP-адрес сервера, на котором будет располагаться установка "
-"@FORGENAME at ."
+"Введите имя системы @FORGENAME at . Оно используется в разных местах по всей "
+"системе."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Это нужно для настройки виртуального хостинга Apache."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Пароль администратора @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -108,7 +77,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -116,23 +85,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Подтверждение пароля:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Введите пароль ещё раз для подтверждения."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Выполнить простую настройку DNS для @FORGENAME@?"
 
@@ -140,7 +151,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -156,7 +167,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -167,407 +178,249 @@
 "предполагается, что все веб-каталоги проектов размещены на том же сервере с "
 "одним сервером SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Удалять почту, присланную на адрес ${noreply}?"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Адрес электронной почты администратора @FORGENAME@:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ посылает и принимает множество электронных писем на адрес "
-"\"${noreply}\"."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Введите e-mail адрес администратора @FORGENAME@ для этого сайта. Он будет "
+#~ "использован при возникновении проблем."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Почта на этот адрес должна быть перенаправлена в чёрную дыру (/dev/null), "
-"если вы не используете этот адрес для чего-то ещё."
+#~ msgid "Download server:"
+#~ msgstr "Сервер загрузок:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Имя домена или поддомена @FORGENAME@:"
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Введите имя сервера, на котором будут расположены пакеты @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Введите домен, который будет обслуживать установку @FORGENAME at . В этом "
-"домене некоторым сервисам (scm, lists и т.д.) будут присвоены свои "
-"собственные поддомены."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Оно не должно совпадать с главным хостом @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Адрес электронной почты администратора @FORGENAME@:"
+#~ msgid "Database server:"
+#~ msgstr "Сервер базы данных:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Введите e-mail адрес администратора @FORGENAME@ для этого сайта. Он будет "
-"использован при возникновении проблем."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Введите IP-адрес (или имя хоста) сервера, на котором будет расположена "
+#~ "база данных @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@/FusionForge system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Имя системы @FORGENAME@/FusionForge:"
+#~ msgid "Database name:"
+#~ msgstr "Имя базы данных:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Введите имя системы @FORGENAME at . Оно используется в разных местах по всей "
-"системе."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Введите имя базы данных, которая будет содержать базу данных @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Сервер базы данных:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Имя пользователя администратора базы данных:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Введите IP-адрес (или имя хоста) сервера, на котором будет расположена база "
-"данных @FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Введите имя пользователя администратора базы данных для сервера, на "
+#~ "котором будет расположена база данных @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Имя базы данных:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Пароль для базы данных:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Введите имя базы данных, которая будет содержать базу данных @FORGENAME at ."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Для подключений к базе данных требуется пароль."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Имя пользователя администратора базы данных:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Введите пароль для подключения."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Введите имя пользователя администратора базы данных для сервера, на котором "
-"будет расположена база данных @FORGENAME at ."
+#~ msgid "IP address:"
+#~ msgstr "IP-адрес:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Пароль для базы данных:"
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Введите IP-адрес сервера, на котором будет располагаться установка "
+#~ "@FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Для подключений к базе данных требуется пароль."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Это нужно для настройки виртуального хостинга Apache."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Введите пароль для подключения."
+#~ msgid "Shell server:"
+#~ msgstr "Сервер оболочек:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Введите имя хоста сервера, на котором будут располагаться пакеты @FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Введите имя сервера, на котором будут расположены учётные записи оболочек "
+#~ "для @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Административный ID группы новостей:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Сервер списков почтовых рассылок:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Члены административной группы новостей могут утверждать новости для главной "
-"страницы @FORGENAME at . Данный ID не должен быть равен 1. Он должен быть "
-"изменён, только если вы обновляетесь с предыдущей версии и хотите сохранить "
-"данные."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Введите имя хоста сервера, который будет обслуживать списки почтовых "
+#~ "рассылок @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Административный ID группы статистики:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Введите имя сервера, на котором будут расположены учётные записи оболочек "
+#~ "для @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Административный ID группы рейтинга:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "Административный ID группы новостей:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Сервер списков почтовых рассылок:"
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Члены административной группы новостей могут утверждать новости для "
+#~ "главной страницы @FORGENAME at . Данный ID не должен быть равен 1. Он должен "
+#~ "быть изменён, только если вы обновляетесь с предыдущей версии и хотите "
+#~ "сохранить данные."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Введите имя хоста сервера, который будет обслуживать списки почтовых "
-"рассылок @FORGENAME at ."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Административный ID группы статистики:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Введите имя сервера, на котором будут расположены учётные записи оболочек "
-"для @FORGENAME at ."
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "Административный ID группы рейтинга:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Сервер-перенаправитель пользовательской почты:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Введите имя хоста сервера, на котором будут располагаться пакеты "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Введите имя сервера, который будет перенаправлять почту пользователей "
-"@FORGENAME at ."
+#~ msgid "English"
+#~ msgstr "английский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "английский"
+#~ msgid "Bulgarian"
+#~ msgstr "болгарский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "болгарский"
+#~ msgid "Catalan"
+#~ msgstr "каталонский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "каталонский"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "китайский (традиционный)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "китайский (традиционный)"
+#~ msgid "Dutch"
+#~ msgstr "голландский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "голландский"
+#~ msgid "Esperanto"
+#~ msgstr "эсперанто"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "эсперанто"
+#~ msgid "French"
+#~ msgstr "французский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "французский"
+#~ msgid "German"
+#~ msgstr "немецкий"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "немецкий"
+#~ msgid "Greek"
+#~ msgstr "греческий"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "греческий"
+#~ msgid "Hebrew"
+#~ msgstr "иврит"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "иврит"
+#~ msgid "Indonesian"
+#~ msgstr "индонезийский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "индонезийский"
+#~ msgid "Italian"
+#~ msgstr "итальянский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "итальянский"
+#~ msgid "Japanese"
+#~ msgstr "японский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "японский"
+#~ msgid "Korean"
+#~ msgstr "корейский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "корейский"
+#~ msgid "Latin"
+#~ msgstr "латинский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "латинский"
+#~ msgid "Norwegian"
+#~ msgstr "норвежский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "норвежский"
+#~ msgid "Polish"
+#~ msgstr "польский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "польский"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "португальский (бразильский)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "португальский (бразильский)"
+#~ msgid "Portuguese"
+#~ msgstr "португальский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "португальский"
+#~ msgid "Russian"
+#~ msgstr "русский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "русский"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "китайский (упрощённый)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "китайский (упрощённый)"
+#~ msgid "Spanish"
+#~ msgstr "испанский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "испанский"
+#~ msgid "Swedish"
+#~ msgstr "шведский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "шведский"
+#~ msgid "Thai"
+#~ msgstr "тайский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "тайский"
+#~ msgid "English[ Default language]"
+#~ msgstr "русский"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "русский"
+#~ msgid "Default language:"
+#~ msgstr "Язык по умолчанию:"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Язык по умолчанию:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Выберите язык по умолчанию для веб-страниц."
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Выберите язык по умолчанию для веб-страниц."
+#~ msgid "Default theme:"
+#~ msgstr "Тема по умолчанию:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Тема по умолчанию:"
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Выберите тему по умолчанию для веб-страниц. Должно быть указано "
+#~ "допустимое имя."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Выберите тему по умолчанию для веб-страниц. Должно быть указано допустимое "
-"имя."
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Удалять почту, присланную на адрес ${noreply}?"
 
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ посылает и принимает множество электронных писем на адрес "
+#~ "\"${noreply}\"."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Почта на этот адрес должна быть перенаправлена в чёрную дыру (/dev/null), "
+#~ "если вы не используете этот адрес для чего-то ещё."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Сервер-перенаправитель пользовательской почты:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Введите имя сервера, который будет перенаправлять почту пользователей "
+#~ "@FORGENAME at ."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Учётная запись администратора @FORGENAME@:"
 

Modified: trunk/src/debian/dsf-po/sv.po
===================================================================
--- trunk/src/debian/dsf-po/sv.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/sv.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME at _4.6.99+svn6580-1_sv\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2008-07-29 18:44+0200\n"
 "Last-Translator: Martin Ågren <martin.agren at gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -23,80 +23,47 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Skalserver:"
+#: ../dsf-in/common.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Namn på @FORGENAME at -domänen eller -underdomänen:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla skalkonton för "
-"@FORGENAME at ."
+"Ange den domän som kommer att vara värd för @FORGENAME at -installationen.  "
+"Vissa tjänster (källkodshantering, listor, etc.) kommer att tilldelas sina "
+"egna underdomäner i den domänen."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Hämtningsserver:"
+#: ../dsf-in/common.templates:3001
+#, fuzzy
+#| msgid "@FORGENAME@/FusionForge system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME@ systemnamn:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
+"Ange namnet på @FORGENAME at -systemet. Det används på olika ställen i systemet."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Det ska inte vara samma som huvudvärden för @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-adress:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
-msgstr ""
-"Ange IP-adressen för servern som kommer tillhandahålla @FORGENAME at -"
-"installationen."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Detta krävs för att konfigurera Apaches virtuella värd."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "@FORGENAME at -administratörens lösenord:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -110,7 +77,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -118,23 +85,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Lösenordsbekräftelse:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Mata in lösenordet igen för bekräftelse."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Vill du ha en enkel DNS-konfiguration för @FORGENAME@?"
 
@@ -142,7 +151,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -159,7 +168,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -169,404 +178,247 @@
 "maskiner för dina projektservrar; den antar bara att du har alla projektens "
 "webbkataloger på samma server och en enda källkodshanteringsserver."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Vill du att e-post till ${noreply} ska tas bort?"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "@FORGENAME at -administratörens e-postadress:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ skickar och tar emot en mängd e-postmeddelanden till och från "
-"adressen \"${noreply}\"."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Ange e-postadressen för @FORGENAME at -administratören på systemet. Den "
+#~ "kommer användas ifall problem uppstår."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"E-post till den adressen ska pekas mot ett svart hål (/dev/null) såvida du "
-"inte har andra användningsområden för den adressen."
+#~ msgid "Download server:"
+#~ msgstr "Hämtningsserver:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Namn på @FORGENAME at -domänen eller -underdomänen:"
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Ange den domän som kommer att vara värd för @FORGENAME at -installationen.  "
-"Vissa tjänster (källkodshantering, listor, etc.) kommer att tilldelas sina "
-"egna underdomäner i den domänen."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Det ska inte vara samma som huvudvärden för @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "@FORGENAME at -administratörens e-postadress:"
+#~ msgid "Database server:"
+#~ msgstr "Databasserver:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Ange e-postadressen för @FORGENAME at -administratören på systemet. Den kommer "
-"användas ifall problem uppstår."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla "
+#~ "@FORGENAME at -databasen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@/FusionForge system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "@FORGENAME@ systemnamn:"
+#~ msgid "Database name:"
+#~ msgstr "Databasnamn:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Ange namnet på @FORGENAME at -systemet. Det används på olika ställen i systemet."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Ange namnet på databasen som kommer tillhandahålla @FORGENAME at -databasen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Databasserver:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Databasadministratörens användarnamn:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla "
-"@FORGENAME at -databasen."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Ange användarnamnet på databasadministratören för servers som kommer "
+#~ "tillhandahålla @FORGENAME at -databasen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Databasnamn:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Lösenordet som används för databasen:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Ange namnet på databasen som kommer tillhandahålla @FORGENAME at -databasen."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Uppkopplingar till databassystem autentiseras med ett lösenord."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Databasadministratörens användarnamn:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Välj uppkopplingslösenordet."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Ange användarnamnet på databasadministratören för servers som kommer "
-"tillhandahålla @FORGENAME at -databasen."
+#~ msgid "IP address:"
+#~ msgstr "IP-adress:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Lösenordet som används för databasen:"
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Ange IP-adressen för servern som kommer tillhandahålla @FORGENAME at -"
+#~ "installationen."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Uppkopplingar till databassystem autentiseras med ett lösenord."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Detta krävs för att konfigurera Apaches virtuella värd."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Välj uppkopplingslösenordet."
+#~ msgid "Shell server:"
+#~ msgstr "Skalserver:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Ange värdnamnet för servern som kommer tillhandahålla skalkonton för "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Grupp-id för nyhetsadministratörerna:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Server för sändlistor:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Medlemmar i nyhetsadministrationsgruppen kan godkänna nyheter för "
-"@FORGENAME at s förstasida.  Detta grupp-id får inte vara 1. Du behöver bara "
-"ändra detta värde om du uppgraderar från en tidigare version och vill "
-"behålla ditt data."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Ange värdnamnet för servern som kommer tillhandahålla sändlistorna för "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Grupp-id för statistikadministratörerna:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Ange värdnamnet för servern som kommer tillhandahålla skalkonton för "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Grupp-id för användarbedömningsadministratörerna:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "Grupp-id för nyhetsadministratörerna:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Server för sändlistor:"
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Medlemmar i nyhetsadministrationsgruppen kan godkänna nyheter för "
+#~ "@FORGENAME at s förstasida.  Detta grupp-id får inte vara 1. Du behöver bara "
+#~ "ändra detta värde om du uppgraderar från en tidigare version och vill "
+#~ "behålla ditt data."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla sändlistorna för "
-"@FORGENAME at ."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Grupp-id för statistikadministratörerna:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla skalkonton för "
-"@FORGENAME at ."
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "Grupp-id för användarbedömningsadministratörerna:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Omdirigerarserver för användarnas e-post:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla omdirigerarserver för "
-"användarnas e-post för @FORGENAME at ."
+#~ msgid "English"
+#~ msgstr "Engelska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Engelska"
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgariska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Bulgariska"
+#~ msgid "Catalan"
+#~ msgstr "Katalanska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Katalanska"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Kinesiska (traditionell)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Kinesiska (traditionell)"
+#~ msgid "Dutch"
+#~ msgstr "Holländska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holländska"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "French"
+#~ msgstr "Franska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Franska"
+#~ msgid "German"
+#~ msgstr "Tyska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Tyska"
+#~ msgid "Greek"
+#~ msgstr "Grekiska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Grekiska"
+#~ msgid "Hebrew"
+#~ msgstr "Hebreiska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebreiska"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesiska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesiska"
+#~ msgid "Italian"
+#~ msgstr "Italienska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italienska"
+#~ msgid "Japanese"
+#~ msgstr "Japanska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japanska"
+#~ msgid "Korean"
+#~ msgstr "Koreanska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Koreanska"
+#~ msgid "Latin"
+#~ msgstr "Latin"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latin"
+#~ msgid "Norwegian"
+#~ msgstr "Norska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Norska"
+#~ msgid "Polish"
+#~ msgstr "Polska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polska"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugisiska (brasiliansk)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisiska (brasiliansk)"
+#~ msgid "Portuguese"
+#~ msgstr "Portugisiska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugisiska"
+#~ msgid "Russian"
+#~ msgstr "Ryska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Ryska"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Kinesiska (förenklad)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Kinesiska (förenklad)"
+#~ msgid "Spanish"
+#~ msgstr "Spanska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Spanska"
+#~ msgid "Swedish"
+#~ msgstr "Svenska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Svenska"
+#~ msgid "Thai"
+#~ msgstr "Thailändska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Thailändska"
+#~ msgid "English[ Default language]"
+#~ msgstr "Engelska[ Standardspråk]"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Engelska[ Standardspråk]"
+#~ msgid "Default language:"
+#~ msgstr "Standardspråk:"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Standardspråk:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Ange standardspråket för webbsidorna."
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Ange standardspråket för webbsidorna."
+#~ msgid "Default theme:"
+#~ msgstr "Standardtema:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Standardtema:"
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Ange standardtemat för webbsidorna. Detta måste vara ett giltigt namn."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr "Ange standardtemat för webbsidorna. Detta måste vara ett giltigt namn."
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Vill du att e-post till ${noreply} ska tas bort?"
 
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ skickar och tar emot en mängd e-postmeddelanden till och från "
+#~ "adressen \"${noreply}\"."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "E-post till den adressen ska pekas mot ett svart hål (/dev/null) såvida "
+#~ "du inte har andra användningsområden för den adressen."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Omdirigerarserver för användarnas e-post:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Ange värdnamnet för servern som kommer tillhandahålla omdirigerarserver "
+#~ "för användarnas e-post för @FORGENAME at ."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "@FORGENAME at -administratörens användarnamn:"
 

Modified: trunk/src/debian/dsf-po/templates.pot
===================================================================
--- trunk/src/debian/dsf-po/templates.pot	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/templates.pot	2012-05-30 12:44:54 UTC (rev 15613)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: fusionforge\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -19,75 +19,41 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
+#: ../dsf-in/common.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
+#: ../dsf-in/common.templates:3001
+msgid "@FORGENAME@ system name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr ""
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "forge. It will be used to approve the creation of new projects."
@@ -95,421 +61,93 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "Please choose the password for this forge account."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr ""
 
-#. Type: boolean
-#. Description
-#. Translators: SCM here means "Source Control Management"
-#. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for @FORGENAME@?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#. Translators: SCM here means "Source Control Management"
-#. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
-msgid ""
-"You can use a simple DNS setup with wildcards to map all project web-hosts "
-"to a single IP address, and direct all the scm-hosts to a single SCM server, "
-"or a complex setup which allows many servers as project web servers or SCM "
-"servers."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#. Translators: SCM here means "Source Control Management"
-#. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
-msgid ""
-"Even if you use a simple DNS setup, you can still use separate machines as "
-"project servers; it just assumes that all the project web directories are on "
-"the same server with a single SCM server."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid "@FORGENAME@ system name:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-
 #. Type: select
 #. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr ""
-
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
 msgstr ""
 
-#. Type: select
+#. Type: boolean
 #. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
+#. Translators: SCM here means "Source Control Management"
+#. (cvs, svn, etc.)
+#: ../dsf-in/dns-bind9.templates:2001
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
+#. Translators: SCM here means "Source Control Management"
+#. (cvs, svn, etc.)
+#: ../dsf-in/dns-bind9.templates:2001
+msgid ""
+"You can use a simple DNS setup with wildcards to map all project web-hosts "
+"to a single IP address, and direct all the scm-hosts to a single SCM server, "
+"or a complex setup which allows many servers as project web servers or SCM "
+"servers."
 msgstr ""
 
-#. Type: string
+#. Type: boolean
 #. Description
-#: ../dsf-helper/web-variables.templates:3001
+#. Translators: SCM here means "Source Control Management"
+#. (cvs, svn, etc.)
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
+"Even if you use a simple DNS setup, you can still use separate machines as "
+"project servers; it just assumes that all the project web directories are on "
+"the same server with a single SCM server."
 msgstr ""

Modified: trunk/src/debian/dsf-po/vi.po
===================================================================
--- trunk/src/debian/dsf-po/vi.po	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/dsf-po/vi.po	2012-05-30 12:44:54 UTC (rev 15613)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 18:26+0200\n"
 "PO-Revision-Date: 2010-03-10 10:10+0200\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -20,76 +20,45 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Máy phục vụ trình bao :"
+#: ../dsf-in/common.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Tên miền hay miền con @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/common.templates:2001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Hãy gõ tên máy của máy phục vụ sẽ hỗ trợ các tài khoản trình bao @FORGENAME at ."
+"Hãy gõ miền sẽ chứa bản cài đặt @FORGENAME at . Một số dịch vụ (scm, lists v."
+"v.) sẽ nhận miền con riêng ở trong miền đó."
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Download server:"
-msgstr "Máy phục vụ tải xuống:"
+#: ../dsf-in/common.templates:3001
+msgid "@FORGENAME@ system name:"
+msgstr "Tên hệ thống @FORGENAME@:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/common.templates:3001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Hãy gõ tên máy của máy phục vụ sẽ hỗ trợ các gói @FORGENAME at ."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Hãy gõ tên của hệ thống @FORGENAME at . Nó được dùng ở các nơi khác nhau trên "
+"khắp hệ thống."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Không nên trùng với máy chủ @FORGENAME@ chính."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Địa chỉ IP:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
-msgstr "Hãy gõ địa chỉ IP của máy phục vụ sẽ chứa bản cài đặt @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Nó cần để cấu hình dịch vụ ảo Apache."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Mật khẩu quản trị @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -103,7 +72,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -111,23 +80,65 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Xác nhận mật khẩu :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Hãy gõ lại mật khẩu để xác nhận nó."
 
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "install the new version configured by @PACKAGE@"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "keep the local version currently installed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show the differences between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "show a side-by-side difference between the versions"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../dsf-in/db-postgresql.templates:4001
+msgid "start a new shell to examine the situation"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid "What do you want to do about configuration file ${BASENAME}?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../dsf-in/db-postgresql.templates:4002
+msgid ""
+"The configuration file ${FILE} needs to be modified by @PACKAGE@, whereas it "
+"is also a configuration file of the postgresql package."
+msgstr ""
+
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Bạn có muốn tạo một thiết lập DNS đơn giản cho @FORGENAME@ không?"
 
@@ -135,7 +146,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -151,7 +162,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -162,396 +173,241 @@
 "mục Web của dự án nằm trên cùng một máy phục vụ, với một máy phục vụ SCM "
 "riêng lẻ."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Bạn có muốn hủy mọi thư được gửi cho ${noreply} không?"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Địa chỉ thư của quản trị @FORGENAME@:"
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ gửi và nhận rất nhiều thư điện tử cho/từ địa chỉ « ${noreply} »."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Hãy gõ địa chỉ thư điện tử của quản trị @FORGENAME@ của địa chỉ Web này. "
+#~ "Nó sẽ được dùng khi gặp vấn đề."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Các thư gửi đến địa chỉ đó nên bị chuyển hướng tới « /dev/null » (bị hủy), "
-"trừ bạn muốn sử dụng địa chỉ đó bằng cách khác."
+#~ msgid "Download server:"
+#~ msgstr "Máy phục vụ tải xuống:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Tên miền hay miền con @FORGENAME@:"
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr "Hãy gõ tên máy của máy phục vụ sẽ hỗ trợ các gói @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Hãy gõ miền sẽ chứa bản cài đặt @FORGENAME at . Một số dịch vụ (scm, lists v."
-"v.) sẽ nhận miền con riêng ở trong miền đó."
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Không nên trùng với máy chủ @FORGENAME@ chính."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Địa chỉ thư của quản trị @FORGENAME@:"
+#~ msgid "Database server:"
+#~ msgstr "Máy phục vụ cơ sở dữ liệu :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Hãy gõ địa chỉ thư điện tử của quản trị @FORGENAME@ của địa chỉ Web này. Nó "
-"sẽ được dùng khi gặp vấn đề."
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Hãy gõ địa chỉ IP (hay tên máy) của máy phục vụ sẽ chứa cơ sở dữ liệu "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid "@FORGENAME@ system name:"
-msgstr "Tên hệ thống @FORGENAME@:"
+#~ msgid "Database name:"
+#~ msgstr "Tên cơ sở dữ liệu :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Hãy gõ tên của hệ thống @FORGENAME at . Nó được dùng ở các nơi khác nhau trên "
-"khắp hệ thống."
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr "Hãy gõ tên của cơ sở dữ liệu sẽ hỗ trợ cơ sở dữ liệu @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Máy phục vụ cơ sở dữ liệu :"
+#~ msgid "Database administrator username:"
+#~ msgstr "Tên người dùng quản trị cơ sở dữ liệu :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Hãy gõ địa chỉ IP (hay tên máy) của máy phục vụ sẽ chứa cơ sở dữ liệu "
-"@FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Hãy gõ tên người dùng của quản trị cơ sở dữ liệu cho máy phục vụ sẽ chứa "
+#~ "cơ sở dữ liệu @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Tên cơ sở dữ liệu :"
+#~ msgid "Password used for the database:"
+#~ msgstr "Mật khẩu dùng cho cơ sở dữ liệu :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr "Hãy gõ tên của cơ sở dữ liệu sẽ hỗ trợ cơ sở dữ liệu @FORGENAME at ."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Kết nối đến hệ thống cơ sở dữ liệu thì xác thực bằng mật khẩu."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Tên người dùng quản trị cơ sở dữ liệu :"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Hãy chọn mật khẩu kết nối."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid ""
-"Please enter the username of the database administrator for the server that "
-"will host the @FORGENAME@ database."
-msgstr ""
-"Hãy gõ tên người dùng của quản trị cơ sở dữ liệu cho máy phục vụ sẽ chứa cơ "
-"sở dữ liệu @FORGENAME at ."
+#~ msgid "IP address:"
+#~ msgstr "Địa chỉ IP:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Mật khẩu dùng cho cơ sở dữ liệu :"
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr "Hãy gõ địa chỉ IP của máy phục vụ sẽ chứa bản cài đặt @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Kết nối đến hệ thống cơ sở dữ liệu thì xác thực bằng mật khẩu."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Nó cần để cấu hình dịch vụ ảo Apache."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Hãy chọn mật khẩu kết nối."
+#~ msgid "Shell server:"
+#~ msgstr "Máy phục vụ trình bao :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các gói @FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Hãy gõ tên máy của máy phục vụ sẽ hỗ trợ các tài khoản trình bao "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID nhóm quản trị tin tức:"
+#~ msgid "Mailing lists server:"
+#~ msgstr "Máy phục vụ hộp thư chung:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ "
-"main page. This group's ID must not be 1. This should be changed only if you "
-"upgrade from a previous version and want to keep the data."
-msgstr ""
-"Các thành viên của nhóm quản trị tin tức cũng có quyền tán thành tin tức để "
-"hiển thị trên trang chính @FORGENAME at . Mã số nhóm (GID) này phải khác với số "
-"1. Thay đổi nó chỉ nếu bạn nâng cấp từ một phiên bản cũ và muốn giữ lại dữ "
-"liệu."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Hãy gõ tên máy của máy phục vụ sẽ chứa các hộp thư chung @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID nhóm quản trị thống kê:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Hãy gõ tên máy của máy phục vụ sẽ chứa các tài khoản trình bao "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID nhóm quản trị đánh giá ngang hàng:"
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID nhóm quản trị tin tức:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Máy phục vụ hộp thư chung:"
+#~ msgid ""
+#~ "The members of the news admin group can approve news for the @FORGENAME@ "
+#~ "main page. This group's ID must not be 1. This should be changed only if "
+#~ "you upgrade from a previous version and want to keep the data."
+#~ msgstr ""
+#~ "Các thành viên của nhóm quản trị tin tức cũng có quyền tán thành tin tức "
+#~ "để hiển thị trên trang chính @FORGENAME at . Mã số nhóm (GID) này phải khác "
+#~ "với số 1. Thay đổi nó chỉ nếu bạn nâng cấp từ một phiên bản cũ và muốn "
+#~ "giữ lại dữ liệu."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các hộp thư chung @FORGENAME at ."
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID nhóm quản trị thống kê:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Hãy gõ tên máy của máy phục vụ sẽ chứa các tài khoản trình bao @FORGENAME at ."
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID nhóm quản trị đánh giá ngang hàng:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Máy phục vụ chuyển hướng thư tín người dùng:"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các gói @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Hãy gõ tên máy của máy phục vụ sẽ chứa bộ chuyển hướng thư tín người dùng "
-"@FORGENAME at ."
+#~ msgid "English"
+#~ msgstr "tiếng Anh"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "tiếng Anh"
+#~ msgid "Bulgarian"
+#~ msgstr "tiếng Bun-ga-ri"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "tiếng Bun-ga-ri"
+#~ msgid "Catalan"
+#~ msgstr "tiếng Ca-ta-lăng"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "tiếng Ca-ta-lăng"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "tiếng Trung (truyền thống)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "tiếng Trung (truyền thống)"
+#~ msgid "Dutch"
+#~ msgstr "tiếng Hòa"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "tiếng Hòa"
+#~ msgid "Esperanto"
+#~ msgstr "tiếng Etpêrantô"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "tiếng Etpêrantô"
+#~ msgid "French"
+#~ msgstr "tiếng Pháp"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "tiếng Pháp"
+#~ msgid "German"
+#~ msgstr "tiếng Đức"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "tiếng Đức"
+#~ msgid "Greek"
+#~ msgstr "tiếng Hy Lạp"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "tiếng Hy Lạp"
+#~ msgid "Hebrew"
+#~ msgstr "tiếng Do Thái"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "tiếng Do Thái"
+#~ msgid "Indonesian"
+#~ msgstr "tiếng Nam Dương"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "tiếng Nam Dương"
+#~ msgid "Italian"
+#~ msgstr "tiếng Ý"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "tiếng Ý"
+#~ msgid "Japanese"
+#~ msgstr "tiếng Nhật"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "tiếng Nhật"
+#~ msgid "Korean"
+#~ msgstr "tiếng Hàn"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "tiếng Hàn"
+#~ msgid "Latin"
+#~ msgstr "tiếng La-tinh"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "tiếng La-tinh"
+#~ msgid "Norwegian"
+#~ msgstr "tiếng Na Uy"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "tiếng Na Uy"
+#~ msgid "Polish"
+#~ msgstr "tiếng Ba Lan"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "tiếng Ba Lan"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "tiếng Bổ Đào Nhà (Bra-xin)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "tiếng Bổ Đào Nhà (Bra-xin)"
+#~ msgid "Portuguese"
+#~ msgstr "tiếng Bổ Đào Nhà"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "tiếng Bổ Đào Nhà"
+#~ msgid "Russian"
+#~ msgstr "tiếng Nga"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "tiếng Nga"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "tiếng Trung (phổ thông)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "tiếng Trung (phổ thông)"
+#~ msgid "Spanish"
+#~ msgstr "tiếng Tây Ban Nha"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "tiếng Tây Ban Nha"
+#~ msgid "Swedish"
+#~ msgstr "tiếng Thuỵ Điển"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "tiếng Thuỵ Điển"
+#~ msgid "Thai"
+#~ msgstr "tiếng Thái"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "tiếng Thái"
+#~ msgid "English[ Default language]"
+#~ msgstr "Tiếng Việt [Ngôn ngữ mặc định]"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Tiếng Việt [Ngôn ngữ mặc định]"
+#~ msgid "Default language:"
+#~ msgstr "Ngôn ngữ mặc định:"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Ngôn ngữ mặc định:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Hãy chọn ngôn ngữ mặc định cho trang Web."
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Hãy chọn ngôn ngữ mặc định cho trang Web."
+#~ msgid "Default theme:"
+#~ msgstr "Sắc thái mặc định:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Sắc thái mặc định:"
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Hãy chọn sắc thái mặc định cho trang Web: nó phải là một tên hợp lệ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr "Hãy chọn sắc thái mặc định cho trang Web: nó phải là một tên hợp lệ."
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Bạn có muốn hủy mọi thư được gửi cho ${noreply} không?"
 
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ gửi và nhận rất nhiều thư điện tử cho/từ địa chỉ « ${noreply} "
+#~ "»."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Các thư gửi đến địa chỉ đó nên bị chuyển hướng tới « /dev/null » (bị "
+#~ "hủy), trừ bạn muốn sử dụng địa chỉ đó bằng cách khác."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Máy phục vụ chuyển hướng thư tín người dùng:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Hãy gõ tên máy của máy phục vụ sẽ chứa bộ chuyển hướng thư tín người dùng "
+#~ "@FORGENAME at ."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Tên đăng nhập quản trị @FORGENAME@:"
 

Modified: trunk/src/debian/rules
===================================================================
--- trunk/src/debian/rules	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/debian/rules	2012-05-30 12:44:54 UTC (rev 15613)
@@ -185,10 +185,8 @@
 	$(DH) $@
 
 # 	Build man pages from Docbook sources
-	cat debian/dsf-in/config.sgml | $(SED_REPLACE) > debian/$(PACKAGE)-config.sgml
 	cat debian/dsf-in/common.manpages | $(SED_REPLACE) > debian/$(OLDPACKAGE)-common.manpages
 	/usr/bin/docbook-to-man debian/cvssh.sgml > cvssh.1
-	/usr/bin/docbook-to-man debian/$(PACKAGE)-config.sgml > $(PACKAGE)-config.1
 
 # 	Build README.Debian from template
 	cat debian/README.Debian.tmpl | $(SED_REPLACE) > debian/README.Debian

Modified: trunk/src/plugins/authopenid/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/authopenid/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/authopenid/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/authopenid/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/authopenid/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/authopenid/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/contribtracker/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/contribtracker/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/contribtracker/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/contribtracker/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/contribtracker/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/contribtracker/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/externalsearch/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/externalsearch/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/externalsearch/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/externalsearch/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/externalsearch/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/externalsearch/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/extratabs/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/extratabs/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/extratabs/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/extratabs/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/extratabs/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/extratabs/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -15,13 +15,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/extsubproj/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/extsubproj/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/extsubproj/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/extsubproj/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/extsubproj/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/extsubproj/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/forumml/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/forumml/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/forumml/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/globaldashboard/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/globaldashboard/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/globaldashboard/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/globaldashboard/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/globaldashboard/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/globaldashboard/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/globalsearch/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/globalsearch/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/globalsearch/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/globalsearch/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/globalsearch/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/globalsearch/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -14,13 +14,13 @@
 use Socket;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/helloworld/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/helloworld/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/helloworld/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/helloworld/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/helloworld/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/helloworld/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/hudson/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/hudson/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/hudson/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/hudson/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/hudson/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/hudson/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/mailman/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/mailman/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/mailman/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/mailman/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/mailman/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/mailman/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/mantisbt/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/mantisbt/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/mantisbt/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/mantisbt/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/mantisbt/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/mantisbt/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/mediawiki/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/mediawiki/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/mediawiki/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/mediawiki/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/mediawiki/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/mediawiki/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/oauthprovider/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/oauthprovider/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/oauthprovider/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/oauthprovider/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/oauthprovider/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/oauthprovider/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/projectlabels/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/projectlabels/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/projectlabels/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/projectlabels/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/projectlabels/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/projectlabels/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/projects-hierarchy/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/projects-hierarchy/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/projects-hierarchy/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/projects-hierarchy/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/projects-hierarchy/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/projects-hierarchy/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
===================================================================
--- trunk/src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec	2012-05-30 12:44:54 UTC (rev 15613)
@@ -112,9 +112,6 @@
         perl -pi -e "
 		s/sys_use_scm=false/sys_use_scm=true/g" %{GFORGE_CONF_DIR}/gforge.conf
 		
-	# initializing configuration
-	%{SBIN_DIR}/fusionforge-config
-	
 	CHROOT=`grep '^gforge_chroot=' %{GFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
 	if [ ! -d $CHROOT/cvsroot ] ; then
 		mkdir -p $CHROOT/cvsroot

Modified: trunk/src/plugins/scmdarcs/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/scmdarcs/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/scmdarcs/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/scmdarcs/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/scmdarcs/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/scmdarcs/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/scmgit/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/scmgit/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/scmgit/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/scmgit/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/scmgit/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/scmgit/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/scmsvn/fusionforge-plugin-scmsvn.spec
===================================================================
--- trunk/src/plugins/scmsvn/fusionforge-plugin-scmsvn.spec	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/scmsvn/fusionforge-plugin-scmsvn.spec	2012-05-30 12:44:54 UTC (rev 15613)
@@ -90,9 +90,6 @@
     perl -pi -e "
 	s/sys_use_scm=false/sys_use_scm=true/g" %{FFORGE_CONF_DIR}/gforge.conf
 		
-	# initializing configuration
-	%{SBIN_DIR}/fusionforge-config
-	
 	CHROOT=`grep '^gforge_chroot=' %{FFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
 	if [ ! -d $CHROOT/svnroot ] ; then
 		mkdir -p $CHROOT/svnroot

Modified: trunk/src/plugins/soapadmin/bin/db-delete.pl
===================================================================
--- trunk/src/plugins/soapadmin/bin/db-delete.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/soapadmin/bin/db-delete.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/soapadmin/bin/db-upgrade.pl
===================================================================
--- trunk/src/plugins/soapadmin/bin/db-upgrade.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/soapadmin/bin/db-upgrade.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: trunk/src/plugins/wiki/www/g
===================================================================
--- trunk/src/plugins/wiki/www/g	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/plugins/wiki/www/g	2012-05-30 12:44:54 UTC (rev 15613)
@@ -240,8 +240,8 @@
     // Override the default configuration for VARIABLES after index.php:
     // E.g. Use another DB:
     $DBParams['dbtype'] = 'SQL';
-    $DBParams['dsn']    = 'ffpgsql://' . $sys_dbuser . ':' .
-        $sys_dbpasswd . '@' . $sys_dbhost .'/' . $sys_dbname;
+    $DBParams['dsn']    = 'ffpgsql://' . forge_get_config('database_user') . ':' .
+        forge_get_config('database_password') . '@' . forge_get_config('database_host') .'/' . forge_get_config('database_name');
 
     $DBParams['prefix'] = "plugin_wiki_";
 

Modified: trunk/src/utils/include.pl
===================================================================
--- trunk/src/utils/include.pl	2012-05-30 12:31:35 UTC (rev 15612)
+++ trunk/src/utils/include.pl	2012-05-30 12:44:54 UTC (rev 15613)
@@ -52,7 +52,6 @@
 $sys_ldap_base_dn = &forge_get_config ('ldap_base_dn') ;
 $sys_ldap_host = &forge_get_config ('ldap_host') ;
 $server_admin = &forge_get_config ('admin_email') ;
-$peerrating_groupid = &forge_get_config ('peer_rating_group') ;
 $chroot_prefix = &forge_get_config ('chroot') ;
 $homedir_prefix = &forge_get_config ('homedir_prefix') ;
 $grpdir_prefix = &forge_get_config ('groupdir_prefix') ;




More information about the Fusionforge-commits mailing list