Fix comment for ARM image with serial console.

diff --git a/www/translations/de_DE/LC_MESSAGES/webapp.po b/www/translations/de_DE/LC_MESSAGES/webapp.po
index c120aa05f8570043aae798739fec8b56b7a114e2..5b167ef3d52d14765cc3b5979bff241edcb5c195 100644 (file)
--- a/www/translations/de_DE/LC_MESSAGES/webapp.po
+++ b/www/translations/de_DE/LC_MESSAGES/webapp.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-23 11:20+0200\n"
+"POT-Creation-Date: 2012-10-23 11:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,7 +79,7 @@ msgstr "Startseite"
 msgid "Crowd funding for the IPFire project"
 msgstr "Crowdfunding für das IPFire-Projekt"
 
-#: templates/wishlist/donate.html:15 templates/wishlist/donate.html:25
+#: templates/wishlist/donate.html:13 templates/wishlist/donate.html:23
 #: templates/wishlist/terms.html:3 templates/wishlist/terms.html:7
 #: templates/base.html:74
 msgid "Terms & Conditions"
@@ -1293,15 +1293,15 @@ msgstr "Impressum"
 msgid "Donation"
 msgstr "Spende"
 
-#: templates/static/donation.html:64
+#: templates/static/donation.html:61
 msgid "Did you know...?"
 msgstr "Schon gewusst?"
 
-#: templates/static/donation.html:80
+#: templates/static/donation.html:77
 msgid "How do we use financial support?"
 msgstr "Wofür werden Spenden eingesetzt?"
 
-#: templates/static/donation.html:132
+#: templates/static/donation.html:129
 msgid "Research & Development"
 msgstr "Forschung & Entwicklung"
 
@@ -1411,73 +1411,81 @@ msgstr "%s nach %s"
 msgid "Checkout this crowdfunding wish from #ipfire:"
 msgstr ""
 
-#: webapp/backend/releases.py:93
+#: webapp/backend/releases.py:96
 msgid "Image for the armv5tel architecture"
 msgstr "Image für die armv5tel-Architektur"
 
-#: webapp/backend/releases.py:94
+#: webapp/backend/releases.py:97
+msgid "armv5tel image for boards with serial console"
+msgstr "armv5tel-Image für Boards mit serieller Konsole"
+
+#: webapp/backend/releases.py:98
 msgid "Installable CD image"
 msgstr "Bootbares CD-Image"
 
-#: webapp/backend/releases.py:95
+#: webapp/backend/releases.py:99
 msgid "Torrent file"
 msgstr "Torrentdatei"
 
-#: webapp/backend/releases.py:96
+#: webapp/backend/releases.py:100
 msgid "Flash image"
 msgstr "Flash-Image"
 
-#: webapp/backend/releases.py:97
+#: webapp/backend/releases.py:101
 msgid "Alix image"
 msgstr "Alix-Image"
 
-#: webapp/backend/releases.py:98
+#: webapp/backend/releases.py:102
 msgid "USB FDD Image"
 msgstr "USB-FDD-Image"
 
-#: webapp/backend/releases.py:99
+#: webapp/backend/releases.py:103
 msgid "USB HDD Image"
 msgstr "USB-HDD-Image"
 
-#: webapp/backend/releases.py:100
+#: webapp/backend/releases.py:104
 msgid "Pregenerated Xen image"
 msgstr "Vorgefertigtes Xen-Image"
 
-#: webapp/backend/releases.py:106 webapp/backend/releases.py:144
+#: webapp/backend/releases.py:110 webapp/backend/releases.py:150
 msgid "Unknown image type"
 msgstr "Unbekanntes Imageformat"
 
-#: webapp/backend/releases.py:131
+#: webapp/backend/releases.py:136
 msgid "This image runs on many ARM-based boards"
 msgstr "Dieses Image läuft auf vielen ARM-basierten Boards"
 
-#: webapp/backend/releases.py:132
+#: webapp/backend/releases.py:137
+msgid "This image runs on ARM boards with a serial console"
+msgstr "Dieses Image läuft auf ARM-Boards mit serieller Konsole"
+
+#: webapp/backend/releases.py:138
 msgid "Use this image to burn a CD and install IPFire from it."
 msgstr ""
 "Nutze dieses Image um eine CD zu erstellen und IPFire von dieser zu "
 "installieren."
 
-#: webapp/backend/releases.py:133
+#: webapp/backend/releases.py:139
 msgid "Download the CD image from the torrent network."
 msgstr "CD-Image mit aus dem Torrentnetzwerk laden"
 
-#: webapp/backend/releases.py:134
+#: webapp/backend/releases.py:140
 msgid "An image that is meant to run on embedded devices."
 msgstr "Ein Image, das für eingebettete Systeme optimiert ist."
 
-#: webapp/backend/releases.py:135
+#: webapp/backend/releases.py:141
 msgid "Flash image where a serial console is enabled by default."
 msgstr "Image, bei welchem die serielle Konsole eingeschaltet ist."
 
-#: webapp/backend/releases.py:136
+#: webapp/backend/releases.py:142
 msgid "Install IPFire from a floppy-formated USB key."
 msgstr "IPFire von einem Floppy-formatiertem USB-Stick installieren."
 
-#: webapp/backend/releases.py:137
+#: webapp/backend/releases.py:143
 msgid "If the floppy image doesn't work, use this image instead."
 msgstr "Wenn das Floppy-Image nicht funktioniert, dieses verwenden."
 
-#: webapp/backend/releases.py:138
+#: webapp/backend/releases.py:144
 msgid "A ready-to-run image for Xen."
 msgstr "Ein fertiges Image für Xen."
 

diff --git a/www/translations/webapp.pot b/www/translations/webapp.pot
index 5807bc04852d9e20919655d42b9ba32a28303ad6..2ea829878d172e06bba8e751411828fd1982cb60 100644 (file)
--- a/www/translations/webapp.pot
+++ b/www/translations/webapp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-23 11:20+0200\n"
+"POT-Creation-Date: 2012-10-23 11:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,7 +78,7 @@ msgstr ""
 msgid "Crowd funding for the IPFire project"
 msgstr ""
 
-#: templates/wishlist/donate.html:15 templates/wishlist/donate.html:25
+#: templates/wishlist/donate.html:13 templates/wishlist/donate.html:23
 #: templates/wishlist/terms.html:3 templates/wishlist/terms.html:7
 #: templates/base.html:74
 msgid "Terms & Conditions"
@@ -1284,15 +1284,15 @@ msgstr ""
 msgid "Donation"
 msgstr ""
 
-#: templates/static/donation.html:64
+#: templates/static/donation.html:61
 msgid "Did you know...?"
 msgstr ""
 
-#: templates/static/donation.html:80
+#: templates/static/donation.html:77
 msgid "How do we use financial support?"
 msgstr ""
 
-#: templates/static/donation.html:132
+#: templates/static/donation.html:129
 msgid "Research & Development"
 msgstr ""
 
@@ -1402,71 +1402,79 @@ msgstr ""
 msgid "Checkout this crowdfunding wish from #ipfire:"
 msgstr ""
 
-#: webapp/backend/releases.py:93
+#: webapp/backend/releases.py:96
 msgid "Image for the armv5tel architecture"
 msgstr ""
 
-#: webapp/backend/releases.py:94
+#: webapp/backend/releases.py:97
+msgid "armv5tel image for boards with serial console"
+msgstr ""
+
+#: webapp/backend/releases.py:98
 msgid "Installable CD image"
 msgstr ""
 
-#: webapp/backend/releases.py:95
+#: webapp/backend/releases.py:99
 msgid "Torrent file"
 msgstr ""
 
-#: webapp/backend/releases.py:96
+#: webapp/backend/releases.py:100
 msgid "Flash image"
 msgstr ""
 
-#: webapp/backend/releases.py:97
+#: webapp/backend/releases.py:101
 msgid "Alix image"
 msgstr ""
 
-#: webapp/backend/releases.py:98
+#: webapp/backend/releases.py:102
 msgid "USB FDD Image"
 msgstr ""
 
-#: webapp/backend/releases.py:99
+#: webapp/backend/releases.py:103
 msgid "USB HDD Image"
 msgstr ""
 
-#: webapp/backend/releases.py:100
+#: webapp/backend/releases.py:104
 msgid "Pregenerated Xen image"
 msgstr ""
 
-#: webapp/backend/releases.py:106 webapp/backend/releases.py:144
+#: webapp/backend/releases.py:110 webapp/backend/releases.py:150
 msgid "Unknown image type"
 msgstr ""
 
-#: webapp/backend/releases.py:131
+#: webapp/backend/releases.py:136
 msgid "This image runs on many ARM-based boards"
 msgstr ""
 
-#: webapp/backend/releases.py:132
+#: webapp/backend/releases.py:137
+msgid "This image runs on ARM boards with a serial console"
+msgstr ""
+
+#: webapp/backend/releases.py:138
 msgid "Use this image to burn a CD and install IPFire from it."
 msgstr ""
 
-#: webapp/backend/releases.py:133
+#: webapp/backend/releases.py:139
 msgid "Download the CD image from the torrent network."
 msgstr ""
 
-#: webapp/backend/releases.py:134
+#: webapp/backend/releases.py:140
 msgid "An image that is meant to run on embedded devices."
 msgstr ""
 
-#: webapp/backend/releases.py:135
+#: webapp/backend/releases.py:141
 msgid "Flash image where a serial console is enabled by default."
 msgstr ""
 
-#: webapp/backend/releases.py:136
+#: webapp/backend/releases.py:142
 msgid "Install IPFire from a floppy-formated USB key."
 msgstr ""
 
-#: webapp/backend/releases.py:137
+#: webapp/backend/releases.py:143
 msgid "If the floppy image doesn't work, use this image instead."
 msgstr ""
 
-#: webapp/backend/releases.py:138
+#: webapp/backend/releases.py:144
 msgid "A ready-to-run image for Xen."
 msgstr ""
 

diff --git a/www/webapp/backend/releases.py b/www/webapp/backend/releases.py
index 095e467cb03475744da67fa361a5496be4b2c979..6c907f40afef4e19fb7387ef72d292599107d0ab 100644 (file)
--- a/www/webapp/backend/releases.py
+++ b/www/webapp/backend/releases.py
@@ -67,6 +67,9 @@ class File(object):
                elif "usb-hdd" in filename:
                        return "usbhdd"
 
+               elif "armv5tel" in filename and "scon" in filename:
+                       return "armv5tel-scon"
+
                elif "armv5tel" in filename:
                        return "armv5tel"
 
@@ -91,6 +94,7 @@ class File(object):
 
                descriptions = {
                        "armv5tel"      : _("Image for the armv5tel architecture"),
+                       "armv5tel-scon" : _("armv5tel image for boards with serial console"),
                        "iso"           : _("Installable CD image"),
                        "torrent"       : _("Torrent file"),
                        "flash"         : _("Flash image"),
@@ -114,7 +118,8 @@ class File(object):
                        "alix"          : 41,
                        "usbfdd"        : 31,
                        "usbhdd"        : 30,
-                       "armv5tel"  : 40,
+                       "armv5tel"      : 40,
+                       "armv5tel-scon" : 41,
                        "xen"           : 50,
                }
                
@@ -129,6 +134,7 @@ class File(object):
        
                remarks = {
                        "armv5tel"      : _("This image runs on many ARM-based boards"),
+                       "armv5tel-scon" : _("This image runs on ARM boards with a serial console"),
                        "iso"           : _("Use this image to burn a CD and install IPFire from it."),
                        "torrent"       : _("Download the CD image from the torrent network."),
                        "flash"         : _("An image that is meant to run on embedded devices."),