aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2014-03-22 18:09:35 +0000
committerManuel Hiebel <leuhmanu@mageia.org>2014-03-22 18:09:35 +0000
commitcfe393309f47da32b263eee8c957d6aef6c2511d (patch)
tree5481e1cd02d03de3896ed88a50faf9ef78e772ae
parenta22b617f8c9dc7ecbdd82336569b979ad357a8c2 (diff)
downloadwww-cfe393309f47da32b263eee8c957d6aef6c2511d.tar
www-cfe393309f47da32b263eee8c957d6aef6c2511d.tar.gz
www-cfe393309f47da32b263eee8c957d6aef6c2511d.tar.bz2
www-cfe393309f47da32b263eee8c957d6aef6c2511d.tar.xz
www-cfe393309f47da32b263eee8c957d6aef6c2511d.zip
some fix in the mga5/dl_index
-rwxr-xr-xen/5/download_index.php7
-rw-r--r--langs/cs/cauldron.po67
-rw-r--r--langs/el/cauldron.po67
-rw-r--r--langs/en/cauldron.pot56
-rw-r--r--langs/es/cauldron.po67
-rw-r--r--langs/et/cauldron.po67
-rw-r--r--langs/fr/cauldron.po61
-rw-r--r--langs/id/cauldron.po67
-rw-r--r--langs/pl/cauldron.po67
-rw-r--r--langs/pt-br/cauldron.po67
-rw-r--r--langs/ru/cauldron.po67
-rw-r--r--langs/sl/cauldron.po67
-rw-r--r--langs/tr/cauldron.po67
-rw-r--r--langs/uk/cauldron.po67
-rw-r--r--langs/zh-cn/cauldron.po67
15 files changed, 460 insertions, 468 deletions
diff --git a/en/5/download_index.php b/en/5/download_index.php
index 70833f952..75fc561e2 100755
--- a/en/5/download_index.php
+++ b/en/5/download_index.php
@@ -7,7 +7,7 @@ $release = 'alpha1';
define('HLANG', true);
require '../../langs.php';
-$dictionary = read_translation_file($locale, cauldron);
+$dictionary = read_translation_file($locale, "cauldron");
require '../downloads/get/lib.php';
function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext)
@@ -138,8 +138,7 @@ echo _r('forthcoming');
<div class="para" id="live">
<h2><?php _g('LiveCDs and LiveDVDs');?></h2>
<p class="dlinfo"><?php _g('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
- <span class="warn"><?php _g('DO NOT use these LiveCDs or LiveDVDs to upgrade from from the
-prior Mageia release!'); ?></span>
+ <span class="warn"><?php _g('DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!'); ?></span>
<?php _g('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?></p>
<table class="fr-table dlt2">
<thead>
@@ -248,7 +247,7 @@ prior Mageia release!'); ?></span>
<li><?php _g('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li>
<li><?php _g('<a href="%s">Get ISO on USB flash stick</a>', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'))?></li>
<li><?php _g('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array('https://wiki.mageia.org/en/Newcomers_start_here'))?></li>
- <li><?php _g('Help us on'); echo' <a href="../contribute">',"$name $version";?></a></li>
+ <li><?php _g('Help us on %s', array('<a href="../contribute">Mageia 5</a>'))?></li>
</ul>
<?php /*
echo '<br><br>';
diff --git a/langs/cs/cauldron.po b/langs/cs/cauldron.po
index 002c81675..1649a7c0b 100644
--- a/langs/cs/cauldron.po
+++ b/langs/cs/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/cs/cauldron.cs.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,102 +123,108 @@ msgstr "Živá CD a DVD"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Živá CD a DVD používejte POUZE pro čisté nové instalace."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "Tato živá CD nebo DVD NEPOUŽÍVEJTE pro aktualizaci z Mageia 3!"
+
+#: "/web/en/5/download_index.php +142"
#, fuzzy
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Použijte DVD nebo CD a podívejte se na <a href=\"%s\" hreflang=\"en\">průvodce povýšením</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Všechny jazyky"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Pouze anglicky"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "Instalační CD založené na síťovém přístupu k internetu"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Stáhnout rychle a okamžitě zavést systém do instalačního režimu ze sítě <em>připojené k internetu</em> nebo z místního disku."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Tyto obrazy ISO se mění docela často, a jelikož znamenají skutečnost Cauldronu, nemusí pracovat. Jde-li o tento případ, použijte některý z obrazů výše."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Síťový instalátor, CD se svobodným software"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Síťový instalátor + CD s nesvobodným firmware"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "potřeba pro některé diskové řadiče, některé síťové karty atd."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Poznámky k vydání</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Seznam chyb</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Který vybrat</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">Dostat ISO na USB klíčence</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr ""
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Pomozte nám s <a href=\"%s\">Mageiou 4</a>"
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
msgid "Looking for a stable release?"
msgstr "Hledáte stabilní vydání?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
msgid "It is <a href=\"%s\">here</a>."
msgstr "Je <a href=\"%s\">zde</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
msgid "Upgrading<br>from %s ?"
msgstr ""
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr ""
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
#, fuzzy
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "Použijte DVD nebo CD a podívejte se na <a href=\"%s\" hreflang=\"en\">průvodce povýšením</a>."
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Hledáte stabilní vydání?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr ""
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr ""
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr ""
@@ -257,10 +263,3 @@ msgstr "Zprávy o chybách"
#, fuzzy
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Je <a href=\"%s\">zde</a>."
-
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Pomozte nám s <a href=\"%s\">Mageiou 4</a>"
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "Tato živá CD nebo DVD NEPOUŽÍVEJTE pro aktualizaci z Mageia 3!"
diff --git a/langs/el/cauldron.po b/langs/el/cauldron.po
index 6198e43be..4bbab9f45 100644
--- a/langs/el/cauldron.po
+++ b/langs/el/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/el/cauldron.el.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,103 +121,109 @@ msgstr "LiveCD και LiveDVD"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Χρησιμοποιήστε τα LiveCD και LiveDVD ΜΟΝΟ για μια νέα εγκατάσταση."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "ΜΗΝ χρησιμοποιήσετε ένα LiveCD ή LiveDVDs για αναβάθμιση από τη Mageia 3!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Χρησιμοποιήστε τα παραπάνω DVD ή CD και ανατρέξτε στον <a href=\"%s\" hreflang=\"en\">οδηγό αναβάθμισης</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Όλες οι γλώσσες"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Μόνο αγγλικά"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "CD εγκατάστασης σε ενσύρματο δίκτυο"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Για γρήγορη λήψη και εκκίνηση σε λειτουργία εγκατάστασης από ένα ενσύρματο <em>δίκτυο<em> ή έναν τοπικό δίσκο."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Οι εικόνες ISO ενημερώνονται συστηματικά, και επειδή αντιπροσωπεύουν την πραγματική κατάσταση της Cauldron, μπορεί να μην δουλεύουν. Αν συμβαίνει αυτό, χρησιμοποιήστε την παραπάνω."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Εγκαταστάτης δικτύου, μόνο ελεύθερο λογισμικό"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Εγκαταστάτης δικτύου + μη ελέύθερα firmware"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "απαραίτητα για μερικούς ελεγκτές δίσκων ή καρτών δικτύου, κλπ."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Σημειώσεις έκδοσης</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Errata</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Ποια λήψη να επιλέξω;</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">Βάλτε το ISO σε ένα USB stick</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Νεοέλθων-ούσα; <a href=\"%s\">Εδώ υπάρχει μια ιστοσελίδα wiki για εσάς.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Θα τη βρείτε <a href=\"%s\">εδώ</a>."
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
#, fuzzy
msgid "Looking for a stable release?"
msgstr "Ψάχνετε για τη Mageia 3;"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
#, fuzzy
msgid "It is <a href=\"%s\">here</a>."
msgstr "Θα τη βρείτε <a href=\"%s\">εδώ</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Αναβάθμιση<br>από της Mageia 3;"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>μην</strong> χρησιμοποιήσετε LiveCD;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "ανατρέξτε στον <a href=\"%s\" hreflang=\"en\">οδηγό αναβάθμισης</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Ψάχνετε για τη Mageia 3;"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Αλλά μην ξεχνάτε ότι έχει φτάσει ήδη στο <a href=\"%s\">τέλος της ζωής της (EOL)</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Θέλετε περισσότερη δράση;"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Μπορείτε να μας <a href=\"%s\">βοηθήσετε</a> για τη <a href=\"%s\">Mageia 5</a>."
@@ -264,13 +270,6 @@ msgstr "Αναφορές σφαλμάτων"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Θα τη βρείτε <a href=\"%s\">εδώ</a>."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Θα τη βρείτε <a href=\"%s\">εδώ</a>."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "ΜΗΝ χρησιμοποιήσετε ένα LiveCD ή LiveDVDs για αναβάθμιση από τη Mageia 3!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1<sup>η</sup> Φεβρουαρίου 2014"
diff --git a/langs/en/cauldron.pot b/langs/en/cauldron.pot
index 97891a3de..6da2c4473 100644
--- a/langs/en/cauldron.pot
+++ b/langs/en/cauldron.pot
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cauldron\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\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"
@@ -131,99 +131,103 @@ msgstr ""
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr ""
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr ""
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr ""
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr ""
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr ""
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr ""
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr ""
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr ""
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr ""
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr ""
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr ""
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr ""
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr ""
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr ""
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr ""
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr ""
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
+#: "/web/en/5/download_index.php +250"
+msgid "Help us on %s"
msgstr ""
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
msgid "Looking for a stable release?"
msgstr ""
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
msgid "It is <a href=\"%s\">here</a>."
msgstr ""
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
msgid "Upgrading<br>from %s ?"
msgstr ""
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr ""
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr ""
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
msgid "Looking for %s ?"
msgstr ""
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr ""
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr ""
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr ""
diff --git a/langs/es/cauldron.po b/langs/es/cauldron.po
index 0a149fa6c..c2b153234 100644
--- a/langs/es/cauldron.po
+++ b/langs/es/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/es/cauldron.es.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,103 +121,109 @@ msgstr "LiveCDs y LiveDVDs"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Utilice LiveCDs y LiveDVDs SOLO para instalaciones nuevas."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "¡NO utilice estos LiveCDs o LiveDVDs para actualizar desde Mageia 3!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Use un DVD o CD de los anteriores y consulte la <a href=\"%s\" hreflang=\"es\">guía de actualización</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Todos los idiomas"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Inglés solamente"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "CD de instalación basado en red por cable"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Descárguela rápidamente y luego arranque en modo instalación desde una red <em>por cable</em> o un disco local."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr ""
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Instalador de red, CD con software libre"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Instalador de red + CD con firmware no libre"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "necesario para algunos controladores de discos, tarjetas de red, etc."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Notas de lanzamiento</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Erratas</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Cuál elegir</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">Volcar ISO en memoria USB</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "¿Recién llegado? <a href=\"%s\">Aquí tiene una página wiki para usted.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Está ahora <a href=\"%s\">aquí</a>"
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
#, fuzzy
msgid "Looking for a stable release?"
msgstr "¿Buscando Mageia 3?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
#, fuzzy
msgid "It is <a href=\"%s\">here</a>."
msgstr "Está ahora <a href=\"%s\">aquí</a>"
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "¿Actualizando<br>desde Mageia 3?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>No use</strong> LiveCDs"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "vea la <a href=\"%s\" hreflang=\"es\">guía de actualización</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "¿Buscando Mageia 3?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Pero recuerde que <a href=\"%s\">dejó de estar soportada</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "¿Quiere más retos?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Nos puede <a href=\"%s\">ayudar</a> con <a href=\"%s\">Mageia 5</a>."
@@ -261,13 +267,6 @@ msgstr ""
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Está ahora <a href=\"%s\">aquí</a>"
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Está ahora <a href=\"%s\">aquí</a>"
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "¡NO utilice estos LiveCDs o LiveDVDs para actualizar desde Mageia 3!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1 de febrero de 2014"
diff --git a/langs/et/cauldron.po b/langs/et/cauldron.po
index 31e309d1e..e487ed5b2 100644
--- a/langs/et/cauldron.po
+++ b/langs/et/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/et/cauldron.et.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,103 +121,109 @@ msgstr "LiveCD-d ja LiveDVD-d"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "LiveCD-sid ja LiveDVD-sid tuleks kasutada AINULT värske paigalduse jaoks."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "ÄRGE kasutage LiveCD-sid või LiveDVD-sid uuendamiseks Mageia 3 pealt!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Ülaltoodud DVD või CD kasutamisel uurige <a href=\"%s\" hreflang=\"en\">uuendamisjuhiseid</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Kõik keeled"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Ainult inglise keeles"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "Juhtmega võrgu põhise paigalduse CD"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Kiire allalaadimine ja kohene paigaldamisrežiimi laadimine kas <em>juhtmega</em> võrgust või kohalikult kettalt."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Need ISO-d muutuvad sageli ja et need kajastavad arendusversiooni (Cauldron) hetkeseisu, ei pruugi nad isegi tööle hakata. Kui see peaks nii juhtuma, kasutage mõnda eespool toodud ISO-t."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Võrgupaigaldus, vaba tarkvara CD"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Võrgupaigaldus + mittevaba püsivara CD"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "vajalik mõningate kettakontrollerite, võrgukaartide jms puhul"
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Väljalaskemärkmed</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Teadaolevad vead</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Milline valida?</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">ISO-tõmmis otse USB-pulgale</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Tahaks rohkem teada? <a href=\"%s\">Wiki räägib lähemalt.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Selle leiab <a href=\"%s\">nüüd siit</a>."
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
#, fuzzy
msgid "Looking for a stable release?"
msgstr "Huvitab hoopis Mageia 3?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
#, fuzzy
msgid "It is <a href=\"%s\">here</a>."
msgstr "Selle leiab <a href=\"%s\">nüüd siit</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Uuendamine<br>Mageia 3 pealt?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>ärge</strong> kasutage<br>LiveCD-d"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "uurige <a href=\"%s\" hreflang=\"en\">uuendamisjuhiseid</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Huvitab hoopis %s ?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Kuid palun arvestage, et selle <a href=\"%s\">eluiga on juba läbi</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Vajate veel suuremat väljakutset?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Siis võite <a href=\"%s\">aidata</a> meil <a href=\"%s\">arendada Mageia 5</a>."
@@ -261,13 +267,6 @@ msgstr "Veateated"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Selle leiab <a href=\"%s\">nüüd siit</a>."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Selle leiab <a href=\"%s\">nüüd siit</a>."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "ÄRGE kasutage LiveCD-sid või LiveDVD-sid uuendamiseks Mageia 3 pealt!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1. veebruar 2014"
diff --git a/langs/fr/cauldron.po b/langs/fr/cauldron.po
index e4e74eec2..ef66333e5 100644
--- a/langs/fr/cauldron.po
+++ b/langs/fr/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/fr/cauldron.fr.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,99 +120,103 @@ msgstr "LiveCD et LiveDVD"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "N'utilisez les LiveCD ou LiveDVD QUE pour de nouvelles installations."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "N'utilisez PAS ces LiveCD ou LiveDVD pour une mise à niveau depuis une version précedente!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Utilisez l'un des DVD ou CD ci-dessus et consultez le <a href=\"%s\">guide de migration</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Toutes langues incluses"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Anglais uniquement"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "CD d'installation en réseau filaire"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "À télécharger rapidement et démarrer directement en mode installation depuis un réseau <em>filaire</em> ou un disque local."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Ces ISOs changent fréquemment, et comme elles reflètent l'état réel de Cauldron elles peuvent de pas fonctionner. Si telle est le cas, utiliser en une de ci-dessus."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Installeur réseau, logiciels libres uniquement"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Installeur réseau incluant des firmwares non libres"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "nécessaires pour certains contrôleurs de disques ou cartes réseaux, etc."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Notes de publication</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"https://wiki.mageia.org/en/Mageia_4_Errata_Fr\">Errata</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\" hreflang=\"en\">Quel téléchargement choisir&nbsp;?</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\" hreflang=\"en\">Mettre l'ISO sur une clé USB</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Nouveau venu&nbsp;? <a href=\"%s\">Cette page du wiki est faite pour vous.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr "Aidez nous pour"
+#: "/web/en/5/download_index.php +250"
+msgid "Help us on %s"
+msgstr "Aidez nous pour %s"
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
msgid "Looking for a stable release?"
msgstr "À la recherche d'une version stable&nbsp;?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
msgid "It is <a href=\"%s\">here</a>."
msgstr "<a href=\"%s\">C'est ici</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
msgid "Upgrading<br>from %s ?"
msgstr "Mise à niveau<br>depuis %s ?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>ne pas</strong> utiliser de LiveCD ou LiveDVD&nbsp;;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "consultez le <a href=\"%s\">guide de migration</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
msgid "Looking for %s ?"
msgstr "Vous cherchez %s ?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Mais souvenez-vous qu'elle a déjà atteint le statut de <a href=\"%s\">fin de vie (EOL)</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Il vous faut plus de challenge&nbsp;?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Vous pouvez nous <a href=\"%s\">aider</a> à <a href=\"%s\">développer et tester Mageia 5</a>."
@@ -259,9 +263,6 @@ msgstr "Rapports de bugs"
#~ msgid "Help us on <a href=\"%s\">%s</a>"
#~ msgstr "<a href=\"%s\">C'est ici</a>."
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "N'utilisez PAS ces LiveCD ou LiveDVD pour une mise à niveau depuis Mageia 3&nbsp;!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1 février 2014"
diff --git a/langs/id/cauldron.po b/langs/id/cauldron.po
index c5941c573..70541d037 100644
--- a/langs/id/cauldron.po
+++ b/langs/id/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/id/cauldron.id.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,103 +121,109 @@ msgstr "LiveCD dan LiveDVD"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Gunakan LiveCD dan LiveDVD HANYA untuk instalasi baru."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "JANGAN gunakan LiveCD atau LiveDVD ini untuk upgrade dari Mageia 3!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Gunakan DVD atau CD di atas dan lihat <a href=\"%s\" hreflang=\"en\">panduan upgrade</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Semua bahasa"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Hanya bahasa Inggris"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "CD instalasi berbasis jaringan kabel"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Download lebih cepat dan langsung boot ke mode install dari jaringan <em>kabel</em> atau disk lokal."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "ISO ini terus berubah, dan karena menggambarkan keadaan terkini dari Cauldron, mungkin ini tidak bekerja. Jika terjadi seperti itu, gunakan yang di atas saja."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "CD installer jaringan, Software Bebas"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "CD installer jaringan + firmware nonfree"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "diperlukan oleh beberapa kontroler disk, perangkat jaringan, dll."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Catatan rilis</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Masalah</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Mana yang kamu pilih</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">Dapatkan ISO dalam flashdisk</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Pengguna baru? <a href=\"%s\">Ini halaman wiki untukmu.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Sekarang <a href=\"%s\">ada di sini</a>."
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
#, fuzzy
msgid "Looking for a stable release?"
msgstr "Mencari Mageia 3?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
#, fuzzy
msgid "It is <a href=\"%s\">here</a>."
msgstr "Sekarang <a href=\"%s\">ada di sini</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Upgrade<br>dari Mageia 3?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>jangan</strong> gunakan LiveCD;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "lihat <a href=\"%s\" hreflang=\"en\">panduan upgrade</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Mencari Mageia 3?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Tapi harap diingat bahwa ini <a href=\"%s\">sudah mencapai akhir dukungan</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Butuh tantangan?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Kamu bisa <a href=\"%s\">membantu</a> kami <a href=\"%s\">di Mageia 5</a>."
@@ -261,13 +267,6 @@ msgstr "Pelaporan Bug"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Sekarang <a href=\"%s\">ada di sini</a>."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Sekarang <a href=\"%s\">ada di sini</a>."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "JANGAN gunakan LiveCD atau LiveDVD ini untuk upgrade dari Mageia 3!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1 Februari 2014"
diff --git a/langs/pl/cauldron.po b/langs/pl/cauldron.po
index 47aa80776..47259aaf1 100644
--- a/langs/pl/cauldron.po
+++ b/langs/pl/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/pl/cauldron.pl.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -120,103 +120,109 @@ msgstr "LiveCD oraz LiveDVD"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Użyj LiveCD lub LiveDVD TYLKO do nowych instalacji."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "NIE UŻYWAJ tych LiveCD lub LiveDVD do aktualizacji Mageia 3!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Użyj DVD lub CD, zobacz <a href=\"%s\" hreflang=\"en\">poradnik aktualizacji</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Wszystkie języki"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Tylko angielski"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "Sieciowa płyta instalacyjna CD"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Szybkie do pobrania, umożliwiają instalację <em>sieciową</em> lub z mirrora na dysku lokalnym."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Te obrazy ISO (DVD oraz CD) zawierają Wolne Oprogramowanie oraz niektóre własnościowe sterowniki."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Instalator sieciowy, CD z Wolnym Oprogramowaniem"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Instalator sieciowy, CD z pakietami nonfree oraz firmware"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "konieczny do niektórych kontrolerów dysków, kart sieciowych itd."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Informacje o wydaniu</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Errata</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Którą wersję wybrać?</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">Wrzucanie ISO na USB</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Jesteś nowy? <a href=\"%s\">Strona wiki dla Ciebie.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Jest <a href=\"%s\">tutaj</a>."
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
#, fuzzy
msgid "Looking for a stable release?"
msgstr "Szukasz Mageia 3?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
#, fuzzy
msgid "It is <a href=\"%s\">here</a>."
msgstr "Jest <a href=\"%s\">tutaj</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Aktualizacja<br> z Mageia 3?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>nie używaj</strong> LiveCD;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "zobacz <a href=\"%s\" hreflang=\"en\">przewodnik aktualizacji</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Szukasz Mageia 3?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Pamiętaj że wsparcie zostało już <a href=\"%s\">zakończone</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Potrzebujesz większych wyzwań?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Możesz <a href=\"%s\">pomóc</a> nam <a href=\"%s\">przy Mageia 5</a>."
@@ -260,13 +266,6 @@ msgstr "Raporty o błędach"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Jest <a href=\"%s\">tutaj</a>."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Jest <a href=\"%s\">tutaj</a>."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "NIE UŻYWAJ tych LiveCD lub LiveDVD do aktualizacji Mageia 3!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1<sup>szy</sup> luty 2014"
diff --git a/langs/pt-br/cauldron.po b/langs/pt-br/cauldron.po
index 97fbe9e70..92425d582 100644
--- a/langs/pt-br/cauldron.po
+++ b/langs/pt-br/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/pt-br/cauldron.pt-br.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,103 +121,109 @@ msgstr "LiveCDs e LiveDVDs"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Uso LiveCDs e LiveDVDs para novas instalações frescas ONLY."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "Não use esses LiveCDs ou LiveDVDs para atualizar a partir de Mageia 3!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Ver <a href=\"%s\" hreflang=\"pt-br\">guia de atualização</a> sobre DVD ou CD."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Todos os idiomas"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Somente em Inglês"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "CD de instalação baseada em rede com fios"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Baixar rapidamente e iniciar imediatamente em modo de instalação a partir de <em>fio</em> de rede ou um disco local."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Estas ISOs mudam com freqüência, e no estado de Cauldron, elas podem não funcionar. Se for o caso, use uma das opções acima."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Instalador via rede, CD de Software livre"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Instalador via rede + CD de firmware não-livres"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "necessários para alguns controladores de disco, rede de algumas cartas, etc."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Notas de lançamento</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Errata</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">que para escolher</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">Obter ISO no flash USB stick</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Iniciante? <a href=\"%s\">Aqui está uma página wiki para você.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "É <a href=\"%s\">aqui</a> ."
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
#, fuzzy
msgid "Looking for a stable release?"
msgstr "Procurando por Mageia 3?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
#, fuzzy
msgid "It is <a href=\"%s\">here</a>."
msgstr "É <a href=\"%s\">aqui</a> ."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Atualizando<br>do Mageia 3 ?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>não</strong>usar LiveCDs;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "veja <a href=\"%s\" hreflang=\"en\">atualizar guia</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Procurando por Mageia 3?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Mas lembre-se que ele já <a href=\"%s\">chegou EOL</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Precisa de mais desafio?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Você pode <a href=\"%s\">ajudar</a><a href=\"%s\">no Mageia 5</a>."
@@ -261,13 +267,6 @@ msgstr "Relatório de Bugs"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "É <a href=\"%s\">aqui</a> ."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "É <a href=\"%s\">aqui</a> ."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "Não use esses LiveCDs ou LiveDVDs para atualizar a partir de Mageia 3!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "01 de fevereiro de 2014"
diff --git a/langs/ru/cauldron.po b/langs/ru/cauldron.po
index 073e83007..b20bf49ce 100644
--- a/langs/ru/cauldron.po
+++ b/langs/ru/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/ru/cauldron.ru.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,103 +121,109 @@ msgstr "Live образы"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Live образами стоит пользоваться ТОЛЬКО для установки системы «с нуля»."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "НЕ ПОЛЬЗУЙТЕСЬ этими образами для обновления с версии Mageia 3!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Воспользуйтесь этими образами и ознакомьтесь с <a href=\"%s\" hreflang=\"ru\"> инструкциями обновления </a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Все языки"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Только английский"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "Образ для установки с помощью проводной сети"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Быстро получите образ системы и воспользуйтесь режимом установки с помощью <em> проводной </em> сети или локального диска."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Эти ISO образы построены на нестабильной ветке Cauldron, поэтому они могут быть неработоспособными."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Образ для установки из сети, только свободное ПО"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Образ для установки из сети + несвободное ПО"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "нужен для некоторых контроллеров дисков, сетевых карт и т.д."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\"> Заметки о выпуске </a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\"> Известные ошибки </a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Что выбрать</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">Получить ISO на USB флеш-носителе</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Не имеете опыта? <a href=\"%s\">Мы приготовили для вас специальную wiki страницу.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Ее теперь можно найти <a href=\"%s\">здесь</a>."
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
#, fuzzy
msgid "Looking for a stable release?"
msgstr "Ищете Mageia 3?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
#, fuzzy
msgid "It is <a href=\"%s\">here</a>."
msgstr "Ее теперь можно найти <a href=\"%s\">здесь</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Обновляетесь<br>с Mageia 3?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>НЕ</strong> пользуйтесь этими образами Live систем;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "см. <a href=\"%s\" hreflang=\"ru\">инструкцию по обновлению</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Ищете Mageia 3?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Но помните, что <a href=\"%s\">срок поддержки этой версии уже истек</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Хотите попробовать что-то новенькое?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Вы можете <a href=\"%s\">помочь</a> нам <a href=\"%s\">в создании Mageia 5</a>."
@@ -261,13 +267,6 @@ msgstr "Сообщить о проблеме"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Ее теперь можно найти <a href=\"%s\">здесь</a>."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Ее теперь можно найти <a href=\"%s\">здесь</a>."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "НЕ ПОЛЬЗУЙТЕСЬ этими образами для обновления с версии Mageia 3!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1 февраля 2014"
diff --git a/langs/sl/cauldron.po b/langs/sl/cauldron.po
index 4e132a2c5..a5dfaabd0 100644
--- a/langs/sl/cauldron.po
+++ b/langs/sl/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/sl/cauldron.sl.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,101 +123,107 @@ msgstr "LiveCD in LiveDVD"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Uporabite LiveCD in LiveDVD samo za testiranje in NOVE namestitve."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "NE UPORABLJAJTE LiveCD in LiveDVD za nadgradnjo Mageje 3!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Uporabite zgornji DVD ali CD in si oglejte <a href=\"%s\" hreflang=\"en\">vodič za nadgradnjo (v angleščini)</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "vsi podprti jeziki"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "samo angleščina"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "Odtis nosilca CD za namestitev prek žičnega omrežja"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Hiter prenos in takojšen zagon namestitve prek <em>žičnega</em> omrežja ali krajevnega diska."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Ti odtisi nosilcev se hitro spreminjajo, saj združujejo trenutno delo na razvojni veji Cauldron. Zato se lahko zgodi, da ne delujejo pravilno. V tem primeru uporabite odtise nosilcev, navedene zgoraj."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Odtis nosilca CD z izključno odprtokodno programsko opremo in omrežno namestitvijo"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Odtis nosilca CD z odprtokodno programsko opremo ter lastniško strojno programsko opremo in omrežno namestitvijo"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "potrebujejo jo nekateri krmilniki diskov, omrežne kartice ..."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a hreflang=\"en\" href=\"%s\">opombe ob izdaji</a> (v angleščini)"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a hreflang=\"en\" href=\"%s\">znane napake</a> (v angleščini)"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a hreflang=\"en\" href=\"%s\">kateri medij izbrati</a> (v angleščini)"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a hreflang=\"en\" href=\"%s\">»peka« odtisa nosilca za namestitev s ključka USB</a> (v angleščini)"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Novinka ali novinec? <a hreflang=\"en\" href=\"%s\">Tukaj je stran wiki prav za to.</a> (v angleščini)"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Pomagajte nam pri <a href=\"%s\">Mageji 4</a>"
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
msgid "Looking for a stable release?"
msgstr "Iščete stabilno izdajo?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
msgid "It is <a href=\"%s\">here</a>."
msgstr "Najdete jo <a href=\"%s\">tukaj</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Nadgrajujete<br>Magejo 3?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>ne uporabljajte</strong> LiveCD-ja;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "oglejte si <a href=\"%s\" hreflang=\"en\">vodič za nadgradnjo (v angleščini)</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Iščete Magejo 3?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "A ne pozabite, da je že <a hreflang=\"en\" href=\"%s\">dosegla konec podpore</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Potrebujete izziv?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Lahko nam <a href=\"%s\">pomagate</a> pri <a href=\"%s\">Mageji 5</a>."
@@ -261,13 +267,6 @@ msgstr "Poročila o hroščih"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Sedaj je <a href=\"%s\">tukaj</a>."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Pomagajte nam pri <a href=\"%s\">Mageji 4</a>"
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "NE UPORABLJAJTE LiveCD in LiveDVD za nadgradnjo Mageje 3!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1.februar 2014"
diff --git a/langs/tr/cauldron.po b/langs/tr/cauldron.po
index 24c1ec0e7..ce606f7a6 100644
--- a/langs/tr/cauldron.po
+++ b/langs/tr/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/tr/cauldron.tr.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,101 +121,107 @@ msgstr "LiveCD'ler ve LiveDVD'ler"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "LiveCD'leri ve LiveDVD'leri YALNIZCA yeni kurulum için kullanınız."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "LiveCD'leri veya LiveDVD'leri Mageia 3'den yükseltmek için KULLANMAYINIZ!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Yukarıdaki DVD veya CD'leri kullanın ve <a href=\"%s\" hreflang=\"en\">yükseltme rehberine</a> bakın."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Tüm diller"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Yalnız İngilizce"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "Kablolu Ağ-Temelli kurulum CD'si"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Hızlı yükleme ve bir yerel disk veya <em>kablolu</em> ağ’dan kurulum moduna hemen önyükleme."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Bu ISO'lar sıklıkla değişir ve Cauldron'un gerçek durumununu yansıttığı için de çalışmayabilirler. Bu durumda yukarıdakilerden birini kullanın."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Ağ yükleyici, Özgür Yazılım CD'si"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Ağ yükleyici + tescilli yazılım CD'si"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "Bazı disk denetleyicileri, ağ kartları vs. için gereklidir."
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Sürüm notları</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Bilinen hatalar</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Hangisini seçmeliyim</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">USB belleğe ISO yazdırma</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Yeni kullanıcı mısız? <a href=\"%s\">O halde buradaki wiki sayfasına bakınız.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Aradığınız <a href=\"%s\">burada</a>."
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
msgid "Looking for a stable release?"
msgstr "Kararlı bir sürüm mü arıyorsunuz?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
msgid "It is <a href=\"%s\">here</a>."
msgstr "O halde <a href=\"%s\">buraya</a> bakın."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Mageia 3'den<br>Yükseltme"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "LiveCD'leri <strong>kullanmayın</strong>;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "<a href=\"%s\" hreflang=\"en\">Yülseltme klavuzuna</a> bakın."
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Aradığınız Mageia 3 mi?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr ""
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Daha fazla görev mi?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "<a href=\"%s\">Mageia 5</a> için bize <a href=\"%s\">yardım</a> edebilirsiniz."
@@ -259,13 +265,6 @@ msgstr "Hata Raporları"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Aradığınız <a href=\"%s\">burada</a>."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Aradığınız <a href=\"%s\">burada</a>."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "LiveCD'leri veya LiveDVD'leri Mageia 3'den yükseltmek için KULLANMAYINIZ!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1 Şubat 2014"
diff --git a/langs/uk/cauldron.po b/langs/uk/cauldron.po
index 36495577f..193d19d63 100644
--- a/langs/uk/cauldron.po
+++ b/langs/uk/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/uk/cauldron.uk.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,101 +121,107 @@ msgstr "Портативні образи"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "Портативними образами варто користуватися ЛИШЕ для встановлення системи «з нуля»."
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "НЕ КОРИСТУЙТЕСЯ цими образами для оновлення з версії Mageia 3!"
+
+#: "/web/en/5/download_index.php +142"
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Скористайтеся образом для DVD або компакт-диска і <a href=\"%s\" hreflang=\"uk\">настановами щодо оновлення</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "Всі мови"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "Лише англійська"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "Образ для встановлення за допомогою дротової мережі"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "Швидко отримайте образ системи та скористайтеся режимом встановлення за допомогою <em>дротової</em> мережі або локального диска."
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "Ці образи ISO регулярно змінюються, і, оскільки вони відповідають поточному стану справ у Cauldron, вони можуть бути непрацездатними. Якщо це саме так, скористайтеся образами, вказаними вище."
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "Образ для встановлення з мережі, лише вільне ПЗ, КД"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "Образ для встановлення з мережі + невільні мікропрограми, КД"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "потрібен для деяких контролерів дисків, мережевих карток тощо"
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">Нотатки щодо випуску</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Відомі помилки</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">Що вибрати</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">Отримати ISO на флеш-носії USB</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr "Не маєте досвіду? <a href=\"%s\">Ми приготували для вас спеціальну сторінку.</a>"
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "Її тепер можна знайти <a href=\"%s\">тут</a>."
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
msgid "Looking for a stable release?"
msgstr "Шукаєте стабільний випуск?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
msgid "It is <a href=\"%s\">here</a>."
msgstr "Її тепер можна знайти <a href=\"%s\">тут</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
#, fuzzy
msgid "Upgrading<br>from %s ?"
msgstr "Оновлюєтеся<br>з Mageia 3?"
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr "<strong>не</strong> використовуйте образи LiveCD;"
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "див. <a href=\"%s\" hreflang=\"uk\">настанови щодо оновлення</a>"
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "Шукаєте Mageia 3?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr "Втім, варто пам’ятати, що час її підтримки <a href=\"%s\">вже завершено</a>."
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr "Хочете спробувати щось новеньке?"
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
#, fuzzy
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr "Ви можете <a href=\"%s\">допомогти</a> нам у <a href=\"%s\">створенні Mageia 5</a>."
@@ -259,13 +265,6 @@ msgstr "Звіти щодо вад"
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "Її тепер можна знайти <a href=\"%s\">тут</a>."
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "Її тепер можна знайти <a href=\"%s\">тут</a>."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "НЕ КОРИСТУЙТЕСЯ цими образами для оновлення з версії Mageia 3!"
-
#~ msgid "December 1<sup>st</sup> 2014"
#~ msgstr "1 лютого 2014 року"
diff --git a/langs/zh-cn/cauldron.po b/langs/zh-cn/cauldron.po
index 8d299f1bb..e67e53d31 100644
--- a/langs/zh-cn/cauldron.po
+++ b/langs/zh-cn/cauldron.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ./langs/zh-cn/cauldron.zh-cn.lang\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2014-03-22 16:19:49+0000\n"
+"POT-Creation-Date: 2014-03-22 18:06:26+0000\n"
"PO-Revision-Date: 2014-03-22 14:48+0100\n"
"Last-Translator: Duffy Duck <d_duck@nowhere.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,102 +123,108 @@ msgstr "LiveCDs and LiveDVDs"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
msgstr "LiveCDs 和 LiveDVDs 仅适用于全新安装。"
-#: "/web/en/5/download_index.php +143"
+#: "/web/en/5/download_index.php +141"
+#, fuzzy
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from from the prior Mageia release!"
+msgstr "不要将这些 LiveCDs or LiveDVDs 用于从 Mageia 3 升级!"
+
+#: "/web/en/5/download_index.php +142"
#, fuzzy
msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "使用上面列出的 DVD 或 CD 进行升级,详情参阅<a href=\"%s\" hreflang=\"en\">升级指南</a>."
-#: "/web/en/5/download_index.php +156"
+#: "/web/en/5/download_index.php +155"
msgid "All languages"
msgstr "全部语言"
-#: "/web/en/5/download_index.php +183"
+#: "/web/en/5/download_index.php +182"
msgid "English only"
msgstr "只有英语"
-#: "/web/en/5/download_index.php +207"
+#: "/web/en/5/download_index.php +206"
msgid "Wired Network-based Installation CD"
msgstr "有线网络安装 CD"
-#: "/web/en/5/download_index.php +208"
+#: "/web/en/5/download_index.php +207"
msgid "Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk."
msgstr "快速下载,启动后将立即进入从<em>有线</em>网络或从本地磁盘的安装模式。"
-#: "/web/en/5/download_index.php +209"
+#: "/web/en/5/download_index.php +208"
msgid "These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one."
msgstr "这些 ISOs 经常变动,因为它给出了 Cauldron 的真正状态,它们可能没法用。如果是这样的情况,使用上面的。"
-#: "/web/en/5/download_index.php +221"
+#: "/web/en/5/download_index.php +220"
msgid "Network installer, Free Software CD"
msgstr "网络安装,自由软件 CD"
-#: "/web/en/5/download_index.php +229"
+#: "/web/en/5/download_index.php +228"
msgid "Network installer + nonfree firmware CD"
msgstr "网络安装 + 非自由固件 CD"
-#: "/web/en/5/download_index.php +230"
+#: "/web/en/5/download_index.php +229"
msgid "needed for some disc controllers, some network cards, etc."
msgstr "某些磁盘控制器、网卡可能需要。"
-#: "/web/en/5/download_index.php +246"
+#: "/web/en/5/download_index.php +245"
msgid "<a href=\"%s\">Release notes</a>"
msgstr "<a href=\"%s\">版本通告</a>"
-#: "/web/en/5/download_index.php +247"
+#: "/web/en/5/download_index.php +246"
msgid "<a href=\"%s\">Errata</a>"
msgstr "<a href=\"%s\">Errata</a>"
-#: "/web/en/5/download_index.php +248"
+#: "/web/en/5/download_index.php +247"
msgid "<a href=\"%s\">Which to choose</a>"
msgstr "<a href=\"%s\">选择哪一个</a>"
-#: "/web/en/5/download_index.php +249"
+#: "/web/en/5/download_index.php +248"
msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
msgstr "<a href=\"%s\">转储 ISO 到 U盘</a>"
-#: "/web/en/5/download_index.php +250"
+#: "/web/en/5/download_index.php +249"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
msgstr ""
-#: "/web/en/5/download_index.php +251"
-msgid "Help us on"
-msgstr ""
+#: "/web/en/5/download_index.php +250"
+#, fuzzy
+msgid "Help us on %s"
+msgstr "帮助我们完成 <a href=\"%s\">Mageia 4</a>"
-#: "/web/en/5/download_index.php +255"
+#: "/web/en/5/download_index.php +254"
msgid "Looking for a stable release?"
msgstr "需要稳定发型版?"
-#: "/web/en/5/download_index.php +257"
+#: "/web/en/5/download_index.php +256"
msgid "It is <a href=\"%s\">here</a>."
msgstr "她在 <a href=\"%s\">这里</a>."
-#: "/web/en/5/download_index.php +262"
+#: "/web/en/5/download_index.php +261"
msgid "Upgrading<br>from %s ?"
msgstr ""
-#: "/web/en/5/download_index.php +264"
+#: "/web/en/5/download_index.php +263"
msgid "<strong>do not</strong> use LiveCDs;"
msgstr ""
-#: "/web/en/5/download_index.php +265"
+#: "/web/en/5/download_index.php +264"
#, fuzzy
msgid "see the <a href=\"%s\" hreflang=\"en\">upgrade guide</a>"
msgstr "使用上面列出的 DVD 或 CD 进行升级,详情参阅<a href=\"%s\" hreflang=\"en\">升级指南</a>."
-#: "/web/en/5/download_index.php +270"
+#: "/web/en/5/download_index.php +269"
#, fuzzy
msgid "Looking for %s ?"
msgstr "需要稳定发型版?"
-#: "/web/en/5/download_index.php +273"
+#: "/web/en/5/download_index.php +272"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
msgstr ""
-#: "/web/en/5/download_index.php +278"
+#: "/web/en/5/download_index.php +277"
msgid "Need more challenge?"
msgstr ""
-#: "/web/en/5/download_index.php +279"
+#: "/web/en/5/download_index.php +278"
msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on %s</a>."
msgstr ""
@@ -257,10 +263,3 @@ msgstr "错误报告"
#, fuzzy
#~ msgid "It is <a href=\"%s\">here now</a>."
#~ msgstr "她在 <a href=\"%s\">这里</a>."
-
-#, fuzzy
-#~ msgid "Help us on <a href=\"%s\">%s</a>"
-#~ msgstr "帮助我们完成 <a href=\"%s\">Mageia 4</a>"
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "不要将这些 LiveCDs or LiveDVDs 用于从 Mageia 3 升级!"