sync with rev 3035

13 files changed, 53 insertions, 43 deletions

diff --git a/langs/cs/4.cs.lang b/langs/cs/4.cs.lang
index e8bcfcfbb..83a11a6c7 100644
--- a/langs/cs/4.cs.lang
+++ b/langs/cs/4.cs.lang
@@ -165,8 +165,8 @@ potřeba pro některé diskové řadiče, některé síťové karty atd.
 
 
 # en/4/download_index.php +247
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Poznámky k vydání</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Poznámky k vydání</a>
 
 
 # en/4/download_index.php +248
diff --git a/langs/el/4.el.lang b/langs/el/4.el.lang
index 12aff95fc..5de11535f 100644
--- a/langs/el/4.el.lang
+++ b/langs/el/4.el.lang
@@ -154,8 +154,8 @@ CD εγκατάστασης σε ενσύρματο δίκτυο
 
 
 # en/4/download_index.php +247
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Σημειώσεις έκδοσης</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Σημειώσεις έκδοσης</a>
 
 
 # en/4/download_index.php +248
diff --git a/langs/en/4.en.lang b/langs/en/4.en.lang
index 12b01b3e9..449d46f5e 100644
--- a/langs/en/4.en.lang
+++ b/langs/en/4.en.lang
@@ -1,4 +1,4 @@
-# Generated by extract2lang.php on 2014-01-29T21:20:31+00:00
+# Generated by extract2lang.php on 2014-02-01T20:12:54+00:00
 # Domain 4
 # include translation strings from:
 # en/4/download_index.php
@@ -166,8 +166,8 @@ February 1<sup>st</sup> 2014
 
 
 # en/4/download_index.php +225
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Release notes</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Release notes</a>
 
 
 # en/4/download_index.php +226
@@ -230,22 +230,32 @@ Need more challenge?
 You can <a href="%s">help</a> us <a href="%s">on Mageia 5</a>.
 
 
+# en/4/nav.php +2
+;https://wiki.mageia.org/en/Mageia_4_Release_Notes
+https://wiki.mageia.org/en/Mageia_4_Release_Notes
+
+
+# en/4/nav.php +3
+;https://wiki.mageia.org/en/Mageia_4_Errata
+https://wiki.mageia.org/en/Mageia_4_Errata
+
+
 # en/4/nav.php +4
+;https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3
+https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3
+
+
+# en/4/nav.php +7
 ;Mageia&nbsp;4
 Mageia&nbsp;4
 
 
-# en/4/nav.php +6
+# en/4/nav.php +9
 ;Release notes
 Release notes
 
 
-# en/4/nav.php +7
-;https://wiki.mageia.org/en/Mageia_4_Errata
-https://wiki.mageia.org/en/Mageia_4_Errata
-
-
-# en/4/nav.php +7
+# en/4/nav.php +10
 ;Errata
 Errata
 
@@ -315,51 +325,51 @@ There's plenty of new goodness in Mageia 4, too much to include here - see the <
 To help users configure and use Mageia, and to provide some information about the community and the project, we've added the new <a href="%s">MageiaWelcome</a>.It starts automatically when a session opens for the first time in any of the graphical environments.
 
 
-# en/4/index.php +53
+# en/4/index.php +54
 ;We've added two new desktop environments: Mate and Cinnamon, both available from the classic installer DVD/ISO. To make it more friendly we re-factored the <a href="%s">custom desktop choice</a>.
 We've added two new desktop environments: Mate and Cinnamon, both available from the classic installer DVD/ISO. To make it more friendly we re-factored the <a href="%s">custom desktop choice</a>.
 
 
-# en/4/index.php +55
+# en/4/index.php +56
 ;There's been a lot of work done on Mageia software. Many packages were ported from Gtk2 to Gtk3, to use more modern components. We've also ported all the tools from the deprecated usermode to polkit when privileges are needed.
 There's been a lot of work done on Mageia software. Many packages were ported from Gtk2 to Gtk3, to use more modern components. We've also ported all the tools from the deprecated usermode to polkit when privileges are needed.
 
 
-# en/4/index.php +57
+# en/4/index.php +58
 ;TexLive used to need around 1GB of data for installation - now it's separated into 3 packages which will usually mean a much smaller footprint.
 TexLive used to need around 1GB of data for installation - now it's separated into 3 packages which will usually mean a much smaller footprint.
 
 
-# en/4/index.php +77
+# en/4/index.php +78
 ;Mageia Control Center
 Mageia Control Center
 
 
-# en/4/index.php +84
+# en/4/index.php +85
 ;Mageia in context
 Mageia in context
 
 
-# en/4/index.php +86
+# en/4/index.php +87
 ;Mageia is both a Community and a Linux Distribution, with Mageia 4 being our fourth release.
 Mageia is both a Community and a Linux Distribution, with Mageia 4 being our fourth release.
 
 
-# en/4/index.php +88
+# en/4/index.php +89
 ;Mageia 4 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is  governed by a body of recognized and elected contributors.
 Mageia 4 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is  governed by a body of recognized and elected contributors.
 
 
-# en/4/index.php +90
+# en/4/index.php +91
 ;Mageia 4 has been made by more than <a href="%s">100 people from all around the world</a>.
 Mageia 4 has been made by more than <a href="%s">100 people from all around the world</a>.
 
 
-# en/4/index.php +92
+# en/4/index.php +93
 ;Our work adds to the excellent work of the wider Linux and Free Software community. We aim to blend all the excellent work done by the community, adding the special Mageia ingredients, to bring you the best, most stable, reliable and enjoyable experience we can make for regular users, developers and businesses.
 Our work adds to the excellent work of the wider Linux and Free Software community. We aim to blend all the excellent work done by the community, adding the special Mageia ingredients, to bring you the best, most stable, reliable and enjoyable experience we can make for regular users, developers and businesses.
 
 
-# en/4/index.php +94
+# en/4/index.php +95
 ;We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to <a href="%s">join us</a>.
 We welcome new contributors to any of the many different teams that go to make up Mageia the Community, and we encourage you to <a href="%s">join us</a>.
diff --git a/langs/es/4.es.lang b/langs/es/4.es.lang
index 90efa0912..f5c5c0113 100644
--- a/langs/es/4.es.lang
+++ b/langs/es/4.es.lang
@@ -165,8 +165,8 @@ necesario para algunos controladores de discos, tarjetas de red, etc.
 1 de febrero de 2014
 
 # en/4/download_index.php +225
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Notas de lanzamiento</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Notas de lanzamiento</a>
 
 
 # en/4/download_index.php +226
diff --git a/langs/et/4.et.lang b/langs/et/4.et.lang
index bde913444..1b1e4b9e2 100644
--- a/langs/et/4.et.lang
+++ b/langs/et/4.et.lang
@@ -154,8 +154,8 @@ vajalik mõningate kettakontrollerite, võrgukaartide jms puhul
 
 
 # en/4/download_index.php +245
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Väljalaskemärkmed</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Väljalaskemärkmed</a>
 
 
 # en/4/download_index.php +246
diff --git a/langs/id/4.id.lang b/langs/id/4.id.lang
index 716f1de05..9ddb010ae 100644
--- a/langs/id/4.id.lang
+++ b/langs/id/4.id.lang
@@ -166,8 +166,8 @@ diperlukan oleh beberapa kontroler disk, perangkat jaringan, dll.
 
 
 # en/4/download_index.php +225
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Catatan rilis</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Catatan rilis</a>
 
 
 # en/4/download_index.php +226
diff --git a/langs/pl/4.pl.lang b/langs/pl/4.pl.lang
index 26e8e9865..972f68c63 100644
--- a/langs/pl/4.pl.lang
+++ b/langs/pl/4.pl.lang
@@ -161,8 +161,8 @@ konieczny do niektórych kontrolerów dysków, kart sieciowych itd.
 
 
 # en/4/download_index.php +245
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Informacje o wydaniu</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Informacje o wydaniu</a>
 
 
 # en/4/download_index.php +246
diff --git a/langs/pt-br/4.pt-br.lang b/langs/pt-br/4.pt-br.lang
index 55717e6ee..21756933c 100644
--- a/langs/pt-br/4.pt-br.lang
+++ b/langs/pt-br/4.pt-br.lang
@@ -118,8 +118,8 @@ Instalador via rede + CD de firmware não-livres
 necessários para alguns controladores de disco, rede de algumas cartas, etc.
 
 # en/4/download_index.php +225
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Notas de lançamento</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Notas de lançamento</a>
 
 # en/4/download_index.php +226
 ;<a href="%s">Errata</a>
diff --git a/langs/ru/4.ru.lang b/langs/ru/4.ru.lang
index de1d01981..45469320e 100644
--- a/langs/ru/4.ru.lang
+++ b/langs/ru/4.ru.lang
@@ -154,7 +154,7 @@ Live образами стоит пользоваться ТОЛЬКО для у
 
 
 # en/4/download_index.php +245
-;<a href="%s%s_%s_%s">Release notes</a>
+;<a href="%s">Release notes</a>
 <a href="%s"> Заметки о выпуске </a>
 
 
diff --git a/langs/sl/4.sl.lang b/langs/sl/4.sl.lang
index a13ce751c..99d0af5c2 100644
--- a/langs/sl/4.sl.lang
+++ b/langs/sl/4.sl.lang
@@ -166,8 +166,8 @@ potrebujejo jo nekateri krmilniki diskov, omrežne kartice ...
 
 
 # en/4/download_index.php +225
-;<a href="%s%s_%s_%s">Release notes</a>
-<a hreflang="en" href="%s%s_%s_%s">opombe ob izdaji</a> (v angleščini)
+;<a href="%s">Release notes</a>
+<a hreflang="en" href="%s">opombe ob izdaji</a> (v angleščini)
 
 
 # en/4/download_index.php +226
diff --git a/langs/tr/4.tr.lang b/langs/tr/4.tr.lang
index 098347b32..f3da38955 100644
--- a/langs/tr/4.tr.lang
+++ b/langs/tr/4.tr.lang
@@ -166,8 +166,8 @@ Bazı disk denetleyicileri, ağ kartları vs. için gereklidir.
 
 
 # en/4/download_index.php +247
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Sürüm notları</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Sürüm notları</a>
 
 
 # en/4/download_index.php +248
diff --git a/langs/uk/4.uk.lang b/langs/uk/4.uk.lang
index e56948a64..ac108f9af 100644
--- a/langs/uk/4.uk.lang
+++ b/langs/uk/4.uk.lang
@@ -118,8 +118,8 @@ BitTorrent {ok}
 потрібен для деяких контролерів дисків, мережевих карток тощо
 
 # en/4/download_index.php +225
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">Нотатки щодо випуску</a>
+;<a href="%s">Release notes</a>
+<a href="%s">Нотатки щодо випуску</a>
 
 # en/4/download_index.php +226
 ;<a href="%s">Errata</a>
diff --git a/langs/zh-cn/4.zh-cn.lang b/langs/zh-cn/4.zh-cn.lang
index 906801ba0..1b273c3ad 100644
--- a/langs/zh-cn/4.zh-cn.lang
+++ b/langs/zh-cn/4.zh-cn.lang
@@ -185,8 +185,8 @@ LiveCDs 和 LiveDVDs 仅适用于全新安装。
 
 
 # en/4/download_index.php +245
-;<a href="%s%s_%s_%s">Release notes</a>
-<a href="%s%s_%s_%s">版本通告</a>
+;<a href="%s">Release notes</a>
+<a href="%s">版本通告</a>
 
 
 # en/4/download_index.php +246