From c6da9e0ed471b1bb862907aeb3f78bc402fe0737 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Mon, 4 Feb 2013 18:45:02 +0000 Subject: [PATCH] license of translations + update in templaets + no SVN UP in rules + update of engrish --- README | 14 ++++++++++++-- bureau/admin/menu_adm.php | 4 ++-- debian/alternc.templates | 22 +++++++++++----------- debian/po/de.po | 14 ++++++-------- debian/po/es.po | 14 ++++++-------- debian/po/fr.po | 20 ++++++++++++-------- debian/po/it.po | 14 ++++++-------- debian/po/pt.po | 14 ++++++-------- debian/po/templates.pot | 14 ++++++-------- debian/rules | 2 +- 10 files changed, 68 insertions(+), 64 deletions(-) diff --git a/README b/README index 4d88be13..837553ef 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ This software consist of an automatic install and configuration system, a web control panel to manage hosted users and their web services such as domains, email accounts, ftp accounts, web statistics ... -Technically, AlternC is based on Debian GNU/Linux distribution, 'Sarge' +Technically, AlternC is based on Debian GNU/Linux distribution, 'Squeeze' version, and it depends on other softwares such as Apache, Postfix, Mailman ... It also contains an API documentation so that users can easily customize their web desktop. @@ -37,9 +37,19 @@ depends on other softs used by AlternC. Just add those lines to your deb http://debian.alternc.org/ stable main -then apt-get install alternc +then apt-get install mysql-server alternc You may download and install additionnal plugins after installing AlternC. Let's go to the developper page for more information. https://alternc.org/ + +License +------------ + +AlternC is distributed under the GPL v2 or later license. See COPYING. + +AlternC's translations (po files) are distributed under the Creative Commons +CC0 license. Don't participate to the translation if you don't agree to publish +your translation using that license. + diff --git a/bureau/admin/menu_adm.php b/bureau/admin/menu_adm.php index ea771787..b9a793ca 100644 --- a/bureau/admin/menu_adm.php +++ b/bureau/admin/menu_adm.php @@ -42,9 +42,9 @@ if ($mem->checkRight()) { ?>
  • ">status) __("Switch debug Off"); else __("Switch debug On"); ?>
    • -
    • +
    • -
    • +
    • diff --git a/debian/alternc.templates b/debian/alternc.templates index bbd1ae39..fbddf02d 100644 --- a/debian/alternc.templates +++ b/debian/alternc.templates @@ -56,9 +56,9 @@ _Description: Name of the secondary domain name server: be this server since bind is installed and configured by AlternC. Anyway, you should have 2 separate DNS servers if you want to provide a high quality hosting service. - . - You may contact the AlternC's users mailing list if you want to exchange - dns service with other AlternC's users. + . + AlternC's team is providing any user of AlternC with free DNS service. + go to http://alternc.net/ to create an account and use it. Template: alternc/mysql/host Type: string @@ -86,28 +86,28 @@ Template: alternc/mysql/remote_user Type: string _Description: AlternC's mysql account: Using a remote mysql installation requires the AlternC user to be configured in advance - with root access to the mysql installation. + with administrator access to the mysql installation. . The alternc sql user is responsible for granting access to user generated databases, that is why it needs root access on the mysql installation. Template: alternc/mysql/password Type: password -_Description: Password of the AlternC's mysql account: +_Description: Password of AlternC's mysql account: AlternC requires an administrator account on the mysql server. It will be created automatically during the install process. Please choose a password for this account. . Please choose a quite complex password since it will have full access to - the system database !!! + the system database! If you enter nothing, a random password will be created. Template: alternc/mysql/remote_password Type: password _Description: Password of the AlternC's mysql account: Specify the remote mysql user password - . + . Please choose a quite complex password since it will have full access to - the system database !!! + the system database! If you enter nothing, a random password will be created. Template: alternc/mysql/alternc_mail_user Type: string @@ -117,7 +117,7 @@ _Description: AlternC's mysql account: Template: alternc/mysql/alternc_mail_password Type: password -_Description: Password of the AlternC's mysql account: +_Description: Password of AlternC's mysql account: AlternC requires an administrator account on the mysql server. It will be created automatically during the install process. Please choose a password for this account. @@ -244,7 +244,7 @@ Type: boolean _Description: Shall we use a remote MySQL server? No local Mysql server was found. Please confirm you want to use a remote Mysql Server. - If not AlternC cannot be installed. + If not, AlternC cannot be installed. Template: alternc/remote_mysql_error Type: boolean @@ -255,5 +255,5 @@ _Description: MySQL connection error. Try again? Template: alternc/use_private_ip Type: boolean _Description: Private IP detected, use it anyway? - The ip appears to be private, please confirm you want to use it anyway. + The IP address you have appears to be private, please confirm you want to use it anyway. The server might not be reachable from outside your network. diff --git a/debian/po/de.po b/debian/po/de.po index 67d137e8..15b6ddc3 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: AlternC 2.0\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2013-02-03 19:37+0100\n" +"POT-Creation-Date: 2013-02-03 20:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: \n" "Language-Team: \n" @@ -388,7 +388,7 @@ msgstr "" #. Type: string #. Description #: ../alternc.templates:23001 -msgid "Warning : Be careful ! It can generate some problems." +msgid "Warning: Be careful! It can generate some problems." msgstr "" #. Type: string @@ -402,7 +402,7 @@ msgstr "" #: ../alternc.templates:24001 msgid "" "The IP address (or ip/prefix) of the server(s) which must be authorized to " -"ping us and access apache status pages. Completely optional." +"ping the server and access apache status pages. Completely optional." msgstr "" #. Type: note @@ -568,7 +568,7 @@ msgid "" "You are installing the alternc-awstats package. This package allows any user " "to ask for statistics about his web site. Users can ask for a limited number " "of statistic set. Please specify the default quota they will have for this " -"service ?" +"service." msgstr "" #. Type: note @@ -582,7 +582,7 @@ msgstr "" #: ../alternc-awstats.templates:2001 msgid "" "AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly !" +"installed properly!" msgstr "" #. Type: note @@ -597,7 +597,5 @@ msgstr "" #. Description #: ../alternc-awstats.templates:2001 msgid "" -"Please check out the AlternC installation documentation before proceeding. " -"Merci de consulter la documentation d'installation d'AlternC avant de " -"continuer." +"Please check out the AlternC installation documentation before proceeding." msgstr "" diff --git a/debian/po/es.po b/debian/po/es.po index 8f68aaab..db604a37 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: AlternC-awstats module 2.0\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2013-02-03 19:37+0100\n" +"POT-Creation-Date: 2013-02-03 20:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -388,7 +388,7 @@ msgstr "" #. Type: string #. Description #: ../alternc.templates:23001 -msgid "Warning : Be careful ! It can generate some problems." +msgid "Warning: Be careful! It can generate some problems." msgstr "" #. Type: string @@ -402,7 +402,7 @@ msgstr "" #: ../alternc.templates:24001 msgid "" "The IP address (or ip/prefix) of the server(s) which must be authorized to " -"ping us and access apache status pages. Completely optional." +"ping the server and access apache status pages. Completely optional." msgstr "" #. Type: note @@ -568,7 +568,7 @@ msgid "" "You are installing the alternc-awstats package. This package allows any user " "to ask for statistics about his web site. Users can ask for a limited number " "of statistic set. Please specify the default quota they will have for this " -"service ?" +"service." msgstr "" #. Type: note @@ -582,7 +582,7 @@ msgstr "" #: ../alternc-awstats.templates:2001 msgid "" "AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly !" +"installed properly!" msgstr "" #. Type: note @@ -597,7 +597,5 @@ msgstr "" #. Description #: ../alternc-awstats.templates:2001 msgid "" -"Please check out the AlternC installation documentation before proceeding. " -"Merci de consulter la documentation d'installation d'AlternC avant de " -"continuer." +"Please check out the AlternC installation documentation before proceeding." msgstr "" diff --git a/debian/po/fr.po b/debian/po/fr.po index 2aeeeed5..f08423d6 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.3.1\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2013-02-03 19:37+0100\n" +"POT-Creation-Date: 2013-02-03 20:41+0100\n" "PO-Revision-Date: 2005-05-15 18:24+0200\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: french \n" @@ -461,7 +461,9 @@ msgstr "" #. Type: string #. Description #: ../alternc.templates:23001 -msgid "Warning : Be careful ! It can generate some problems." +#, fuzzy +#| msgid "Warning : Be careful ! It can generate some problems." +msgid "Warning: Be careful! It can generate some problems." msgstr "Attention : Prenez garde ! Cela peut entraîner quelques problèmes." #. Type: string @@ -473,9 +475,13 @@ msgstr "serveur de surveillance : " #. Type: string #. Description #: ../alternc.templates:24001 +#, fuzzy +#| msgid "" +#| "The IP address (or ip/prefix) of the server(s) which must be authorized " +#| "to ping us and access apache status pages. Completely optional." msgid "" "The IP address (or ip/prefix) of the server(s) which must be authorized to " -"ping us and access apache status pages. Completely optional." +"ping the server and access apache status pages. Completely optional." msgstr "" "Adresse IP (ou ip/prefixe) du(des) serveur(s) dont qui pourront pinguer et " "accéder au status apache (pour le monitoring de serveur). Facultatif." @@ -665,7 +671,7 @@ msgid "" "You are installing the alternc-awstats package. This package allows any user " "to ask for statistics about his web site. Users can ask for a limited number " "of statistic set. Please specify the default quota they will have for this " -"service ?" +"service." msgstr "" #. Type: note @@ -679,7 +685,7 @@ msgstr "" #: ../alternc-awstats.templates:2001 msgid "" "AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly !" +"installed properly!" msgstr "" #. Type: note @@ -694,9 +700,7 @@ msgstr "" #. Description #: ../alternc-awstats.templates:2001 msgid "" -"Please check out the AlternC installation documentation before proceeding. " -"Merci de consulter la documentation d'installation d'AlternC avant de " -"continuer." +"Please check out the AlternC installation documentation before proceeding." msgstr "" #~ msgid "Do you REALLY want to install AlternC on this computer ?" diff --git a/debian/po/it.po b/debian/po/it.po index f5ae5980..fb4d32d0 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2013-02-03 19:37+0100\n" +"POT-Creation-Date: 2013-02-03 20:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -389,7 +389,7 @@ msgstr "" #. Type: string #. Description #: ../alternc.templates:23001 -msgid "Warning : Be careful ! It can generate some problems." +msgid "Warning: Be careful! It can generate some problems." msgstr "" #. Type: string @@ -403,7 +403,7 @@ msgstr "" #: ../alternc.templates:24001 msgid "" "The IP address (or ip/prefix) of the server(s) which must be authorized to " -"ping us and access apache status pages. Completely optional." +"ping the server and access apache status pages. Completely optional." msgstr "" #. Type: note @@ -569,7 +569,7 @@ msgid "" "You are installing the alternc-awstats package. This package allows any user " "to ask for statistics about his web site. Users can ask for a limited number " "of statistic set. Please specify the default quota they will have for this " -"service ?" +"service." msgstr "" #. Type: note @@ -583,7 +583,7 @@ msgstr "" #: ../alternc-awstats.templates:2001 msgid "" "AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly !" +"installed properly!" msgstr "" #. Type: note @@ -598,7 +598,5 @@ msgstr "" #. Description #: ../alternc-awstats.templates:2001 msgid "" -"Please check out the AlternC installation documentation before proceeding. " -"Merci de consulter la documentation d'installation d'AlternC avant de " -"continuer." +"Please check out the AlternC installation documentation before proceeding." msgstr "" diff --git a/debian/po/pt.po b/debian/po/pt.po index 62052e88..9bd38b2e 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: AlternC 2.0\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2013-02-03 19:37+0100\n" +"POT-Creation-Date: 2013-02-03 20:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: \n" "Language-Team: \n" @@ -388,7 +388,7 @@ msgstr "" #. Type: string #. Description #: ../alternc.templates:23001 -msgid "Warning : Be careful ! It can generate some problems." +msgid "Warning: Be careful! It can generate some problems." msgstr "" #. Type: string @@ -402,7 +402,7 @@ msgstr "" #: ../alternc.templates:24001 msgid "" "The IP address (or ip/prefix) of the server(s) which must be authorized to " -"ping us and access apache status pages. Completely optional." +"ping the server and access apache status pages. Completely optional." msgstr "" #. Type: note @@ -568,7 +568,7 @@ msgid "" "You are installing the alternc-awstats package. This package allows any user " "to ask for statistics about his web site. Users can ask for a limited number " "of statistic set. Please specify the default quota they will have for this " -"service ?" +"service." msgstr "" #. Type: note @@ -582,7 +582,7 @@ msgstr "" #: ../alternc-awstats.templates:2001 msgid "" "AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly !" +"installed properly!" msgstr "" #. Type: note @@ -597,7 +597,5 @@ msgstr "" #. Description #: ../alternc-awstats.templates:2001 msgid "" -"Please check out the AlternC installation documentation before proceeding. " -"Merci de consulter la documentation d'installation d'AlternC avant de " -"continuer." +"Please check out the AlternC installation documentation before proceeding." msgstr "" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 156fc130..5871694e 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2013-02-03 19:37+0100\n" +"POT-Creation-Date: 2013-02-03 20:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -389,7 +389,7 @@ msgstr "" #. Type: string #. Description #: ../alternc.templates:23001 -msgid "Warning : Be careful ! It can generate some problems." +msgid "Warning: Be careful! It can generate some problems." msgstr "" #. Type: string @@ -403,7 +403,7 @@ msgstr "" #: ../alternc.templates:24001 msgid "" "The IP address (or ip/prefix) of the server(s) which must be authorized to " -"ping us and access apache status pages. Completely optional." +"ping the server and access apache status pages. Completely optional." msgstr "" #. Type: note @@ -569,7 +569,7 @@ msgid "" "You are installing the alternc-awstats package. This package allows any user " "to ask for statistics about his web site. Users can ask for a limited number " "of statistic set. Please specify the default quota they will have for this " -"service ?" +"service." msgstr "" #. Type: note @@ -583,7 +583,7 @@ msgstr "" #: ../alternc-awstats.templates:2001 msgid "" "AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly !" +"installed properly!" msgstr "" #. Type: note @@ -598,7 +598,5 @@ msgstr "" #. Description #: ../alternc-awstats.templates:2001 msgid "" -"Please check out the AlternC installation documentation before proceeding. " -"Merci de consulter la documentation d'installation d'AlternC avant de " -"continuer." +"Please check out the AlternC installation documentation before proceeding." msgstr "" diff --git a/debian/rules b/debian/rules index bd84b09c..f3a19844 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 MAJOR=$(shell sed -ne 's/^[^(]*(\([^)]*\)).*/\1/;1p' debian/changelog) -REV=$(shell svn up > /dev/null ; env LANG=C svn info --non-interactive | awk '/^Revision:/ { print $$2 }') +REV=$(shell env LANG=C svn info --non-interactive | awk '/^Revision:/ { print $$2 }') VERSION="${MAJOR}~svn${REV}" export VERSION