diff options
-rw-r--r-- | en/2/download_index.php | 3 | ||||
-rwxr-xr-x | en/3/download_index.php | 2 | ||||
-rw-r--r-- | langs/en/2.en.lang | 28 | ||||
-rw-r--r-- | langs/en/3.en.lang | 30 |
4 files changed, 44 insertions, 19 deletions
diff --git a/en/2/download_index.php b/en/2/download_index.php index 06368973a..7cc714672 100644 --- a/en/2/download_index.php +++ b/en/2/download_index.php @@ -199,6 +199,9 @@ require '../downloads/get/lib.php'; <ul class="hl"> <li><a href="https://wiki.mageia.org/en/Mageia_2_Release_Notes"><?php _e('Release notes')?></a></li> <li><a href="https://wiki.mageia.org/en/Mageia_2_Errata">Errata</a>.</li> + <li><?php _e('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li> + <li><?php _e('<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> + </ul> <br> <br> diff --git a/en/3/download_index.php b/en/3/download_index.php index 64d4ee8f1..9352b6dbf 100755 --- a/en/3/download_index.php +++ b/en/3/download_index.php @@ -167,6 +167,8 @@ require '../downloads/get/lib.php'; <ul class="hl"> <li><?php _e('<a href="%s">Release notes</a>', array('https://wiki.mageia.org/en/Mageia_3_Release_Notes'))?></li> <li><?php _e('<a href="%s">Errata</a>', array('https://wiki.mageia.org/en/Mageia_3_Errata'))?></li> + <li><?php _e('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li> + <li><?php _e('<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> </ul> <br> <br> diff --git a/langs/en/2.en.lang b/langs/en/2.en.lang index a512aadb7..53b08abe7 100644 --- a/langs/en/2.en.lang +++ b/langs/en/2.en.lang @@ -1,4 +1,4 @@ -# Generated by extract2lang.php on 2013-05-24T21:12:15+02:00 +# Generated by extract2lang.php on 2013-05-29T19:31:13+02:00 # Domain 2 # include translation strings from: # en/2/download_index.php @@ -147,42 +147,52 @@ May 22<sup>nd</sup> 2012 Release notes -# en/2/download_index.php +205 +# en/2/download_index.php +202 +;<a href="%s">Which to choose</a> +<a href="%s">Which to choose</a> + + +# en/2/download_index.php +203 +;<a href="%s">Get ISO on USB flash stick</a> +<a href="%s">Get ISO on USB flash stick</a> + + +# en/2/download_index.php +208 ;Upgrading<br>from Mageia 1? Upgrading<br>from Mageia 1? -# en/2/download_index.php +207 +# en/2/download_index.php +210 ;<strong>do not</strong> use LiveCDs; <strong>do not</strong> use LiveCDs; -# en/2/download_index.php +208 +# en/2/download_index.php +211 ;see the <a href="%s" hreflang="en">upgrade guide</a> see the <a href="%s" hreflang="en">upgrade guide</a> -# en/2/download_index.php +214 +# en/2/download_index.php +217 ;Looking for Mageia 1? Looking for Mageia 1? -# en/2/download_index.php +216 +# en/2/download_index.php +219 ;It is <a href="%s">here now</a>. It is <a href="%s">here now</a>. -# en/2/download_index.php +217 +# en/2/download_index.php +220 ;But please remember that it already <a href="http://blog.mageia.org/en/2012/12/02/mageia-1-eol"/>reached EOL</a>. But please remember that it already <a href="http://blog.mageia.org/en/2012/12/02/mageia-1-eol"/>reached EOL</a>. -# en/2/download_index.php +223 +# en/2/download_index.php +226 ;Need more challenge? Need more challenge? -# en/2/download_index.php +224 +# en/2/download_index.php +227 ;You can help us <a href="%s">develop and quality-check Mageia 3</a>. You can help us <a href="%s">develop and quality-check Mageia 3</a>. diff --git a/langs/en/3.en.lang b/langs/en/3.en.lang index f0f8d1a70..8db32ea06 100644 --- a/langs/en/3.en.lang +++ b/langs/en/3.en.lang @@ -1,4 +1,4 @@ -# Generated by extract2lang.php on 2013-05-24T21:30:09+02:00 +# Generated by extract2lang.php on 2013-05-29T00:04:02+02:00 # Domain 3 # include translation strings from: # en/3/download_index.php @@ -197,47 +197,57 @@ May 19<sup>th</sup> 2013 <a href="%s">Errata</a> -# en/3/download_index.php +173 +# en/3/download_index.php +170 +;<a href="%s">Which to choose</a> +<a href="%s">Which to choose</a> + + +# en/3/download_index.php +171 +;<a href="%s">Get ISO on USB flash stick</a> +<a href="%s">Get ISO on USB flash stick</a> + + +# en/3/download_index.php +175 ;Upgrading<br>from Mageia 2? Upgrading<br>from Mageia 2? -# en/3/download_index.php +175 +# en/3/download_index.php +177 ;<strong>do not</strong> use LiveCDs; <strong>do not</strong> use LiveCDs; -# en/3/download_index.php +176 +# en/3/download_index.php +178 ;see the <a href="%s" hreflang="en">upgrade guide</a> see the <a href="%s" hreflang="en">upgrade guide</a> -# en/3/download_index.php +181 +# en/3/download_index.php +183 ;Looking for Mageia 2? Looking for Mageia 2? -# en/3/download_index.php +183 +# en/3/download_index.php +185 ;It is <a href="%s">here now</a>. It is <a href="%s">here now</a>. -# en/3/download_index.php +189 +# en/3/download_index.php +191 ;Looking for Mageia 1? Looking for Mageia 1? -# en/3/download_index.php +192 +# en/3/download_index.php +194 ;But please remember that it already <a href="http://blog.mageia.org/en/2012/12/02/mageia-1-eol"/>reached EOL</a>. But please remember that it already <a href="http://blog.mageia.org/en/2012/12/02/mageia-1-eol"/>reached EOL</a>. -# en/3/download_index.php +198 +# en/3/download_index.php +200 ;Need more challenge? Need more challenge? -# en/3/download_index.php +199 +# en/3/download_index.php +201 ;You can help us <a href="%s">on Mageia 4</a>. You can help us <a href="%s">on Mageia 4</a>. |