[med-svn] r1406 - in trunk/community/website: . inc locale locale/de_DE/LC_MESSAGES locale/fr_FR/LC_MESSAGES locale/it_IT/LC_MESSAGES locale/pt_BR/LC_MESSAGES

hanska-guest at alioth.debian.org hanska-guest at alioth.debian.org
Sun Feb 17 13:25:58 UTC 2008 

Author: hanska-guest
Date: 2008-02-17 13:25:57 +0000 (Sun, 17 Feb 2008)
New Revision: 1406

Removed:
   trunk/community/website/tasks-old.tmpl
Modified:
   trunk/community/website/inc/header.inc.php
   trunk/community/website/index.php
   trunk/community/website/locale/de_DE/LC_MESSAGES/messages.po
   trunk/community/website/locale/fr_FR/LC_MESSAGES/messages.po
   trunk/community/website/locale/it_IT/LC_MESSAGES/messages.po
   trunk/community/website/locale/messages.po
   trunk/community/website/locale/pt_BR/LC_MESSAGES/messages.po
   trunk/community/website/locales.php
Log:
* Locales fixed (and new format used: sprintf(_(), ...)).
* Go translators, go! ;)


Modified: trunk/community/website/inc/header.inc.php
===================================================================
--- trunk/community/website/inc/header.inc.php	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/inc/header.inc.php	2008-02-17 13:25:57 UTC (rev 1406)
@@ -31,12 +31,8 @@
 </div>
 <div class="heading">
 	<div class="tabBar" style="text-align: center;">
-		<?php
-			$msg = _("Help us to see Debian used by medical practicioners and researchers! Join us on the %1Alioth page%2.");
-			echo str_replace(array("%1", "%2"),
-						array('<a href="http://alioth.debian.org/projects/debian-med">', '</a>'),
-						$msg);
-		?>
+		<?= sprintf(_("Help us to see Debian used by medical practicioners and researchers! Join us on the %sAlioth page%s."),
+				'<a href="http://alioth.debian.org/projects/debian-med">', '</a>')); ?>
 	</div>
 	<?php
 		/* if ($show_locale_warning && ($_SERVER["PHP_SELF"] != "/locales.php")) {
@@ -46,7 +42,7 @@
 				<img src="/img/warning.png" />
 			</div>
 			<?=_("You're using a low priority locale.<br />Please ask the site administrators to add your locale, or provide one yourself :).")?><br />
-			<?=str_replace(array("%1", "%2"), array('<a href="/locales.php">', "</a>"), _("Visit the %1Localization page%2."))?>
+			<?= sprintf(_("Visit the %sLocalization page%s.), '<a href="/locales.php">', "</a>"); ?>
 		</p>
 	</div>
 		}*/

Modified: trunk/community/website/index.php
===================================================================
--- trunk/community/website/index.php	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/index.php	2008-02-17 13:25:57 UTC (rev 1406)
@@ -23,9 +23,7 @@
 					<br />
 					<?=_("Your browser uses language settings that we could not yet provide translations for.<br />If you can spare one to two hours then please consider to help us in translating our pages for your people, too. Instructions are found <a href=\"/locales.php\">here</a>.")?>
 					<br /><br />
-					<?php
-						$msg = _("Visit the %1Localization page%2.");
-						echo str_replace(array("%1", "%2"), array('<a href="/locales.php">', '</a>'), $msg);
+					<?= sprintf(_("Visit the %sLocalization page%s."), '<a href="/locales.php">', '</a>'); ?>
 					?>
 				</p>
 			</div>

Modified: trunk/community/website/locale/de_DE/LC_MESSAGES/messages.po
===================================================================
--- trunk/community/website/locale/de_DE/LC_MESSAGES/messages.po	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/locale/de_DE/LC_MESSAGES/messages.po	2008-02-17 13:25:57 UTC (rev 1406)
@@ -16,8 +16,8 @@
         "Content-Transfer-Encoding: 8bit\n"
 
 #: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
-#: ../tasks-old.tmpl:8 ../tasks.tmpl:8 ../tasks_idx.tmpl:8 bug_details.tmpl:8 bugs.tmpl:7
-#: ddtp.tmpl:7 ddtp_details.tmpl:8 locales.php:7
+#: ../tasks.tmpl:8 ../tasks_idx.tmpl:8 bug_details.tmpl:8 bugs.tmpl:7 ddtp.tmpl:7
+#: ddtp_details.tmpl:8 locales.php:7
 msgid   "summary"
 msgstr  "Zusammenfassung"
 
@@ -30,14 +30,14 @@
 msgstr  "Alle Bugs"
 
 #: ../bug_details.tmpl:40 ../bugs.tmpl:66 ../ddtp.tmpl:30 ../ddtp_details.tmpl:34
-#: ../tasks-old.tmpl:115 ../tasks.tmpl:109 ../tasks.tmpl:110 ../tasks_idx.tmpl:29
-#: bug_details.tmpl:40 bugs.tmpl:66 ddtp.tmpl:30 ddtp_details.tmpl:35
+#: ../tasks.tmpl:109 ../tasks.tmpl:110 ../tasks_idx.tmpl:29 bug_details.tmpl:40
+#: bugs.tmpl:66 ddtp.tmpl:30 ddtp_details.tmpl:35
 msgid   "Last update"
 msgstr  "Zuletzt aktualisiert"
 
 #: ../bug_details.tmpl:41 ../bugs.tmpl:67 ../ddtp.tmpl:31 ../ddtp_details.tmpl:35
-#: ../tasks-old.tmpl:116 ../tasks.tmpl:110 ../tasks.tmpl:111 ../tasks_idx.tmpl:30
-#: bug_details.tmpl:41 bugs.tmpl:67 ddtp.tmpl:31 ddtp_details.tmpl:36
+#: ../tasks.tmpl:110 ../tasks.tmpl:111 ../tasks_idx.tmpl:30 bug_details.tmpl:41
+#: bugs.tmpl:67 ddtp.tmpl:31 ddtp_details.tmpl:36
 msgid   "Please note: this page gets automatically updated twice a day, on 00:00 and 12:00 UTC."
 msgstr  "Diese Seite wird automatisch zweimal am Tag aktualisiert: zu Mitternacht und um Mittag."
 
@@ -63,7 +63,7 @@
 
 #: ../inc/header.inc.php:35
 msgid   "Help us to see Debian used by medical practicioners and researchers! Join us on the %"
-        "1Alioth page%2."
+        "1Alioth page%s."
 msgstr  ""
 
 #: ../index.php:7 index.php:7
@@ -103,8 +103,8 @@
         "\">Hier</a> steht wie dies funktioniert."
 
 #: ../index.php:27 index.php:27
-msgid   "Visit the %1Localization page%2."
-msgstr  "Besuchen Sie die %1&Uuml;bersetzungsseite%2"
+msgid   "Visit the %sLocalization page%s."
+msgstr  "Besuchen Sie die %s&Uuml;bersetzungsseite%s"
 
 #: ../index.php:36 index.php:83
 msgid   "pages"
@@ -214,9 +214,9 @@
 
 #: ../locales.php:29 locales.php:29
 msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
-        "1How to Contribute%2 page."
+        "1How to Contribute%s page."
 msgstr  "Mehr Informationen dazu, wie Du dem Projekt zuarbeiten kannst, k&ouml;nnen auf der Seite %"
-        "1How to Contribute%2 abgerufen werden."
+        "1How to Contribute%s abgerufen werden."
 
 #: ../locales.php:42 locales.php:42
 msgid   "localization"
@@ -242,48 +242,30 @@
 msgid   "Add new locale"
 msgstr  "F&uuml;ge neue Sprache hinzu"
 
-#: ../tasks-old.tmpl:18 ../tasks.tmpl:18
+#: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the Debian-Med Project."
 msgstr  ""
 
-#: ../tasks-old.tmpl:19 ../tasks.tmpl:19
+#: ../tasks.tmpl:19
 msgid   "Currently, only a few of them are available as Debian packages."
 msgstr  ""
 
-#: ../tasks-old.tmpl:20 ../tasks.tmpl:20
+#: ../tasks.tmpl:20
 msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
         "a high quality Custom Debian Distribution."
 msgstr  ""
 
-#: ../tasks-old.tmpl:23 ../tasks.tmpl:23
+#: ../tasks.tmpl:23
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: ../tasks-old.tmpl:26
-msgid   "Green: The project is %1available as an official Debian package%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:28
-msgid   "Yellow: The project is %1available as an inofficial Debian package%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:30
-msgid   "Red: The project is <a href="
-msgstr  ""
-
-#: ../tasks-old.tmpl:35
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
-        "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %1Debian-Med mailing list%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:99 ../tasks.tmpl:93 ../tasks.tmpl:94
+#: ../tasks.tmpl:93 ../tasks.tmpl:94
 msgid   "Responsible"
 msgstr  ""
 
-#: ../tasks-old.tmpl:103 ../tasks.tmpl:97 ../tasks.tmpl:98
+#: ../tasks.tmpl:97 ../tasks.tmpl:98
 #, fuzzy
 msgid   "Debian package not available"
 msgstr  "Keine &Uuml;bersetzung verf&uuml;gbar"
@@ -293,31 +275,16 @@
 msgid   "Green: The project is %savailable as an official Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:26
-#, php-format
-msgid   "Green: The project is [%s]available as an official Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:27
 #, php-format
 msgid   "Yellow: The project is %savailable as an inofficial Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:27
-#, php-format
-msgid   "Yellow: The project is [%s]available as an inofficial Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:28
 #, php-format
 msgid   "Red: The project is %snot (yet) available as a Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:28
-#, php-format
-msgid   "Red: The project is [%s]not (yet) available as a Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:31
 #, php-format
 msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
@@ -325,13 +292,6 @@
         "description of that project to the %sDebian-Med mailing list%s"
 msgstr  ""
 
-#: ../tasks.tmpl:31
-#, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
-        "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the [%s]Debian-Med mailing list[%s]"
-msgstr  ""
-
 #: ddtp_details.tmpl:22
 msgid   "Short description"
 msgstr  "Kurzbeschreibung"
@@ -341,8 +301,8 @@
 msgstr  "Ausf&uuml;hrliche Beschreibung"
 
 #: inc/header.inc.php:35
-msgid   "Join us! Help us in making Doctors use Debian! See the %1Alioth page%2."
-msgstr  "Mach mit! Unterst&uuml;tze &Auml;rzte bei der Nutzung Debians! Siehe die %1Alioth page%2."
+msgid   "Join us! Help us in making Doctors use Debian! See the %sAlioth page%s."
+msgstr  "Mach mit! Unterst&uuml;tze &Auml;rzte bei der Nutzung Debians! Siehe die %sAlioth page%s."
 
 #
 # These strings are manually added, they

Modified: trunk/community/website/locale/fr_FR/LC_MESSAGES/messages.po
===================================================================
--- trunk/community/website/locale/fr_FR/LC_MESSAGES/messages.po	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/locale/fr_FR/LC_MESSAGES/messages.po	2008-02-17 13:25:57 UTC (rev 1406)
@@ -20,8 +20,8 @@
         "X-Generator: KBabel 1.11.4\n"
 
 #: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
-#: ../tasks-old.tmpl:8 ../tasks.tmpl:8 ../tasks_idx.tmpl:8 bug_details.tmpl:8 bugs.tmpl:7
-#: ddtp.tmpl:7 ddtp_details.tmpl:8 locales.php:7
+#: ../tasks.tmpl:8 ../tasks_idx.tmpl:8 bug_details.tmpl:8 bugs.tmpl:7 ddtp.tmpl:7
+#: ddtp_details.tmpl:8 locales.php:7
 msgid   "summary"
 msgstr  "r&eacute;sum&eacute;"
 
@@ -34,14 +34,14 @@
 msgstr  ""
 
 #: ../bug_details.tmpl:40 ../bugs.tmpl:66 ../ddtp.tmpl:30 ../ddtp_details.tmpl:34
-#: ../tasks-old.tmpl:115 ../tasks.tmpl:109 ../tasks.tmpl:110 ../tasks_idx.tmpl:29
-#: bug_details.tmpl:40 bugs.tmpl:66 ddtp.tmpl:30 ddtp_details.tmpl:35
+#: ../tasks.tmpl:109 ../tasks.tmpl:110 ../tasks_idx.tmpl:29 bug_details.tmpl:40
+#: bugs.tmpl:66 ddtp.tmpl:30 ddtp_details.tmpl:35
 msgid   "Last update"
 msgstr  ""
 
 #: ../bug_details.tmpl:41 ../bugs.tmpl:67 ../ddtp.tmpl:31 ../ddtp_details.tmpl:35
-#: ../tasks-old.tmpl:116 ../tasks.tmpl:110 ../tasks.tmpl:111 ../tasks_idx.tmpl:30
-#: bug_details.tmpl:41 bugs.tmpl:67 ddtp.tmpl:31 ddtp_details.tmpl:36
+#: ../tasks.tmpl:110 ../tasks.tmpl:111 ../tasks_idx.tmpl:30 bug_details.tmpl:41
+#: bugs.tmpl:67 ddtp.tmpl:31 ddtp_details.tmpl:36
 msgid   "Please note: this page gets automatically updated twice a day, on 00:00 and 12:00 UTC."
 msgstr  ""
 
@@ -67,7 +67,7 @@
 
 #: ../inc/header.inc.php:35
 msgid   "Help us to see Debian used by medical practicioners and researchers! Join us on the %"
-        "1Alioth page%2."
+        "1Alioth page%s."
 msgstr  ""
 
 #: ../index.php:7 index.php:7
@@ -106,8 +106,8 @@
 msgstr  ""
 
 #: ../index.php:27 index.php:27
-msgid   "Visit the %1Localization page%2."
-msgstr  "Visitez la <q>%1Localization page%2</q>"
+msgid   "Visit the %sLocalization page%s."
+msgstr  "Visitez la <q>%sLocalization page%s</q>"
 
 #: ../index.php:36 index.php:83
 msgid   "pages"
@@ -217,9 +217,9 @@
 
 #: ../locales.php:29 locales.php:29
 msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
-        "1How to Contribute%2 page."
+        "1How to Contribute%s page."
 msgstr  "Vous pouvez trouver plus d'information sur les moyens de participer &agrave; Debian-Med "
-        "dans la page <q>%1How to Contribute%2</q>."
+        "dans la page <q>%sHow to Contribute%s</q>."
 
 #: ../locales.php:42 locales.php:42
 msgid   "localization"
@@ -245,48 +245,30 @@
 msgid   "Add new locale"
 msgstr  "Ajouter une nouvelle localisation"
 
-#: ../tasks-old.tmpl:18 ../tasks.tmpl:18
+#: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the Debian-Med Project."
 msgstr  ""
 
-#: ../tasks-old.tmpl:19 ../tasks.tmpl:19
+#: ../tasks.tmpl:19
 msgid   "Currently, only a few of them are available as Debian packages."
 msgstr  ""
 
-#: ../tasks-old.tmpl:20 ../tasks.tmpl:20
+#: ../tasks.tmpl:20
 msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
         "a high quality Custom Debian Distribution."
 msgstr  ""
 
-#: ../tasks-old.tmpl:23 ../tasks.tmpl:23
+#: ../tasks.tmpl:23
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: ../tasks-old.tmpl:26
-msgid   "Green: The project is %1available as an official Debian package%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:28
-msgid   "Yellow: The project is %1available as an inofficial Debian package%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:30
-msgid   "Red: The project is <a href="
-msgstr  ""
-
-#: ../tasks-old.tmpl:35
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
-        "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %1Debian-Med mailing list%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:99 ../tasks.tmpl:93 ../tasks.tmpl:94
+#: ../tasks.tmpl:93 ../tasks.tmpl:94
 msgid   "Responsible"
 msgstr  ""
 
-#: ../tasks-old.tmpl:103 ../tasks.tmpl:97 ../tasks.tmpl:98
+#: ../tasks.tmpl:97 ../tasks.tmpl:98
 msgid   "Debian package not available"
 msgstr  ""
 
@@ -295,31 +277,16 @@
 msgid   "Green: The project is %savailable as an official Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:26
-#, php-format
-msgid   "Green: The project is [%s]available as an official Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:27
 #, php-format
 msgid   "Yellow: The project is %savailable as an inofficial Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:27
-#, php-format
-msgid   "Yellow: The project is [%s]available as an inofficial Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:28
 #, php-format
 msgid   "Red: The project is %snot (yet) available as a Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:28
-#, php-format
-msgid   "Red: The project is [%s]not (yet) available as a Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:31
 #, php-format
 msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
@@ -327,13 +294,6 @@
         "description of that project to the %sDebian-Med mailing list%s"
 msgstr  ""
 
-#: ../tasks.tmpl:31
-#, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
-        "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the [%s]Debian-Med mailing list[%s]"
-msgstr  ""
-
 #: ddtp_details.tmpl:22
 msgid   "Short description"
 msgstr  ""
@@ -343,9 +303,9 @@
 msgstr  ""
 
 #: inc/header.inc.php:35
-msgid   "Join us! Help us in making Doctors use Debian! See the %1Alioth page%2."
+msgid   "Join us! Help us in making Doctors use Debian! See the %sAlioth page%s."
 msgstr  "Rejoignez-nous&nbsp;! Pour nous aider &agrave; populariser Debian dans le monde m&eacute;"
-        "dical, voyez la page <q>%1Alioth page%2</q>"
+        "dical, voyez la page <q>%sAlioth page%s</q>"
 
 #
 # These strings are manually added, they

Modified: trunk/community/website/locale/it_IT/LC_MESSAGES/messages.po
===================================================================
--- trunk/community/website/locale/it_IT/LC_MESSAGES/messages.po	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/locale/it_IT/LC_MESSAGES/messages.po	2008-02-17 13:25:57 UTC (rev 1406)
@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: 0.1\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2008-02-17 14:11+0100\n"
+        "POT-Creation-Date: 2008-02-17 14:13+0100\n"
         "PO-Revision-Date: 2008-02-17 13:30+0100\n"
         "Last-Translator: David Paleino <d.paleino at gmail.com>\n"
         "Language-Team: Italian <it at li.org>\n"
@@ -16,8 +16,8 @@
         "Content-Transfer-Encoding: 8bit\n"
 
 #: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
-#: ../tasks-old.tmpl:8 ../tasks.tmpl:8 ../tasks_idx.tmpl:8 bug_details.tmpl:8 bugs.tmpl:7
-#: ddtp.tmpl:7 ddtp_details.tmpl:8 locales.php:7
+#: ../tasks.tmpl:8 ../tasks_idx.tmpl:8 bug_details.tmpl:8 bugs.tmpl:7 ddtp.tmpl:7
+#: ddtp_details.tmpl:8 locales.php:7
 msgid   "summary"
 msgstr  "riassunto"
 
@@ -30,14 +30,14 @@
 msgstr  "Bugs totali"
 
 #: ../bug_details.tmpl:40 ../bugs.tmpl:66 ../ddtp.tmpl:30 ../ddtp_details.tmpl:34
-#: ../tasks-old.tmpl:115 ../tasks.tmpl:109 ../tasks.tmpl:110 ../tasks_idx.tmpl:29
-#: bug_details.tmpl:40 bugs.tmpl:66 ddtp.tmpl:30 ddtp_details.tmpl:35
+#: ../tasks.tmpl:109 ../tasks.tmpl:110 ../tasks_idx.tmpl:29 bug_details.tmpl:40
+#: bugs.tmpl:66 ddtp.tmpl:30 ddtp_details.tmpl:35
 msgid   "Last update"
 msgstr  "Ultimo aggiornamento"
 
 #: ../bug_details.tmpl:41 ../bugs.tmpl:67 ../ddtp.tmpl:31 ../ddtp_details.tmpl:35
-#: ../tasks-old.tmpl:116 ../tasks.tmpl:110 ../tasks.tmpl:111 ../tasks_idx.tmpl:30
-#: bug_details.tmpl:41 bugs.tmpl:67 ddtp.tmpl:31 ddtp_details.tmpl:36
+#: ../tasks.tmpl:110 ../tasks.tmpl:111 ../tasks_idx.tmpl:30 bug_details.tmpl:41
+#: bugs.tmpl:67 ddtp.tmpl:31 ddtp_details.tmpl:36
 msgid   "Please note: this page gets automatically updated twice a day, on 00:00 and 12:00 UTC."
 msgstr  "Nota che questa pagina viene automaticamente generata due volte al giorno, alle 00:00 e "
         "alle 12:00 UTC."
@@ -64,9 +64,9 @@
 
 #: ../inc/header.inc.php:35
 msgid   "Help us to see Debian used by medical practicioners and researchers! Join us on the %"
-        "1Alioth page%2."
-msgstr  "Aiutaci a vedere Debian usata dai medici e dai ricercatori! Unisciti a noi sulla %1pagina "
-        "Alioth%2."
+        "1Alioth page%s."
+msgstr  "Aiutaci a vedere Debian usata dai medici e dai ricercatori! Unisciti a noi sulla %spagina "
+        "Alioth%s."
 
 #: ../index.php:7 index.php:7
 msgid   "information"
@@ -106,8 +106,8 @@
         "href=\"/locales.php\">qui</a>."
 
 #: ../index.php:27 index.php:27
-msgid   "Visit the %1Localization page%2."
-msgstr  "Visita la %1pagina Localizzazione%2."
+msgid   "Visit the %sLocalization page%s."
+msgstr  "Visita la %spagina Localizzazione%s."
 
 #: ../index.php:36 index.php:83
 msgid   "pages"
@@ -216,9 +216,9 @@
 
 #: ../locales.php:29 locales.php:29
 msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
-        "1How to Contribute%2 page."
+        "1How to Contribute%s page."
 msgstr  "Maggiori informazioni su come contribuire al progetto Debian-Med possono essere trovate "
-        "nella pagina %1Come contribuire%2."
+        "nella pagina %sCome contribuire%s."
 
 #: ../locales.php:42 locales.php:42
 msgid   "localization"
@@ -244,51 +244,33 @@
 msgid   "Add new locale"
 msgstr  "Aggiungi nuovo locale"
 
-#: ../tasks-old.tmpl:18 ../tasks.tmpl:18
+#: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the Debian-Med Project."
 msgstr  "L'elenco sulla destra include vari progetti software che sono di qualche interesse al "
         "Progetto Debian-Med."
 
-#: ../tasks-old.tmpl:19 ../tasks.tmpl:19
+#: ../tasks.tmpl:19
 msgid   "Currently, only a few of them are available as Debian packages."
 msgstr  "Attualmente, solo alcuni sono disponibili come pacchetti Debian."
 
-#: ../tasks-old.tmpl:20 ../tasks.tmpl:20
+#: ../tasks.tmpl:20
 msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
         "a high quality Custom Debian Distribution."
 msgstr  "È nostro obiettivo, comunque, includere in Debian-Med tutto il software che può "
         "sensibilmente contribuire a una Custom Debian Distribution di qualità."
 
-#: ../tasks-old.tmpl:23 ../tasks.tmpl:23
+#: ../tasks.tmpl:23
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  "Per una migliore visione d'insieme della disponibilità del progetto come pacchetto "
         "Debian, ogni riga ha un colore codificato secondo il seguente schema:"
 
-#: ../tasks-old.tmpl:26
-msgid   "Green: The project is %1available as an official Debian package%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:28
-msgid   "Yellow: The project is %1available as an inofficial Debian package%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:30
-msgid   "Red: The project is <a href="
-msgstr  ""
-
-#: ../tasks-old.tmpl:35
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
-        "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %1Debian-Med mailing list%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:99 ../tasks.tmpl:93 ../tasks.tmpl:94
+#: ../tasks.tmpl:93 ../tasks.tmpl:94
 msgid   "Responsible"
 msgstr  "Responsabile"
 
-#: ../tasks-old.tmpl:103 ../tasks.tmpl:97 ../tasks.tmpl:98
+#: ../tasks.tmpl:97 ../tasks.tmpl:98
 msgid   "Debian package not available"
 msgstr  "pacchetto Debian non disponibile"
 
@@ -325,8 +307,8 @@
 msgstr  "Descrizione lunga"
 
 #: inc/header.inc.php:35
-msgid   "Join us! Help us in making Doctors use Debian! See the %1Alioth page%2."
-msgstr  "Unisciti a noi! Aiutaci a diffondere Debian tra i Medici! Guarda la %1pagina Alioth%2."
+msgid   "Join us! Help us in making Doctors use Debian! See the %sAlioth page%s."
+msgstr  "Unisciti a noi! Aiutaci a diffondere Debian tra i Medici! Guarda la %spagina Alioth%s."
 
 #
 # These strings are manually added, they

Modified: trunk/community/website/locale/messages.po
===================================================================
--- trunk/community/website/locale/messages.po	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/locale/messages.po	2008-02-17 13:25:57 UTC (rev 1406)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-17 14:11+0100\n"
+"POT-Creation-Date: 2008-02-17 14:13+0100\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"
@@ -64,7 +64,7 @@
 
 #: ../inc/header.inc.php:35
 msgid ""
-"Help us to see Debian used by medical practicioners and researchers! Join us on the %1Alioth page%"
+"Help us to see Debian used by medical practicioners and researchers! Join us on the %sAlioth page%"
 "2."
 msgstr ""
 
@@ -100,7 +100,7 @@
 msgstr ""
 
 #: ../index.php:27 index.php:27
-msgid "Visit the %1Localization page%2."
+msgid "Visit the %sLocalization page%s."
 msgstr ""
 
 #: ../index.php:36 index.php:83
@@ -209,8 +209,8 @@
 
 #: ../locales.php:29 locales.php:29
 msgid ""
-"More information on how to contribute to the Debian-Med project, can be found in the %1How to "
-"Contribute%2 page."
+"More information on how to contribute to the Debian-Med project, can be found in the %sHow to "
+"Contribute%s page."
 msgstr ""
 
 #: ../locales.php:42 locales.php:42
@@ -260,11 +260,11 @@
 msgstr ""
 
 #: ../tasks-old.tmpl:26
-msgid "Green: The project is %1available as an official Debian package%2"
+msgid "Green: The project is %savailable as an official Debian package%s"
 msgstr ""
 
 #: ../tasks-old.tmpl:28
-msgid "Yellow: The project is %1available as an inofficial Debian package%2"
+msgid "Yellow: The project is %savailable as an inofficial Debian package%s"
 msgstr ""
 
 #: ../tasks-old.tmpl:30
@@ -275,7 +275,7 @@
 msgid ""
 "If you discover a project which looks like a good candidate for Debian-Med to you, or if you have "
 "prepared an inofficial Debian package, please do not hesitate to send a description of that "
-"project to the %1Debian-Med mailing list%2"
+"project to the %sDebian-Med mailing list%s"
 msgstr ""
 
 #: ../tasks-old.tmpl:99 ../tasks.tmpl:93 ../tasks.tmpl:94
@@ -341,5 +341,5 @@
 msgstr ""
 
 #: inc/header.inc.php:35
-msgid "Join us! Help us in making Doctors use Debian! See the %1Alioth page%2."
+msgid "Join us! Help us in making Doctors use Debian! See the %sAlioth page%s."
 msgstr ""

Modified: trunk/community/website/locale/pt_BR/LC_MESSAGES/messages.po
===================================================================
--- trunk/community/website/locale/pt_BR/LC_MESSAGES/messages.po	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/locale/pt_BR/LC_MESSAGES/messages.po	2008-02-17 13:25:57 UTC (rev 1406)
@@ -16,8 +16,8 @@
         "Content-Transfer-Encoding: 8bit\n"
 
 #: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
-#: ../tasks-old.tmpl:8 ../tasks.tmpl:8 ../tasks_idx.tmpl:8 bug_details.tmpl:8 bugs.tmpl:7
-#: ddtp.tmpl:7 ddtp_details.tmpl:8 locales.php:7
+#: ../tasks.tmpl:8 ../tasks_idx.tmpl:8 bug_details.tmpl:8 bugs.tmpl:7 ddtp.tmpl:7
+#: ddtp_details.tmpl:8 locales.php:7
 msgid   "summary"
 msgstr  "sum&aacute;rio"
 
@@ -30,14 +30,14 @@
 msgstr  "Total de bugs"
 
 #: ../bug_details.tmpl:40 ../bugs.tmpl:66 ../ddtp.tmpl:30 ../ddtp_details.tmpl:34
-#: ../tasks-old.tmpl:115 ../tasks.tmpl:109 ../tasks.tmpl:110 ../tasks_idx.tmpl:29
-#: bug_details.tmpl:40 bugs.tmpl:66 ddtp.tmpl:30 ddtp_details.tmpl:35
+#: ../tasks.tmpl:109 ../tasks.tmpl:110 ../tasks_idx.tmpl:29 bug_details.tmpl:40
+#: bugs.tmpl:66 ddtp.tmpl:30 ddtp_details.tmpl:35
 msgid   "Last update"
 msgstr  "&Uacute;ltima atualiza&ccedil;&atilde;o"
 
 #: ../bug_details.tmpl:41 ../bugs.tmpl:67 ../ddtp.tmpl:31 ../ddtp_details.tmpl:35
-#: ../tasks-old.tmpl:116 ../tasks.tmpl:110 ../tasks.tmpl:111 ../tasks_idx.tmpl:30
-#: bug_details.tmpl:41 bugs.tmpl:67 ddtp.tmpl:31 ddtp_details.tmpl:36
+#: ../tasks.tmpl:110 ../tasks.tmpl:111 ../tasks_idx.tmpl:30 bug_details.tmpl:41
+#: bugs.tmpl:67 ddtp.tmpl:31 ddtp_details.tmpl:36
 msgid   "Please note: this page gets automatically updated twice a day, on 00:00 and 12:00 UTC."
 msgstr  "Nota: esta p&aacute;gina &eacute; atualizada automaticamente duas vezes ao dia, &agrave;s "
         "00:00 e 12:00 UTC."
@@ -64,7 +64,7 @@
 
 #: ../inc/header.inc.php:35
 msgid   "Help us to see Debian used by medical practicioners and researchers! Join us on the %"
-        "1Alioth page%2."
+        "1Alioth page%s."
 msgstr  ""
 
 #: ../index.php:7 index.php:7
@@ -107,8 +107,8 @@
         "\"/locales.php\">here</a>."
 
 #: ../index.php:27 index.php:27
-msgid   "Visit the %1Localization page%2."
-msgstr  "Visite a %1p&aacute;gina de localiza&ccedil;&atilde;o%2."
+msgid   "Visit the %sLocalization page%s."
+msgstr  "Visite a %sp&aacute;gina de localiza&ccedil;&atilde;o%s."
 
 #: ../index.php:36 index.php:83
 msgid   "pages"
@@ -218,9 +218,9 @@
 
 #: ../locales.php:29 locales.php:29
 msgid   "More information on how to contribute to the Debian-Med project, can be found in the %"
-        "1How to Contribute%2 page."
+        "1How to Contribute%s page."
 msgstr  "Mais informa&ccedil;&otilde;es sobre como contribuir para o projeto Debian-Med podem ser "
-        "encontradas na p&aacute;gina %1Como Contribuir%2."
+        "encontradas na p&aacute;gina %sComo Contribuir%s."
 
 #: ../locales.php:42 locales.php:42
 msgid   "localization"
@@ -246,48 +246,30 @@
 msgid   "Add new locale"
 msgstr  "Adicionar nova localiza&ccedil;&atilde;o"
 
-#: ../tasks-old.tmpl:18 ../tasks.tmpl:18
+#: ../tasks.tmpl:18
 msgid   "The list to the right includes various software projects which are of some interest to "
         "the Debian-Med Project."
 msgstr  ""
 
-#: ../tasks-old.tmpl:19 ../tasks.tmpl:19
+#: ../tasks.tmpl:19
 msgid   "Currently, only a few of them are available as Debian packages."
 msgstr  ""
 
-#: ../tasks-old.tmpl:20 ../tasks.tmpl:20
+#: ../tasks.tmpl:20
 msgid   "It is our goal, however, to include all software in Debian-Med which can sensibly add to "
         "a high quality Custom Debian Distribution."
 msgstr  ""
 
-#: ../tasks-old.tmpl:23 ../tasks.tmpl:23
+#: ../tasks.tmpl:23
 msgid   "For a better overview of the project's availability as a Debian package, each head row "
         "has a color code according to this scheme:"
 msgstr  ""
 
-#: ../tasks-old.tmpl:26
-msgid   "Green: The project is %1available as an official Debian package%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:28
-msgid   "Yellow: The project is %1available as an inofficial Debian package%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:30
-msgid   "Red: The project is <a href="
-msgstr  ""
-
-#: ../tasks-old.tmpl:35
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
-        "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the %1Debian-Med mailing list%2"
-msgstr  ""
-
-#: ../tasks-old.tmpl:99 ../tasks.tmpl:93 ../tasks.tmpl:94
+#: ../tasks.tmpl:93 ../tasks.tmpl:94
 msgid   "Responsible"
 msgstr  ""
 
-#: ../tasks-old.tmpl:103 ../tasks.tmpl:97 ../tasks.tmpl:98
+#: ../tasks.tmpl:97 ../tasks.tmpl:98
 msgid   "Debian package not available"
 msgstr  ""
 
@@ -296,31 +278,16 @@
 msgid   "Green: The project is %savailable as an official Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:26
-#, php-format
-msgid   "Green: The project is [%s]available as an official Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:27
 #, php-format
 msgid   "Yellow: The project is %savailable as an inofficial Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:27
-#, php-format
-msgid   "Yellow: The project is [%s]available as an inofficial Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:28
 #, php-format
 msgid   "Red: The project is %snot (yet) available as a Debian package%s"
 msgstr  ""
 
-#: ../tasks.tmpl:28
-#, php-format
-msgid   "Red: The project is [%s]not (yet) available as a Debian package[%s]"
-msgstr  ""
-
 #: ../tasks.tmpl:31
 #, php-format
 msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
@@ -328,13 +295,6 @@
         "description of that project to the %sDebian-Med mailing list%s"
 msgstr  ""
 
-#: ../tasks.tmpl:31
-#, php-format
-msgid   "If you discover a project which looks like a good candidate for Debian-Med to you, or if "
-        "you have prepared an inofficial Debian package, please do not hesitate to send a "
-        "description of that project to the [%s]Debian-Med mailing list[%s]"
-msgstr  ""
-
 #: ddtp_details.tmpl:22
 msgid   "Short description"
 msgstr  "Descri&ccedil;&atilde;o resumida"
@@ -344,9 +304,9 @@
 msgstr  "Descri&ccedil;&atilde;o completa"
 
 #: inc/header.inc.php:35
-msgid   "Join us! Help us in making Doctors use Debian! See the %1Alioth page%2."
+msgid   "Join us! Help us in making Doctors use Debian! See the %sAlioth page%s."
 msgstr  "Junte-se a n&oacute;s! Ajude-nos a fazer os M&eacute;dicos utilizarem Debian! Veja a %"
-        "1p&aacute;gina do Alioth%2."
+        "1p&aacute;gina do Alioth%s."
 
 #
 # These strings are manually added, they

Modified: trunk/community/website/locales.php
===================================================================
--- trunk/community/website/locales.php	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/locales.php	2008-02-17 13:25:57 UTC (rev 1406)
@@ -25,12 +25,8 @@
 					</p>
 					<?=_("Your browser uses language settings that we could not yet provide translations for.<br />If you can spare one to two hours then please consider to help us in translating our pages for your people, too. Instructions are found <a href=\"/locales.php\">here</a>.")?>
 					<br /><br />
-					<?php
-						$msg = _("More information on how to contribute to the Debian-Med project, can be found in the %1How to Contribute%2 page.");
-						echo str_replace(array("%1", "%2"),
-									array('<a href="/contribute.php"><del>', '</del></a>'),
-									$msg);
-					?>
+					<?= sprintf(_("More information on how to contribute to the Debian-Med project, can be found in the %sHow to Contribute%s page."),
+							'<a href="/contribute.php"><del>', '</del></a>');?>
 				</p>
 			</div>
 			<?php

Deleted: trunk/community/website/tasks-old.tmpl
===================================================================
--- trunk/community/website/tasks-old.tmpl	2008-02-17 13:12:46 UTC (rev 1405)
+++ trunk/community/website/tasks-old.tmpl	2008-02-17 13:25:57 UTC (rev 1406)
@@ -1,119 +0,0 @@
-<?php
-ini_set("include_path", ini_get("include_path").":../");
-require_once("inc/header.inc.php");
-?>
-<table class="columns">
-<tr>
-	<td class="left">
-		<span class="section"><?=_("summary")?></span>
-		<div class="section">
-			<div class="sectionTop"></div>
-			<div class="row">
-				<strong node="con:task"></strong><br />
-				<em node="con:shortdesc"></em><br />
-				<p node="con:longdesc"></p>
-			</div>
-			<div class="row">
-				<p>
-					<?=_("The list to the right includes various software projects which are of some interest to the Debian-Med Project.")?>
-					<?=_("Currently, only a few of them are available as Debian packages.")?>
-					<?=_("It is our goal, however, to include all software in Debian-Med which can sensibly add to a high quality Custom Debian Distribution.")?>
-				</p>
-				<p>
-					<?=_("For a better overview of the project's availability as a Debian package, each head row has a color code according to this scheme:")?>
-				</p>
-				<ul>
-					<?php $msg = _("Green: The project is %1available as an official Debian package%2"); ?>
-					<li><?= str_replace(array("%1", "%2"), array('<a href="#official-debs">', '</a>', $msg); ?></li>
-					<?php $msg = _("Yellow: The project is %1available as an inofficial Debian package%2"); ?>
-					<li><?= str_replace(array("%1", "%2"), array('<a href="#inofficial-debs">', '</a>', $msg); ?></li>
-					<?php $msg = _("Red: The project is <a href="#debs-not-available">not (yet) available as a Debian package"); ?>
-					<li><?= str_replace(array("%1", "%2"), array('<a href="#debs-not-available">', '</a>', $msg); ?></li>
-				</ul>
-				<p>
-					<?php
-						$msg =_("If you discover a project which looks like a good candidate for Debian-Med to you, " .
-							"or if you have prepared an inofficial Debian package, please do not hesitate to send " .
-							"a description of that project to the %1Debian-Med mailing list%2"); ?>
-						echo str_replace(array("%1", "%2"), array('<a href="mailto:debian-med at lists.debian.org">', '</a>'), $msg);
-					?>
-				</p>
-			</div>
-		</div>
-	</td>
-	<td class="main">
-		<div class="pageBody">
-			<h1><p node="-con:heading"></p></h1>
-			<p node="-con:official_head"></p>
-			<h1 node="con:task"></h1>
-			<div node="-rep:official"><p node="-con:project"></p>
-				<tbody>
-					<tr class="deb-official">
-						<td class="project-name">
-							<a node="con:anchor" name="" id=""></a>
-							<strong node="con:name"></strong><br />
-							<em node="con:shortdesc"></em><br />
-							<a node="con:url" href=""></a>
-						</td>
-						<td class="project-license">
-							<em node="con:version"></em><br />
-							<em node="con:license"></em><br />
-							<a node="con:pkgurl" href=""></a> &mdash; <a node="con:deburl" href=""></a>
-						</td>
-					</tr>
-					<tr>
-						<td node="con:longdesc" class="project-description" colspan="2"></td>
-					</tr>
-				</tbody>
-			</table></div>
-			<p node="-con:unofficial_head"></p>
-			<div node="-rep:unofficial"><p node="-con:project"></p>
-				<tbody>
-					<tr class="deb-inofficial">
-						<td class="project-name">
-							<a node="con:anchor" name="" id=""></a>
-							<strong node="con:name"></strong><br />
-							<em node="con:shortdesc"></em><br />
-							<a node="con:url" href=""></a>
-						</td>
-						<td class="project-license">
-							<em node="con:version"></em><br />
-							<em node="con:license"></em><br />
-							<a node="con:pkgurl" href=""></a>
-						</td>
-					</tr>
-					<tr>
-						<td node="con:longdesc" class="project-description" colspan="2"></td>
-					</tr>
-				</tbody>
-			</table></div>
-			<p node="-con:unavailable_head"></p>
-			<div node="-rep:unavailable"><p node="-con:project"></p>
-				<tbody>
-					<tr class="deb-not-available">
-						<td class="project-name">
-							<a node="con:anchor" name="" id=""></a>
-							<strong node="con:name"></strong><p node="-con:wnpp"></p><br />
-							<em node="con:shortdesc"></em><br />
-							<a node="con:url" href=""></a><br />
-							<?=_("Responsible")?>: <p node="-con:responsible"></p>
-						</td>
-						<td class="project-license">
-							<em node="con:license"></em><br />
-							<?=_("Debian package not available")?>
-						</td>
-					</tr>
-					<tr>
-						<td node="con:longdesc" class="project-description" colspan="2"></td>
-					</tr>
-				</tbody>
-			</table></div>
-		</div>
-	</td>
-</tr>
-</table>
-<address><?=_("Last update")?>: <div node="-con:date"></div></address>
-<address><?=_("Please note: this page gets automatically updated twice a day, on 00:00 and 12:00 UTC.")?></address>
-<?php
-require_once("inc/footer.inc.php");
-?>

More information about the debian-med-commit mailing list