diff options
Diffstat (limited to 'langs')
| -rw-r--r-- | langs/en/3.en.lang | 7 | ||||
| -rw-r--r-- | langs/en/about.en.lang | 8 | ||||
| -rw-r--r-- | langs/en/map.en.lang | 6 | ||||
| -rw-r--r-- | langs/en/support.en.lang | 3 | ||||
| -rwxr-xr-x | langs/fr/about.fr.lang | 4 | ||||
| -rw-r--r-- | langs/fr/map.fr.lang | 5 | ||||
| -rwxr-xr-x | langs/fr/support.fr.lang | 3 |
7 files changed, 23 insertions, 13 deletions
diff --git a/langs/en/3.en.lang b/langs/en/3.en.lang index d94378eb7..92fd54a87 100644 --- a/langs/en/3.en.lang +++ b/langs/en/3.en.lang @@ -100,6 +100,13 @@ Use LiveCDs and LiveDVDs for fresh new installs ONLY. ;DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2! DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 2! +# added manually +;Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>. +Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>. + +# added manually +;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 +88 ;Desktop diff --git a/langs/en/about.en.lang b/langs/en/about.en.lang index 95b462b9d..3d37a9720 100644 --- a/langs/en/about.en.lang +++ b/langs/en/about.en.lang @@ -60,11 +60,9 @@ gathered <a href="../community/">hundreds of careful individuals and several com ;who coproduce the infrastructure, the distribution itself, <a href="http://wiki.mageia.org/">documentation</a>, <a href="../downloads/">delivery</a> and <a href="../support/">support</a>, using Free Software tools; who coproduce the infrastructure, the distribution itself, <a href="http://wiki.mageia.org/">documentation</a>, <a href="../downloads/">delivery</a> and <a href="../support/">support</a>, using Free Software tools; - -# /en/about/index.php +48 -;released two major stable releases <a href="../1/">in June 2011</a> and <a href="../2/">in May 2012</a>. -released two major stable releases <a href="../1/">in June 2011</a> and <a href="../2/">in May 2012</a>. - +# /en/about/index.php +48 (modified manually) +;released three major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a> and in <a href="../3/">in May 2013</a>. +released three major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a> and in <a href="../3/">in May 2013</a>. # /en/about/index.php +69 ;<a href=%s>Mageia.Org's legal constitution</a> and <a href=%s>governance</a> rules; diff --git a/langs/en/map.en.lang b/langs/en/map.en.lang index 47fe0570f..b02aaabb9 100644 --- a/langs/en/map.en.lang +++ b/langs/en/map.en.lang @@ -86,9 +86,9 @@ Timeline Downloads -# en/map/index.php +40 (added manually) -;3 (in development) -3 (in development) +# en/map/index.php +40 (modified manually) +;3 (May 2013) +3 (May 2013) # en/map/index.php +42 diff --git a/langs/en/support.en.lang b/langs/en/support.en.lang index 82cdde8bc..b7f654069 100644 --- a/langs/en/support.en.lang +++ b/langs/en/support.en.lang @@ -90,6 +90,9 @@ Mageia 1 was supported until December 1st, 2012. ;Mageia 2 will be supported until November 22nd, 2013. Mageia 2 will be supported until November 22nd, 2013. +# added manually +;Mageia 3 will be supported until November 18nd, 2014. +Mageia 3 will be supported until November 18nd, 2014. # ../../svn/web/en/support/index.php +58 ;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through: diff --git a/langs/fr/about.fr.lang b/langs/fr/about.fr.lang index 30480557e..737994420 100755 --- a/langs/fr/about.fr.lang +++ b/langs/fr/about.fr.lang @@ -55,8 +55,8 @@ qui coproduisent l’infrastructure, la distribution Mageia elle-même, sa < # /en/about/index.php +51 -;released two major stable releases <a href="../1/">in June 2011</a> and <a href="../2/">in May 2012</a>. -a publié deux versions stables majeures <a href="../1/">en juin 2011</a> et <a href="../2/">en mai 2012</a>. +;released three major stable releases <a href="../1/">in June 2011</a>, <a href="../2/">in May 2012</a> and in <a href="../3/">in May 2013</a>. +a publié trois versions stables majeures <a href="../1/">en juin 2011</a>, <a href="../2/">en mai 2012</a>, et <a href="../3/">en mai 2013</a>. ;<a href=%s>Mageia.Org's legal constitution</a> and <a href=%s>governance</a> rules; <a href=%s>statuts de l’association Mageia.Org</a>, <a href=%s>règles de gouvernance</a> ; diff --git a/langs/fr/map.fr.lang b/langs/fr/map.fr.lang index 623fa432c..8df6c809e 100644 --- a/langs/fr/map.fr.lang +++ b/langs/fr/map.fr.lang @@ -87,9 +87,8 @@ Téléchargements # en/map/index.php +40 (added manually) -;3 (in development) -3 (en développement) - +;3 (May 2013) +3 (mai 2013) # en/map/index.php +42 ;2 (May 2012) diff --git a/langs/fr/support.fr.lang b/langs/fr/support.fr.lang index bc9fbc6d3..90653938a 100755 --- a/langs/fr/support.fr.lang +++ b/langs/fr/support.fr.lang @@ -70,6 +70,9 @@ Mageia 1 a été maintenue jusqu'au 1<sup>er</sup> décembre 2012. ;Mageia 2 will be supported until November 22nd, 2013. Mageia 2 sera maintenue jusqu'au 22 novembre 2013. +# add manually +;Mageia 3 will be supported until November 18nd, 2014. +Mageia 3 sera maintenue jusqu'au 18 novembre 2014. ;If you need help, information or directions about the Mageia distribution you installed or about the project, you can try to reach us through: Si vous avez besoin d’aide ou d’information sur Mageia, après ou avant l’installation, ou sur le projet, vous pouvez nous rejoindre (utilisateurs et contributeurs au projet) via : |