aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2015-06-19 23:01:08 +0200
committerfilip <filip.komar@gmail.com>2015-06-19 23:01:08 +0200
commit6c6a5776ba86f572f19a10c5bd5a2f0a928c5623 (patch)
treea2136619aa627913ad60e375eda86455ac059e13
parent7f745d04e78f7dc90f5a563f1983483729d49a76 (diff)
mga5 release including l10n updates
also removing preview
l---------ast/5_preview1
l---------ca/5_preview1
l---------cs/5_preview1
l---------de/5_preview1
l---------el/5_preview1
l---------en-gb/5_preview1
-rwxr-xr-xen/5/download_index.php420
-rw-r--r--en/5/index.php104
-rw-r--r--en/5/nav.php13
-rwxr-xr-xen/5_preview/download_index.php635
-rw-r--r--en/5_preview/index.php103
-rw-r--r--en/5_preview/nav.php29
l---------eo/5_preview1
l---------es/5_preview1
l---------et/5_preview1
l---------eu/5_preview1
l---------fi/5_preview1
l---------fr/5_preview1
l---------hr/5_preview1
l---------hu/5_preview1
l---------id/5_preview1
l---------it/5_preview1
l---------ja/5_preview1
-rw-r--r--langs/ast/5.po4
-rw-r--r--langs/ca/5.po146
-rw-r--r--langs/cs/5.po10
-rw-r--r--langs/de/5.po8
-rw-r--r--langs/el/5.po10
-rw-r--r--langs/en-gb/5.po4
-rw-r--r--langs/en/5.pot10
-rw-r--r--langs/eo/5.po4
-rw-r--r--langs/es/5.po10
-rw-r--r--langs/et/5.po406
-rw-r--r--langs/eu/5.po10
-rw-r--r--langs/fi/5.po4
-rw-r--r--langs/fr/5.po205
-rw-r--r--langs/hr/5.po4
-rw-r--r--langs/hu/5.po4
-rw-r--r--langs/id/5.po10
-rw-r--r--langs/it/5.po10
-rw-r--r--langs/lv/5.po4
-rw-r--r--langs/nb/5.po4
-rw-r--r--langs/nl/5.po4
-rw-r--r--langs/pl/5.po157
-rw-r--r--langs/pt-br/5.po10
-rw-r--r--langs/pt/5.po4
-rw-r--r--langs/ro/5.po10
-rw-r--r--langs/ru/5.po10
-rw-r--r--langs/sco/5.po4
-rw-r--r--langs/sl/5.po10
-rw-r--r--langs/sq/5.po4
-rw-r--r--langs/sv/5.po165
-rw-r--r--langs/tr/5.po8
-rw-r--r--langs/uk/5.po10
-rw-r--r--langs/ur/5.po4
-rw-r--r--langs/zh-cn/5.po4
-rw-r--r--langs/zh-tw/5.po4
l---------lv/5_preview1
l---------nb/5_preview1
l---------nl/5_preview1
l---------pl/5_preview1
l---------pt-br/5_preview1
l---------pt/5_preview1
l---------ro/5_preview1
l---------ru/5_preview1
l---------sco/5_preview1
l---------sl/5_preview1
l---------sq/5_preview1
l---------sv/5_preview1
l---------tr/5_preview1
l---------uk/5_preview1
l---------ur/5_preview1
l---------zh-cn/5_preview1
l---------zh-tw/5_preview1
74 files changed, 640 insertions, 1973 deletions
diff --git a/ast/5_preview b/ast/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/ast/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/ca/5_preview b/ca/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/ca/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/cs/5_preview b/cs/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/cs/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/de/5_preview b/de/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/de/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/el/5_preview b/el/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/el/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/en-gb/5_preview b/en-gb/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/en-gb/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/en/5/download_index.php b/en/5/download_index.php
index 3f086c940..9601bd43b 100755
--- a/en/5/download_index.php
+++ b/en/5/download_index.php
@@ -2,7 +2,7 @@
$name = 'Mageia';
$version = '5';
-$release = 'RC';
+$release = '';
$torrentavailable=true;
$classical=true;
$live=true;
@@ -14,8 +14,6 @@ define('ALIGNMENT', 'Center');
require '../../langs.php';
$dictionary = read_translation_file($locale, "5");
-$dictionary_cauldron = read_translation_file($locale, 'cauldron');
-$dictionary = array_merge($dictionary, $dictionary_cauldron);
function get_mageia($name, $version, $release)
{
@@ -53,12 +51,12 @@ echo $torrent && !$torrentavailable ? sprintf(_t('forthcoming')) : sprintf('<a
$torrent ? '&amp;torrent=1' : '',
implode(' ', array($name, $version, $release, $variant, $arch, $medium)),
$bit
- );
+ );
}
function get_image($ttl, $src, $sty){
- echo sprintf('<noscript><img class="lazy" src="%s" alt="%s" title="%s" style="%s" /></noscript>', $src, $ttl, $ttl, $sty);
- echo sprintf('<img class="lazy" src="" data-src="%s" alt="%s" title="%s" style="%s" />', $src, $ttl, $ttl, $sty);
+ echo sprintf('<noscript><img class="lazy" src="%s" alt="%s" title="%s" style="%s" /></noscript>', $src, $ttl, $ttl, $sty);
+ echo sprintf('<img class="lazy" src="" data-src="%s" alt="%s" title="%s" style="%s" />', $src, $ttl, $ttl, $sty);
}
?>
@@ -72,8 +70,8 @@ function get_image($ttl, $src, $sty){
<meta name="robots" content="index,nofollow,nosnippet">
<link rel="canonical" href="/<?php echo $locale.'/'.$verion;?>/">
<link rel="stylesheet" href="/g/style/all.css">
- <script src="/g/js/jquery-1.10.1.min.js"></script>
- <script src="/g/js/tooltipsy.min.js"></script>
+ <script src="/g/js/jquery-1.10.1.min.js"></script>
+ <script src="/g/js/tooltipsy.min.js"></script>
<?php include '../../analytics.php'; ?>
<style>
.radiobutton{
@@ -84,7 +82,7 @@ function get_image($ttl, $src, $sty){
.radiobutton .ui-button{
display: table-cell;
height: 100%;
- }
+}
.ui-button,.ui-button:link {
border: 1px solid #AED0EA;
-moz-box-sizing: content-box;
@@ -99,7 +97,7 @@ function get_image($ttl, $src, $sty){
min-width: 200px;
text-decoration: none;
color: black;
- text-shadow: 1px 2px 3px rgba(0,0,0, 0.5);
+ text-shadow: 1px 2px 3px rgba(0,0,0, 0.5);
-moz-box-shadow: 0 0 5px rgba(0, 0, 0, .5);
-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .5);
box-shadow: 2px 2px 5px rgba(0, 0, 0, .5);
@@ -137,16 +135,11 @@ input[type="radio"], input[type="submit"] {
</style>
</head>
<body class="release downloads">
- <?php echo $hsnav; ?>
- <header id="mgnavt">
- <h1><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
- <?php include '../'.$version.'/nav.php'; ?>
- </header>
- <p class="unstable-release-warning"><?php
-// _g('Be careful! This is an alpha, unstable release.');
-// _g('Be careful! This is a beta, unstable release.');
-// _g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');
- _g('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s.', array(_r('May 2015'))); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
+ <?php echo $hsnav; ?>
+
+ <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
+ <?php include '../5/nav.php'; ?>
+
<div id="doc4" class="yui-t7">
<div id="bd" role="main">
<div class="yui-ge bb1">
@@ -158,77 +151,77 @@ input[type="radio"], input[type="submit"] {
</noscript>
<div class="para">
- <p>
- <?php _g('Mageia is provided as ISO image files that have to be written to blank <a href="%s">CD or DVD discs</a>.', array(_r('https://wiki.mageia.org/en/Writing_CD_and_DVD_images')));?>
- <br>
- <?php _g('All ISOs can also be launched from a <a %s>USB drive</a>.', array('class="iso2usb"'));?>
- <span class="warn"><?php _g('Unetbootin is not supported.'); ?></span>
- <br><br>
- <?php _g('If you have <a href="%s">UEFI</a>, a procedure is available in the <a href="%s">wiki</a>.', array(_r('http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface'),_r('https://wiki.mageia.org/en/Installing_on_systems_with_UEFI_firmware' /*this will be changed to tooltip, so no more url*/))) ;?>
- </p>
- <div id="iso2usbEx">
- <?php _g('Dump Mageia ISO on a USB flash drive',null,'h2');
-
- _g('"Dumping" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk.',null,'p');
- _g('Unetbootin should not be used to copy the iso image to a USB drive (see below).',null,'p class="warn"');
- _g('To dump a Mageia installation ISO on a USB stick, you may try one of several tools:',null,'p');
- echo '<ul>';
- _g('For Linux, IsoDumper, available inside repo. Or any tools based on dd.',null,'li');
- echo '<li>';
- _g('For windows use <a href="%s">usbdumper.</a>',array('http://mirrors.kernel.org/mageia/people/marcom/usbdumper.exe'));
- _g('If it show "writing error or access denied" try the fallowing method: run the console (cmd), then type "diskpart", then "list disk", then select your disk with "select disk", and type "clean" (it will erase the key).',null,'span class="dlinfo"');?>
- </li>
- </ul>
- </div>
+ <p>
+ <?php _g('Mageia is provided as ISO image files that have to be written to blank <a href="%s">CD or DVD discs</a>.', array(_r('https://wiki.mageia.org/en/Writing_CD_and_DVD_images')));?>
+ <br>
+ <?php _g('All ISOs can also be launched from a <a %s>USB drive</a>.', array('class="iso2usb"'));?>
+ <span class="warn"><?php _g('Unetbootin is not supported.'); ?></span>
+ <br><br>
+ <?php _g('If you have <a href="%s">UEFI</a>, a procedure is available in the <a href="%s">wiki</a>.', array(_r('http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface'),_r('https://wiki.mageia.org/en/Installing_on_systems_with_UEFI_firmware' /*this will be changed to tooltip, so no more url*/))) ;?>
+ </p>
+ <div id="iso2usbEx">
+ <?php _g('Dump Mageia ISO on a USB flash drive',null,'h2');
+
+ _g('"Dumping" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk.',null,'p');
+ _g('Unetbootin should not be used to copy the iso image to a USB drive (see below).',null,'p class="warn"');
+ _g('To dump a Mageia installation ISO on a USB stick, you may try one of several tools:',null,'p');
+ echo '<ul>';
+ _g('For Linux, IsoDumper, available inside repo. Or any tools based on dd.',null,'li');
+ echo '<li>';
+ _g('For windows use <a href="%s">usbdumper.</a>',array('http://mirrors.kernel.org/mageia/people/marcom/usbdumper.exe'));
+ _g('If it show "writing error or access denied" try the fallowing method: run the console (cmd), then type "diskpart", then "list disk", then select your disk with "select disk", and type "clean" (it will erase the key).',null,'span class="dlinfo"');?>
+ </li>
+ </ul>
+ </div>
</div>
<div class="para" id="format">
<?php if($classical == true){?>
<div id="classicalEx">
- <?php _g('Classical Installation Flavours',null,'h2')?>
-
- <?php _g('The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p'); ?>
- <p>
- <?php _g('Up to 167 locales are supported:'); ?>
- Deutsch, English, Español, Français, Italiano, Português, Svenska, Nederlands, Polski, Dansk, Pусский
- <?php _g('and so much more!'); ?>
- <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _g('See the comprehensive list')?></a>.
- </p>
- <p> <?php
- _g('These ISOs contains Free Software and some proprietary drivers.');
- _g('You will be asked of which kind of Software you want to install.');
- _g('The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO.');?>
- </p>
-
- <?php _g('For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it\'s about %sGB.',array('4','1.6'),'p class="dlinfo"');?>
-
+ <?php _g('Classical Installation Flavours',null,'h2')?>
+
+ <?php _g('The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p'); ?>
+ <p>
+ <?php _g('Up to 167 locales are supported:'); ?>
+ Deutsch, English, Español, Français, Italiano, Português, Svenska, Nederlands, Polski, Dansk, Pусский
+ <?php _g('and so much more!'); ?>
+ <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _g('See the comprehensive list')?></a>.
+ </p>
+ <p> <?php
+ _g('These ISOs contains Free Software and some proprietary drivers.');
+ _g('You will be asked of which kind of Software you want to install.');
+ _g('The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO.');?>
+ </p>
+
+ <?php _g('For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it\'s about %sGB.',array('3.5','1.2'),'p class="dlinfo"');?>
+
</div>
<?php } ?>
<?php if($live == true){?>
<div id="liveEx">
- <?php _g('LiveCDs and LiveDVDs',null,'h3');?>
-
- <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p');
- _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');?>
-
- <p><?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 the prior Mageia release!'); ?></span>
- <?php _g('Use a classical installation and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?>
- </p>
-
+ <?php _g('LiveCDs and LiveDVDs',null,'h3');?>
+
+ <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p');
+ _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');?>
+
+ <p><?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 the prior Mageia release!'); ?></span>
+ <?php _g('Use a classical installation and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?>
+ </p>
+
<?php _g('For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it\'s about %sMB.',array('1.6','700'),'p class="dlinfo"');?>
</div>
<?php } ?>
<div id="lanEx">
- <?php _g('Wired Network-based Installation CD',null,'h3');
- _g('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.',null,'p');
- _g('Have a look in the <a href="%s">wiki</a> to get a list of possibilities.',array(_r('https://wiki.mageia.org/en/Boot.iso_install')),'p');
- _g('These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it is the case, use above one.',null,'p');
- _g('Size of the ISOs is about 50MB.',null,'p class="dlinfo"');?>
+ <?php _g('Wired Network-based Installation CD',null,'h3');
+ _g('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.',null,'p');
+ _g('Have a look in the <a href="%s">wiki</a> to get a list of possibilities.',array(_r('https://wiki.mageia.org/en/Boot.iso_install')),'p');
+
+ _g('Size of the ISOs is about 50MB.',null,'p class="dlinfo"');?>
</div>
<div class="radiobutton">
@@ -241,129 +234,129 @@ input[type="radio"], input[type="submit"] {
</div>
<?php if( !$dual || !$live || !$classical ){?>
<p style="margin-top:1.5em;" class="warn">
- <?php if(!$dual){ _g('The dualarch is not yet available.');}?>
- <?php if(!$live) {_g('LiveCDs and LiveDVDs are not yet available.');}?>
- <?php if(!$classical){ _g('Classical Installation flavours is not yet available.');}?>
+ <?php if(!$dual){ _g('The dualarch is not yet available.');}?>
+ <?php if(!$live) {_g('LiveCDs and LiveDVDs are not yet available.');}?>
+ <?php if(!$classical){ _g('Classical Installation flavours is not yet available.');}?>
</p>
<?php }?>
</div>
<?php if($live){ ?>
<div class="para" id="livespin">
- <?php _g('LiveCDs and LiveDVDs',null,'h2');?>
-
- <div id="livecdEx">
- <?php _g('LiveCDs',null,'h3');
- _g('LiveCDs contain only English and is available only in 32bit.',null,'p');?>
- </div>
+ <?php _g('LiveCDs and LiveDVDs',null,'h2');?>
- <div id="livedvdEx">
- <?php _g('LiveDVDs',null,'h3');
- _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?>
- </div>
+ <div id="livedvdEx">
+ <?php _g('LiveDVDs',null,'h3');
+ _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?>
+ </div>
- <div class="radiobutton">
- <input type="radio" id="livecd" value="CD" name="livespin" />
- <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label>
- <input type="radio" id="livedvd" value="DVD" name="livespin" />
- <label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label>
- </div>
+ <div id="livecdEx">
+ <?php _g('LiveCDs',null,'h3');
+ _g('LiveCDs contain only English and is available only in 32bit.',null,'p');
+ _g('Do not use unless you really DON\'T NEED any other language than English.',null,'p class="warn"'); ?>
+ </div>
+ <div class="radiobutton">
+ <input type="radio" id="livedvd" value="DVD" name="livespin" />
+ <label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label>
+ <input type="radio" id="livecd" value="CD" name="livespin" />
+ <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label>
+ </div>
</div>
<div class="para" id="desktop">
- <?php _g('Desktop',null,'h2');?>
-
- <div id="gnomeEx">
- <?php _g('GNOME Desktop',null,'h3');?>
- <?php get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?>
- </div>
- <div id="kdeEx">
- <?php _g('KDE Desktop',null,'h3');?>
- <?php get_image('KDE', '/g/5/kde.png', 'width: 100%');?>
- </div>
-
- <div class="radiobutton">
- <input type="radio" id="kde" value="KDE4" name="desktop" />
- <label for="kde" class="ui-button kde"><?php _g('KDE Desktop')?></label>
- <input type="radio" id="gnome" value="GNOME" name="desktop" />
- <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label>
- </div>
+ <?php _g('Desktop',null,'h2');?>
+
+ <div id="gnomeEx">
+ <?php _g('GNOME Desktop',null,'h3');?>
+ <?php get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?>
+ </div>
+ <div id="kdeEx">
+ <?php _g('KDE Desktop',null,'h3');?>
+ <?php get_image('KDE', '/g/5/kde.png', 'width: 100%');?>
+ </div>
+
+ <div class="radiobutton">
+ <input type="radio" id="kde" value="KDE4" name="desktop" />
+ <label for="kde" class="ui-button kde"><?php _g('KDE Desktop')?></label>
+ <input type="radio" id="gnome" value="GNOME" name="desktop" />
+ <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label>
+ </div>
</div><?php }/*live*/?>
<div class="para" id="nat">
- <?php _g('Network installer',null,'h2');?>
-
- <div id="freeEx">
- <?php _g('Network installer, Free Software CD', null,'h3');
- _g('Contain only free software',null,'p')?>
- </div>
- <div id="nonfreeEx">
- <?php _g('Network installer + nonfree firmware CD', null,'h3');
- _g('Contain nonfree drivers needed for some disc controllers, some network cards, etc.',null,'p')?>
- </div>
- <div class="radiobutton">
- <input type="radio" id="free" value="-" name="nat" />
- <label for="free" class="ui-button free"><?php _g('Free Software CD')?></label>
- <input type="radio" id="nonfree" value="nonfree" name="nat" />
- <label for="nonfree" class="ui-button nonfree"><?php _g('Nonfree Firmware CD')?></label>
- </div>
+ <?php _g('Network installer',null,'h2');?>
+
+ <div id="freeEx">
+ <?php _g('Network installer, Free Software CD', null,'h3');
+ _g('Contain only free software',null,'p')?>
+ </div>
+ <div id="nonfreeEx">
+ <?php _g('Network installer + nonfree firmware CD', null,'h3');
+ _g('Contain nonfree drivers needed for some disc controllers, some network cards, etc.',null,'p')?>
+ </div>
+ <div class="radiobutton">
+ <input type="radio" id="free" value="-" name="nat" />
+ <label for="free" class="ui-button free"><?php _g('Free Software CD')?></label>
+ <input type="radio" id="nonfree" value="nonfree" name="nat" />
+ <label for="nonfree" class="ui-button nonfree"><?php _g('Nonfree Firmware CD')?></label>
+ </div>
</div>
<div class="para" id="arch">
- <?php _g('Supported Architecture',null,'h2');?>
- <div id='64bEx'>
- <?php _g('64 bit',null,'h3');
- _g('Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it.',null,'p')?>
- </div>
- <div id='32bEx'>
- <?php _g('32 bit',null,'h3');
- _g('This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though.',null,'p')?>
- </div>
+ <?php _g('Supported Architecture',null,'h2');?>
+ <div id='64bEx'>
+ <?php _g('64 bit',null,'h3');
+ _g('Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it.',null,'p')?>
+ </div>
+ <div id='32bEx'>
+ <?php _g('32 bit',null,'h3');
+ _g('This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though.',null,'p')?>
+ </div>
<?php if($dual){?>
- <div id='dualEx'>
- <?php _g('Dualarch',null,'h3');?>
- <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB.',array('XFCE','1'),'p');
+ <div id='dualEx'>
+ <?php _g('Dualarch',null,'h3');?>
+ <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB.',array('XFCE','1'),'p');
echo '<p>';
_g('Dual iso size is intended to be small for advanced users, only network proprietary drivers are included.', null, ' ');
_g('You will have to add remote nonfree media if you need some more.', null,' ');
_g('Furthermore UEFI is not supported.');
echo '</p>';
- _g('It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU.',null, 'p');
- _g('This ISO is generally for advanced users and system administrator for fast deployment of Mageia.',null, 'p');?>
- </div>
+ _g('It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU.',null, 'p');
+ _g('This ISO is generally for advanced users and system administrator for fast deployment of Mageia.',null, 'p');?>
+ </div>
<?php } ?>
- <div class="radiobutton">
- <input type="radio" id="32b" value="i586" name="arch" />
- <label for="32b" class="ui-button 32b"><?php _g('32 bit')?></label>
- <input type="radio" id="64b" value="x86_64" name="arch" />
- <label for="64b" class="ui-button 64b"><?php _g('64 bit')?></label>
+ <div class="radiobutton">
+ <input type="radio" id="32b" value="i586" name="arch" />
+ <label for="32b" class="ui-button 32b"><?php _g('32 bit')?></label>
+ <input type="radio" id="64b" value="x86_64" name="arch" />
+ <label for="64b" class="ui-button 64b"><?php _g('64 bit')?></label>
<?php if($dual == true){ ?><input type="radio" id="dual" value="dual" name="arch" />
- <label for="dual" class="ui-button dual"><?php _g('Dualarch')?></label><?php } ?>
- </div>
+ <label for="dual" class="ui-button dual"><?php _g('Dualarch')?></label><?php } ?>
+ </div>
</div>
<div class="dllink para" id="dllink" >
- <?php _g('Download Method',null,'h2');?>
- <div id="directEx">
- <?php _g('Direct Link',null,'h3');
- _g('You will be redirected to a HTTP or FTP mirror.',null,'p') ?>
- </div>
+ <?php _g('Download Method',null,'h2');?>
+ <div id="directEx">
+ <?php _g('Direct Link',null,'h3');
+ _g('You will be redirected to a HTTP or FTP mirror.',null,'p') ?>
+ </div>
- <div id="torrentEx">
+ <div id="torrentEx">
<?php if($torrentavailable){ ?>
- <?php _g('BitTorrent',null,'h3');
- _g('We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files.',array(_r('http://en.wikipedia.org/wiki/BitTorrent')),'p');?>
+ <?php _g('BitTorrent',null,'h3');
+ _g('We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files.',array(_r('http://en.wikipedia.org/wiki/BitTorrent')),'p');?>
<?php } else { echo _g('BitTorrent link are not yet available.',null, 'p style="margin-top:1.5em;" class="warn"'); } ?>
- </div>
+ </div>
- <div class="radiobutton">
- <?php if($torrentavailable){ ?>
- <a href="#" id="torrentlink" class="ui-button torrentlink"><?php _g('BitTorrent')?></a><?php }?>
- <a href="#" id="directlink" class="ui-button directlink"><?php _g('Direct Link')?></a>
- </div>
+ <div class="radiobutton">
+ <?php if($torrentavailable){ ?>
+ <a href="#" id="torrentlink" class="ui-button torrentlink"><?php _g('BitTorrent')?></a><?php }?>
+ <a href="#" id="directlink" class="ui-button directlink"><?php _g('Direct Link')?></a>
+ </div>
</div>
<noscript>
@@ -393,7 +386,7 @@ input[type="radio"], input[type="submit"] {
</tr>
<?php if($dual){ ?> <tr>
<th class="name">DVD dualarch</th>
- <td>
+ <td>
<?php dl_link($name,$version,$release,null,'dual','DVD',false);?>
</td><td>
<?php dl_link($name,$version,$release,null,'dual','DVD',true,$torrentavailable);?>
@@ -402,8 +395,8 @@ input[type="radio"], input[type="submit"] {
</tbody>
</table>
</div>
-<?php } ?>
-
+<?php } ?>
+
<?php if($live){ ?>
<div class="para" id="Flive">
<h2><?php _g('LiveCDs and LiveDVDs');?></h2>
@@ -466,13 +459,13 @@ input[type="radio"], input[type="submit"] {
<table class="fr-table dlt2">
<thead>
- <tr>
- <th><?php _g('Format');?></th>
- <th><?php _g('link');?></th>
- </tr>
+ <tr>
+ <th><?php _g('Format');?></th>
+ <th><?php _g('link');?></th>
+ </tr>
</thead>
<tbody>
- <tr>
+ <tr>
<th><?php _g('Network installer, Free Software CD')?></th>
<td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
echo '<br>';
@@ -497,20 +490,16 @@ input[type="radio"], input[type="submit"] {
<ul class="hl">
<li><a href=<?php echo sprintf('"%s">',$releasenotes); _g('Release notes')?></a></li>
<li><a href=<?php echo sprintf('"%s">',$errata); _g('More about known issues or limitation in installation and usage')?></a></li>
- <?php /* _g('<a href="%s">Which to choose</a>', array(_r('https://wiki.mageia.org/en/Installation_Media')),'li')?></li>
- <?php _g('<a href="%s">Get ISO on USB flash drive</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F')),'li') */?>
+ <?php _g('<a href="%s">Which to choose</a>', array(_r('https://wiki.mageia.org/en/Installation_Media')),'li')?></li>
+ <?php _g('<a href="%s">Get ISO on USB flash drive</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')),'li') ?>
<li><?php _g('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array(_r('https://wiki.mageia.org/en/Newcomers_start_here')))?></li>
<li><?php _g('Help us on %s', array("<a href=\"../contribute\">$name $version</a>"))?></li>
</ul>
<?php
echo '<br>';
- _g('Looking for a stable release?', null, 'h3');
- echo '<p>';
- _g('It is <a href="%s">here</a>.', array('../downloads/'));
- echo '</p>';
- /* _g('Upgrading<br>from %s ?', array('Mageia 4'), 'h3')?>
- <ul class="hl"><?php
+ _g('Upgrading<br>from %s ?', array('Mageia 4 (4.1)'), 'h3')?>
+ <ul class="hl"><?php
_g('<strong>do not</strong> use LiveCDs;', null, 'li');
_g('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li');
echo '</ul><br>';
@@ -518,12 +507,15 @@ input[type="radio"], input[type="submit"] {
_g('Looking for %s ?', array('Mageia 4'), 'h3');
echo '<p>';
_g('It is <a href="%s">here</a>.', array('../4/'),' ');
- echo '<span class="warn">', _g('But please remember that it already <a href="%s">reached EOL</a>.',array(_r_rename_when_blog_post_about_mga4_EOL_('https://blog.mageia.org/en/201?????/'))) . '</span>';
+ echo '<span class="warn">',
+ _g('But please remember that it will soon <a href="%s">reach EOL</a>.', array('../support/'));
+// _g('But please remember that it already <a href="%s">reached EOL</a>.', array(_r_rename_when_blog_post_about_mga4_EOL_('https://blog.mageia.org/en/201?????/')));
+ echo '</span>';
echo '</p>';
_g('Need more challenge?', null, 'h3');
_g('You can <a href="%s">help</a> us <a href="%s">on %s</a>.', array('../contribute/','../contribute/','Mageia 6'));
-*/ ?>
+ ?>
</div>
<hr>
</div>
@@ -542,26 +534,26 @@ $($cl).tooltipsy({
offset: [($x), ($y)],
delay:500,
content: function ($el, $tip) {
- $tip.html($($id).remove().html())
- },
- hide: function (e, $el) {
- setTimeout(function(){
+ $tip.html($($id).remove().html())
+ },
+ hide: function (e, $el) {
+ setTimeout(function(){
$el.hide();
- }, 400);
+ }, 400);
}
- });
+});
}
function lazyload(){
- $('img.lazy').each(function(){
- $(this)
- .attr( 'src', $(this).data('src') )
- .removeClass('hidden')
- .removeAttr('data-src');
- });
+$('img.lazy').each(function(){
+ $(this)
+ .attr( 'src', $(this).data('src') )
+ .removeClass('hidden')
+ .removeAttr('data-src');
+});
}
- $('#iso2usb,#arch,#nat,#desktop,#livespin,#dllink').hide();
+ $('#iso2usb,#arch,#nat,#desktop,#livespin,#dllink').hide();
$('input[name=format]').click(function () {
$('#arch,label[for="dual"]')[this.id == 'classical' ? 'slideDown' : 'slideUp']();
$('label[for="64b"],#64bex').show();
@@ -598,18 +590,18 @@ function lazyload(){
$('input[name=desktop]').click(function () {
$('#arch')[ $('#gnome,#kde').is(':checked') ? 'slideDown' : 'slideUp']();
- scrolltoid('#arch')
+ scrolltoid('#arch')
});
$('input[name=arch]').click(function () {
$('#dllink')[$('#32b,#64b,#dual').is(':checked') ? 'slideDown' : 'slideUp']();
$('input[name="dllink"]').prop('checked', false);
$('#torrentEx,#torrentlink')[$('#lan').is(':checked') ? 'hide' : 'show']();
- scrolltoid('#dllink')
+ scrolltoid('#dllink')
});
- $('#directlink,#torrentlink').hover(function () {
- format = $('input[name=format]:checked').val();
+ $('#directlink,#torrentlink').hover(function () {
+ format = $('input[name=format]:checked').val();
livespin = $('input[name=livespin]:checked').val();
desktop = $('input[name=desktop]:checked').val();
desktop = (livespin == 'CD') ? desktop + '-en' : desktop;
@@ -617,26 +609,26 @@ function lazyload(){
arch = $('input[name=arch]:checked').val();
getname ='<?php echo get_mageia($name, $version, $release)?>' + '-';
file = $('#live').is(':checked') ? format + livespin + '-' + desktop + '-' + arch + '-' + livespin + '.iso' : $('#classical').is(':checked') ? arch + '-' + format + '.iso' : format + nat + arch + '-CD.iso';
- file = (this.id == 'torrentlink') ? getname + file + '&torrent=1' : getname + file ;
+ file = (this.id == 'torrentlink') ? getname + file + '&torrent=1' : getname + file ;
$("a.ui-button").attr('href','../downloads/get/?q=' + file);
});
- gettooltip('.iso2usb', '#iso2usbEx',0,1)
- gettooltip('.classical', '#classicalEx',40,-70)
- gettooltip('.live', '#liveEx',40,-70)
- gettooltip('.lan','#lanEx',40,-70)
- gettooltip('.livecd', '#livecdEx',40,-70)
- gettooltip('.livedvd', '#livedvdEx',40,-70)
- gettooltip('.gnome', '#gnomeEx',40,-300)
- gettooltip('.kde', '#kdeEx',40,-300)
- gettooltip('.free', '#freeEx',40,-70)
- gettooltip('.nonfree','#nonfreeEx',40,-70)
- gettooltip('.32b', '#32bEx',40,-70)
- gettooltip('.64b', '#64bEx',40,-70)
- gettooltip('.dual', '#dualEx',40,-70)
- gettooltip('.directlink', '#directEx',40,-40)
- gettooltip('.torrentlink','#torrentEx',40,-40)
-
+ gettooltip('.iso2usb', '#iso2usbEx',0,1)
+ gettooltip('.classical', '#classicalEx',40,-70)
+ gettooltip('.live', '#liveEx',40,-70)
+ gettooltip('.lan','#lanEx',40,-70)
+ gettooltip('.livecd', '#livecdEx',40,-70)
+ gettooltip('.livedvd', '#livedvdEx',40,-70)
+ gettooltip('.gnome', '#gnomeEx',40,-300)
+ gettooltip('.kde', '#kdeEx',40,-300)
+ gettooltip('.free', '#freeEx',40,-70)
+ gettooltip('.nonfree','#nonfreeEx',40,-70)
+ gettooltip('.32b', '#32bEx',40,-70)
+ gettooltip('.64b', '#64bEx',40,-70)
+ gettooltip('.dual', '#dualEx',40,-70)
+ gettooltip('.directlink', '#directEx',40,-40)
+ gettooltip('.torrentlink','#torrentEx',40,-40)
+
});
</script>
</body>
diff --git a/en/5/index.php b/en/5/index.php
index d597cf184..d7adbba57 100644
--- a/en/5/index.php
+++ b/en/5/index.php
@@ -1 +1,103 @@
-<?php include '../5/download_index.php';
+<?php
+define('HLANG', true);
+define('ALIGNMENT', 'Center');
+require '../../langs.php';
+
+$dictionary = read_translation_file($locale, '5');
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $locale; ?>">
+<head>
+ <meta charset="utf-8">
+ <title><?php _g('Mageia 5')?></title>
+ <link rel="stylesheet" href="/g/style/all.css">
+ <meta name="description" content="<?php _g('Mageia 5 is the new, solid, stable Linux distribution from the Mageia project.')?>">
+ <?php include '../../analytics.php'; ?>
+ <style>.para{text-align: justify;text-align: -webkit-auto;}</style>
+ <link rel="stylesheet" href="/g/style/bjqs.css">
+ <script src="/g/js/jquery-1.10.1.min.js"></script>
+ <script src="/g/js/bjqs-1.3.min.js"></script>
+ </head>
+
+<body class="downloads">
+ <?php echo $hsnav; ?>
+
+ <h1 id="mgnavt"><a href="../5/">Mageia 5</a></h1>
+ <?php include '../5/nav.php'; ?>
+
+ <div id="doc5" class="yui-t3">
+ <div id="bd" role="main">
+ <div class="yui-ge bb1">
+ <div class="yui-u first" style="width:55.5%">
+ <div class="para">
+
+<?php _g('About Mageia 5', null, 'h2');
+
+ _g('Mageia 5 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'), 'p');?>
+
+ <p><a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _g('Download it right away!');?></a></p>
+
+<?php _g('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 5 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE.', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive')), 'p');
+ _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');
+
+ _g('The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p');
+
+ _g('Mageia 5 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon.', null, 'p');
+
+ _g('There are lots of applications in the official repositories. You can have a look at the <a href="%s">Mageia Application Database</a> to get a complete list of packages inside Mageia.', array('http://mageia.madb.org'), 'p');
+
+ _g('What\'s new?', null, 'h2');
+
+ _g('There\'s plenty of new goodness in Mageia 5, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array($releasenotes), 'p');
+
+ _g('There is one feature worth mentioning here. It took a lot of effort and time but it was worth it. Mageia 5 <a href="%s">supports UEFI</a>, which means it’s now even easier to install it on recent hardware.',
+ array(_r('https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/')), 'p');
+
+ _g('To help users configure and use Mageia, and to provide some information about the community and the project, there\'s a program called <a href="%s">MageiaWelcome</a>. It starts automatically when a session opens for the first time in any of the graphical environments.',array(_r('https://wiki.mageia.org/en/Feature:MageiaWelcome')), 'p');
+ ?>
+ </div>
+ </div>
+
+ <div class="yui-u" style="width:44.5%">
+ <div id="banner" style="text-align:center; display: block; padding: 2em 0em 4em;">
+ <!-- start Basic Jquery Slider -->
+ <ul class="bjqs">
+ <li><img src="/g/5/Cinnamon.png" title="Cinnamon"></li>
+ <li><img src="/g/5/Enlightenment.png" title="Enlightenment"></li>
+ <li><img src="/g/5/gnome.png" title="Gnome"></li>
+ <li><img src="/g/5/kde.png" title="KDE"></li>
+ <li><img src="/g/5/Lxde.png" title="Lxde"></li>
+ <li><img src="/g/5/Lxqt.png" title="Lxqt"></li>
+ <li><img src="/g/5/Mate.png" title="Mate"></li>
+ <li><img src="/g/5/Xfce.png" title="Xfce"></li>
+ <li><img src="/g/5/MageiaControlCenter.png" title="<?php _g('Mageia Control Center');?>"></li>
+ <li><img src="/g/5/MageiaWelcome1.png" title="Mageia Welcome 1"></li>
+ <li><img src="/g/5/MageiaWelcome2.png" title="Mageia Welcome 2"></li>
+ <li><img src="/g/5/MageiaWelcome3.png" title="Mageia Welcome 3"></li>
+ <li><img src="/g/5/MageiaWelcome4.png" title="Mageia Welcome 4"></li>
+ <li><img src="/g/5/MageiaWelcome5.png" title="Mageia Welcome 5"></li>
+ </ul>
+
+ </div>
+ <div class="para" style="padding: 1em 2em 1em 0em">
+
+ <?php
+ _g('Mageia in context', null, 'h2');
+
+ _g('Mageia is both a Community and a Linux Distribution, with Mageia 5 being our fifth release.', null, 'p');
+
+ _g('Mageia 5 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.',array('../about/'), 'p');
+
+ _g('Mageia 5 has been made by more than <a href="%s">100 people from all around the world</a>.',array('//people.mageia.org/g/'), 'p');
+
+ _g('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.', null, 'p');
+
+ _g('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>.', array('../contribute'), 'p');
+ ?>
+ </div>
+
+</div>
+</div>
+
+ </body>
+</html>
diff --git a/en/5/nav.php b/en/5/nav.php
index e715d0e78..cb2864a5e 100644
--- a/en/5/nav.php
+++ b/en/5/nav.php
@@ -1,17 +1,16 @@
<?php
-$releasenotes = "https://wiki.mageia.org/en/Mageia_5_$release"; //_r('https://wiki.mageia.org/en/Mageia_5_Release_Notes');
+$releasenotes = _r('https://wiki.mageia.org/en/Mageia_5_Release_Notes');
$errata = _r('https://wiki.mageia.org/en/Mageia_5_Errata');
$upgradeguide = _r('https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4');
$nav = array(
- _r("https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning") => _r('Development roadmap'),
- _r("https://wiki.mageia.org/en/FeatureMageia5_Review") => _r('Features review'),
- /*"/{$locale}/5/" => 'Mageia&nbsp;5',
- "/{$locale}/downloads/" => _r('Download'),*/
+ "/{$locale}/5/" => 'Mageia&nbsp;5',
+ "/{$locale}/downloads/" => _r('Download'),
+
$releasenotes => _r('Release notes'),
$errata => _r('Errata'),
- "//bugs.mageia.org/" => _r('Bugs Reports'),
+// "//bugs.mageia.org/" => _r('Bugs Reports'),
);
$sru = trim($_SERVER['REQUEST_URI']);
@@ -26,5 +25,5 @@ foreach ($nav as $k => $v) {
$pnav = implode($pnav);
echo <<<S
-<ul>{$pnav}</ul>
+<div id="mgnavsub"><ul id="mgnavsubl">{$pnav}</ul></div>
S;
diff --git a/en/5_preview/download_index.php b/en/5_preview/download_index.php
deleted file mode 100755
index 3d7744383..000000000
--- a/en/5_preview/download_index.php
+++ /dev/null
@@ -1,635 +0,0 @@
-<?php
-
-$name = 'Mageia';
-$version = '5';
-$release = '';
-$torrentavailable=true;
-$classical=true;
-$live=true;
-$dual=true;
-
-
-define('HLANG', true);
-define('ALIGNMENT', 'Center');
-
-require '../../langs.php';
-$dictionary = read_translation_file($locale, "5");
-
-function get_mageia($name, $version, $release)
-{
-$re = empty($release) ? $version : $version . '-' . $release;
-return implode('-', array($name, $re));
-}
-
-function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext)
-{
-$va = empty($variant) ? $arch : $variant . '-' . $arch;
-$re = empty($release) ? $va : $release . '-' . $va;
-
-return implode('-', array($name, $version, $re, $medium)) . $ext;
-}
-
-function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $torrentavailable = true)
-{
-switch ($arch) {
-case "i586":
- $bit = _r('32 bit');
- break;
-case "x86_64":
- $bit = _r('64 bit');
- break;
-case "dual":
- $bit = _r('Dualarch');
- break;
-default:
- $bit = '';
- break;
-}
-
-echo $torrent && !$torrentavailable ? sprintf(_t('forthcoming')) : sprintf('<a rel="nofollow" href="../downloads/get/?q=%s%s" title="%s">%s</a>',
- get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, '.iso'),
- $torrent ? '&amp;torrent=1' : '',
- implode(' ', array($name, $version, $release, $variant, $arch, $medium)),
- $bit
-);
-}
-
-function get_image($ttl, $src, $sty){
- echo sprintf('<noscript><img class="lazy" src="%s" alt="%s" title="%s" style="%s" /></noscript>', $src, $ttl, $ttl, $sty);
- echo sprintf('<img class="lazy" src="" data-src="%s" alt="%s" title="%s" style="%s" />', $src, $ttl, $ttl, $sty);
-}
-
-?>
-<!DOCTYPE html>
-<html dir="ltr" lang="<?php echo $locale; ?>">
-<head>
- <meta charset="utf-8">
- <title><?php echo sprintf(_g('Download').' '. '%s %s %s', $name, $version, $release)?></title>
- <meta name="description" content="<?php _g('Download %s DVD, CD, LiveCD, network install ISO images.', array("$name $version"))?>">
- <meta name="keywords" content="<?php _g('mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent', array("$name $version"))?>">
- <meta name="robots" content="index,nofollow,nosnippet">
- <link rel="canonical" href="/<?php echo $locale.'/'.$verion;?>/">
- <link rel="stylesheet" href="/g/style/all.css">
- <script src="/g/js/jquery-1.10.1.min.js"></script>
- <script src="/g/js/tooltipsy.min.js"></script>
- <?php include '../../analytics.php'; ?>
- <style>
-.radiobutton{
- display: table;
- border-spacing:0.4em 0;
- margin: 0px auto;
-}
-.radiobutton .ui-button{
- display: table-cell;
- height: 100%;
-}
-.ui-button,.ui-button:link {
- border: 1px solid #AED0EA;
- -moz-box-sizing: content-box;
- outline: 0 none !important;
- background: repeat-x scroll 50% 50% #D7EBF9;
- font-size: 1.4em;
- cursor: pointer;
- text-align: center;
- vertical-align: middle;
- border-radius: 6px;
- padding: .5em .4em;
- min-width: 200px;
- text-decoration: none;
- color: black;
- text-shadow: 1px 2px 3px rgba(0,0,0, 0.5);
- -moz-box-shadow: 0 0 5px rgba(0, 0, 0, .5);
- -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .5);
- box-shadow: 2px 2px 5px rgba(0, 0, 0, .5);
-}
-.iso2usb {cursor:pointer}
-
-input[type="radio"]:checked + label,.ui-button:active {
- background: #2383C2;
- background: -webkit-linear-gradient(top, #3494D3 0%, #2383C2 50%);
- background: -moz-linear-gradient(top, #3494D3 0%, #2383C2 50%);
- background: -o-linear-gradient(top, #3494D3 0%, #2383C2 50%);
- background: linear-gradient(top, #3494D3 0%, #2383C2 50%);
-}
-input[type="radio"], input[type="submit"] {
- display: none;
-}
-.ui-button:hover{
- background: #23AEC2;
-}
-
-.tooltipsy{
- padding: 0.5em;
- width:auto;
- max-width: 500px;
- color: #303030;
- background-color: #F0F9FF;
- border: 1px solid #deca7e;
- text-align: left;
- -moz-box-shadow: 0 0 10px rgba(0, 0, 0, .5);
- -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .5);
- box-shadow: 0 0 10px rgba(0, 0, 0, .5);
- text-shadow: none;
- border-radius: 6px;
-}
-</style>
-</head>
-<body class="release downloads">
- <?php echo $hsnav; ?>
- <header id="mgnavt">
- <h1><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
- <?php include './nav.php'; ?>
- </header>
- <div id="doc4" class="yui-t7">
- <div id="bd" role="main">
- <div class="yui-ge bb1">
- <div class="yui-u first rb1">
-
-<noscript>
-<div class="para warn"><?php _g('It looks like you have JavaScript disable. Please <a href="%s">enable</a> it to have better render. At the <a href="%s">end</a> of this page there will be download link for you. But what is written between is important.',array('http://www.enable-javascript.com/','#Fclassical'),'p'); ?></div>
-<style>.radiobutton .ui-button{display: none;}</style>
-</noscript>
-
-<div class="para">
- <p>
- <?php _g('Mageia is provided as ISO image files that have to be written to blank <a href="%s">CD or DVD discs</a>.', array(_r('https://wiki.mageia.org/en/Writing_CD_and_DVD_images')));?>
- <br>
- <?php _g('All ISOs can also be launched from a <a %s>USB drive</a>.', array('class="iso2usb"'));?>
- <span class="warn"><?php _g('Unetbootin is not supported.'); ?></span>
- <br><br>
- <?php _g('If you have <a href="%s">UEFI</a>, a procedure is available in the <a href="%s">wiki</a>.', array(_r('http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface'),_r('https://wiki.mageia.org/en/Installing_on_systems_with_UEFI_firmware' /*this will be changed to tooltip, so no more url*/))) ;?>
- </p>
- <div id="iso2usbEx">
- <?php _g('Dump Mageia ISO on a USB flash drive',null,'h2');
-
- _g('"Dumping" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk.',null,'p');
- _g('Unetbootin should not be used to copy the iso image to a USB drive (see below).',null,'p class="warn"');
- _g('To dump a Mageia installation ISO on a USB stick, you may try one of several tools:',null,'p');
- echo '<ul>';
- _g('For Linux, IsoDumper, available inside repo. Or any tools based on dd.',null,'li');
- echo '<li>';
- _g('For windows use <a href="%s">usbdumper.</a>',array('http://mirrors.kernel.org/mageia/people/marcom/usbdumper.exe'));
- _g('If it show "writing error or access denied" try the fallowing method: run the console (cmd), then type "diskpart", then "list disk", then select your disk with "select disk", and type "clean" (it will erase the key).',null,'span class="dlinfo"');?>
- </li>
- </ul>
- </div>
-</div>
-
-<div class="para" id="format">
-
-<?php if($classical == true){?>
-<div id="classicalEx">
- <?php _g('Classical Installation Flavours',null,'h2')?>
-
- <?php _g('The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p'); ?>
- <p>
- <?php _g('Up to 167 locales are supported:'); ?>
- Deutsch, English, Español, Français, Italiano, Português, Svenska, Nederlands, Polski, Dansk, Pусский
- <?php _g('and so much more!'); ?>
- <a href="https://wiki.mageia.org/en/Available_locales" hreflang="en"><?php _g('See the comprehensive list')?></a>.
- </p>
- <p> <?php
- _g('These ISOs contains Free Software and some proprietary drivers.');
- _g('You will be asked of which kind of Software you want to install.');
- _g('The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO.');?>
- </p>
-
- <?php _g('For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it\'s about %sGB.',array('3.5','1.2'),'p class="dlinfo"');?>
-
-</div>
-<?php } ?>
-
-
-<?php if($live == true){?>
-<div id="liveEx">
- <?php _g('LiveCDs and LiveDVDs',null,'h3');?>
-
- <?php _g('Live ISO\'s let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE.', array("$name $version"), 'p');
- _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');?>
-
- <p><?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 the prior Mageia release!'); ?></span>
- <?php _g('Use a classical installation and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?>
- </p>
-
- <?php _g('For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it\'s about %sMB.',array('1.6','700'),'p class="dlinfo"');?>
-</div>
-<?php } ?>
-
-<div id="lanEx">
- <?php _g('Wired Network-based Installation CD',null,'h3');
- _g('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.',null,'p');
- _g('Have a look in the <a href="%s">wiki</a> to get a list of possibilities.',array(_r('https://wiki.mageia.org/en/Boot.iso_install')),'p');
-
- _g('Size of the ISOs is about 50MB.',null,'p class="dlinfo"');?>
-</div>
-
-<div class="radiobutton">
- <?php if( $classical ){?><input type="radio" value="DVD" name="format" id="classical"/>
- <label for="classical" class="ui-button classical" ><?php _g('Classic Installation')?></label><?php }?>
- <?php if($live){ ?><input type="radio" id="live" value="Live" name="format" />
- <label for="live" class="ui-button live"><?php _g('Live Media');?></label><?php }?>
- <input type="radio" id="lan" value="Boot" name="format" />
- <label for="lan" class="ui-button lan"><?php _g('Network Installation')?></label>
-</div>
-<?php if( !$dual || !$live || !$classical ){?>
-<p style="margin-top:1.5em;" class="warn">
- <?php if(!$dual){ _g('The dualarch is not yet available.');}?>
- <?php if(!$live) {_g('LiveCDs and LiveDVDs are not yet available.');}?>
- <?php if(!$classical){ _g('Classical Installation flavours is not yet available.');}?>
-</p>
-<?php }?>
-</div>
-
-<?php if($live){ ?>
-<div class="para" id="livespin">
- <?php _g('LiveCDs and LiveDVDs',null,'h2');?>
-
- <div id="livedvdEx">
- <?php _g('LiveDVDs',null,'h3');
- _g('LiveDVDs contain all languages and is available in both 32 and 64bit.',null,'p');?>
- </div>
-
- <div id="livecdEx">
- <?php _g('LiveCDs',null,'h3');
- _g('LiveCDs contain only English and is available only in 32bit.',null,'p');
- _g('Do not use unless you really DON\'T NEED any other language than English.',null,'p class="warn"'); ?>
- </div>
-
- <div class="radiobutton">
- <input type="radio" id="livedvd" value="DVD" name="livespin" />
- <label for="livedvd" class="ui-button livedvd"><?php _g('LiveDVDs')?></label>
- <input type="radio" id="livecd" value="CD" name="livespin" />
- <label for="livecd" class="ui-button livecd"><?php _g('English only (CD)')?></label>
- </div>
-</div>
-
-<div class="para" id="desktop">
- <?php _g('Desktop',null,'h2');?>
-
- <div id="gnomeEx">
- <?php _g('GNOME Desktop',null,'h3');?>
- <?php get_image('GNOME', '/g/5/gnome.png', 'width: 100%');?>
- </div>
- <div id="kdeEx">
- <?php _g('KDE Desktop',null,'h3');?>
- <?php get_image('KDE', '/g/5/kde.png', 'width: 100%');?>
- </div>
-
- <div class="radiobutton">
- <input type="radio" id="kde" value="KDE4" name="desktop" />
- <label for="kde" class="ui-button kde"><?php _g('KDE Desktop')?></label>
- <input type="radio" id="gnome" value="GNOME" name="desktop" />
- <label for="gnome" class="ui-button gnome"><?php _g('GNOME Desktop')?></label>
- </div>
-</div><?php }/*live*/?>
-
-<div class="para" id="nat">
- <?php _g('Network installer',null,'h2');?>
-
- <div id="freeEx">
- <?php _g('Network installer, Free Software CD', null,'h3');
- _g('Contain only free software',null,'p')?>
- </div>
- <div id="nonfreeEx">
- <?php _g('Network installer + nonfree firmware CD', null,'h3');
- _g('Contain nonfree drivers needed for some disc controllers, some network cards, etc.',null,'p')?>
- </div>
- <div class="radiobutton">
- <input type="radio" id="free" value="-" name="nat" />
- <label for="free" class="ui-button free"><?php _g('Free Software CD')?></label>
- <input type="radio" id="nonfree" value="nonfree" name="nat" />
- <label for="nonfree" class="ui-button nonfree"><?php _g('Nonfree Firmware CD')?></label>
- </div>
-</div>
-
-<div class="para" id="arch">
- <?php _g('Supported Architecture',null,'h2');?>
- <div id='64bEx'>
- <?php _g('64 bit',null,'h3');
- _g('Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it.',null,'p')?>
- </div>
- <div id='32bEx'>
- <?php _g('32 bit',null,'h3');
- _g('This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though.',null,'p')?>
- </div>
-
-<?php if($dual){?>
- <div id='dualEx'>
- <?php _g('Dualarch',null,'h3');?>
- <?php _g('The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB.',array('XFCE','1'),'p');
- echo '<p>';
- _g('Dual iso size is intended to be small for advanced users, only network proprietary drivers are included.', null, ' ');
- _g('You will have to add remote nonfree media if you need some more.', null,' ');
- _g('Furthermore UEFI is not supported.');
- echo '</p>';
- _g('It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU.',null, 'p');
- _g('This ISO is generally for advanced users and system administrator for fast deployment of Mageia.',null, 'p');?>
- </div>
-<?php } ?>
- <div class="radiobutton">
- <input type="radio" id="32b" value="i586" name="arch" />
- <label for="32b" class="ui-button 32b"><?php _g('32 bit')?></label>
- <input type="radio" id="64b" value="x86_64" name="arch" />
- <label for="64b" class="ui-button 64b"><?php _g('64 bit')?></label>
- <?php if($dual == true){ ?><input type="radio" id="dual" value="dual" name="arch" />
- <label for="dual" class="ui-button dual"><?php _g('Dualarch')?></label><?php } ?>
- </div>
-</div>
-
-<div class="dllink para" id="dllink" >
- <?php _g('Download Method',null,'h2');?>
- <div id="directEx">
- <?php _g('Direct Link',null,'h3');
- _g('You will be redirected to a HTTP or FTP mirror.',null,'p') ?>
- </div>
-
-
- <div id="torrentEx">
-<?php if($torrentavailable){ ?>
- <?php _g('BitTorrent',null,'h3');
- _g('We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files.',array(_r('http://en.wikipedia.org/wiki/BitTorrent')),'p');?>
-<?php } else { echo _g('BitTorrent link are not yet available.',null, 'p style="margin-top:1.5em;" class="warn"'); } ?>
- </div>
-
- <div class="radiobutton">
- <?php if($torrentavailable){ ?>
- <a href="#" id="torrentlink" class="ui-button torrentlink"><?php _g('BitTorrent')?></a><?php }?>
- <a href="#" id="directlink" class="ui-button directlink"><?php _g('Direct Link')?></a>
- </div>
-</div>
-
-<noscript>
-<?php if ($classical){ ?>
- <div class="para" id="Fclassical">
- <h2><?php _g('Classical Installation Flavours')?></h2>
- <table class="fr-table dlt2">
- <thead>
- <tr>
- <th><?php _g('Format');?></th>
- <th><?php _g('link');?></th>
- <th><?php _g('BitTorrent');?></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <th class="name" >DVD 32bit<br>DVD 64bit</th>
- <td>
- <?php dl_link($name,$version,$release,null,'i586','DVD',false);
- echo '<br>';
- dl_link($name,$version,$release,null,'x86_64','DVD',false);
- echo '</td><td>';
- dl_link($name,$version,$release,null,'i586','DVD',true,$torrentavailable);
- echo '<br>';
- dl_link($name,$version,$release,null,'x86_64','DVD',true,$torrentavailable);?>
- </td>
- </tr>
-<?php if($dual){ ?> <tr>
- <th class="name">DVD dualarch</th>
- <td>
- <?php dl_link($name,$version,$release,null,'dual','DVD',false);?>
- </td><td>
- <?php dl_link($name,$version,$release,null,'dual','DVD',true,$torrentavailable);?>
- </td>
- </tr><?php } ?>
- </tbody>
- </table>
- </div>
-<?php } ?>
-
-<?php if($live){ ?>
- <div class="para" id="Flive">
- <h2><?php _g('LiveCDs and LiveDVDs');?></h2>
- <table class="fr-table dlt2">
- <thead>
- <tr>
- <th><?php _g('Desktop');?></th>
- <th><?php _g('link');?></th>
- <th><?php _g('BitTorrent');?></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <th class="name" style="width:60%">LiveDVD KDE</th>
- <td>
- <?php dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',false);
- echo '<br>';
- dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',false);
- echo '</td><td>';
- dl_link($name,$version,$release,'LiveDVD-KDE4','i586','DVD',true,$torrentavailable);
- echo '<br>';
- dl_link($name,$version,$release,'LiveDVD-KDE4','x86_64','DVD',true,$torrentavailable);?>
- </td>
- </tr>
- <tr>
- <th class="name">LiveDVD GNOME</th>
- <td>
- <?php dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',false);
- echo '<br>';
- dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',false);
- echo '</td><td>';
- dl_link($name,$version,$release,'LiveDVD-GNOME','i586','DVD',true,$torrentavailable);
- echo '<br>';
- dl_link($name,$version,$release,'LiveDVD-GNOME','x86_64','DVD',true,$torrentavailable);?>
- </td>
- <tr>
- <th class="name">LiveCD KDE</th>
- <td>
- <?php dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',false);
- echo '</td><td>';
- dl_link($name,$version,$release,'LiveCD-KDE4-en','i586','CD',true,$torrentavailable);?>
- </td>
- </tr>
- <tr>
- <th class="name">LiveCD GNOME</th>
- <td>
- <?php dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',false);
- echo '</td><td>';
- dl_link($name,$version,$release,'LiveCD-GNOME-en','i586','CD',true,$torrentavailable);?>
- </tr>
-
- </tbody>
- </table>
-
- </div>
-<?php }?>
-
- <div class="para" id="Flan">
- <h2><?php _g('Wired Network-based Installation CD')?></h2>
-
- <table class="fr-table dlt2">
- <thead>
- <tr>
- <th><?php _g('Format');?></th>
- <th><?php _g('link');?></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <th><?php _g('Network installer, Free Software CD')?></th>
- <td><?php dl_link($name,$version,$release,'Boot','i586','CD',false);
- echo '<br>';
- dl_link($name,$version,$release,'Boot','x86_64','CD',false);?>
- </td>
- </tr>
- <tr>
- <th><?php _g('Network installer + nonfree firmware CD')?><br>
- <td><?php dl_link($name,$version,$release,'Boot-nonfree','i586','CD',false);
- echo '<br>';
- dl_link($name,$version,$release,'Boot-nonfree','x86_64','CD',false);?>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-</noscript>
- </div>
-
- <div class="yui-u">
- <div class="para" style="padding-left: 1em;">
- <ul class="hl">
- <li><a href=<?php echo sprintf('"%s">',$releasenotes); _g('Release notes')?></a></li>
- <li><a href=<?php echo sprintf('"%s">',$errata); _g('More about known issues or limitation in installation and usage')?></a></li>
- <?php _g('<a href="%s">Which to choose</a>', array(_r('https://wiki.mageia.org/en/Installation_Media')),'li')?></li>
- <?php _g('<a href="%s">Get ISO on USB flash drive</a>', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F')),'li') ?>
- <li><?php _g('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array(_r('https://wiki.mageia.org/en/Newcomers_start_here')))?></li>
- <li><?php _g('Help us on %s', array("<a href=\"../contribute\">$name $version</a>"))?></li>
- </ul>
- <?php
- echo '<br>';
-
- _g('Upgrading<br>from %s ?', array('Mageia 4 (4.1)'), 'h3')?>
- <ul class="hl"><?php
- _g('<strong>do not</strong> use LiveCDs;', null, 'li');
- _g('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li');
- echo '</ul><br>';
-
- _g('Looking for %s ?', array('Mageia 4'), 'h3');
- echo '<p>';
- _g('It is <a href="%s">here</a>.', array('../4/'),' ');
- echo '<span class="warn">',
- _g('But please remember that it will soon <a href="%s">reach EOL</a>.', array('../support/'));
-// _g('But please remember that it already <a href="%s">reached EOL</a>.', array(_r_rename_when_blog_post_about_mga4_EOL_('https://blog.mageia.org/en/201?????/')));
- echo '</span>';
- echo '</p>';
-
- _g('Need more challenge?', null, 'h3');
- _g('You can <a href="%s">help</a> us <a href="%s">on %s</a>.', array('../contribute/','../contribute/','Mageia 6'));
- ?>
- </div>
- <hr>
- </div>
- </div>
- </div>
- </div>
-<script>
-
-$(function () {
-
-function scrolltoid(id){ $('html, body').animate({ scrollTop: $(id).offset().top }, 800); }
-
-function gettooltip($cl, $id, $x, $y){
-$($cl).tooltipsy({
- alignTo: 'cursor',
- offset: [($x), ($y)],
- delay:500,
- content: function ($el, $tip) {
- $tip.html($($id).remove().html())
- },
- hide: function (e, $el) {
- setTimeout(function(){
- $el.hide();
- }, 400);
- }
-});
-}
-
-function lazyload(){
-$('img.lazy').each(function(){
- $(this)
- .attr( 'src', $(this).data('src') )
- .removeClass('hidden')
- .removeAttr('data-src');
-});
-}
-
- $('#iso2usb,#arch,#nat,#desktop,#livespin,#dllink').hide();
- $('input[name=format]').click(function () {
- $('#arch,label[for="dual"]')[this.id == 'classical' ? 'slideDown' : 'slideUp']();
- $('label[for="64b"],#64bex').show();
- $('#livespin')[this.id == 'live' ? 'slideDown' : 'slideUp']();
- $('#nat')[this.id == 'lan' ? 'slideDown' : 'slideUp']();
- if ($('#classical').is(':checked')) {
- $('input[name="arch"],input[name="dllink"]').prop('checked', false);
- }
-
- if ($('#live').is(':checked')) {
- $('input[name="livespin"],input[name="arch"],input[name="dllink"]').prop('checked', false);
- }
-
- if ($('#lan').is(':checked')) {
- $('input[name="nat"],input[name="arch"],input[name="dllink"]').prop('checked', false);
- }
-
- $('#desktop')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
- $('#dllink')[$('#lan,#live,#classical').is(':checked') ? 'slideUp' : 'slideDown']();
- });
-
- $('input[name=nat]').click(function () {
- $('#arch')[ $('#free,#nonfree').is(':checked') ? 'slideDown' : 'slideUp']();
- });
-
- $('input[name=livespin]').click(function () {
- $('#desktop')[ $('#livecd,#livedvd').is(':checked') ? 'slideDown' : 'slideUp']();
- if ($('#livecd').is(':checked') && $('#64b').is(':checked')) {
- $('input[id="32b"]').prop('checked', true);
- }
- $('label[for="64b"],#64bex')[$('#livecd').is(':checked') ? 'slideUp' : 'slideDown']();
- lazyload();
- });
-
- $('input[name=desktop]').click(function () {
- $('#arch')[ $('#gnome,#kde').is(':checked') ? 'slideDown' : 'slideUp']();
- scrolltoid('#arch')
- });
-
- $('input[name=arch]').click(function () {
- $('#dllink')[$('#32b,#64b,#dual').is(':checked') ? 'slideDown' : 'slideUp']();
- $('input[name="dllink"]').prop('checked', false);
- $('#torrentEx,#torrentlink')[$('#lan').is(':checked') ? 'hide' : 'show']();
- scrolltoid('#dllink')
- });
-
- $('#directlink,#torrentlink').hover(function () {
- format = $('input[name=format]:checked').val();
- livespin = $('input[name=livespin]:checked').val();
- desktop = $('input[name=desktop]:checked').val();
- desktop = (livespin == 'CD') ? desktop + '-en' : desktop;
- nat = (nat = $('input[name=nat]:checked').val()) == '-' ? '-' : '-' + nat + '-';
- arch = $('input[name=arch]:checked').val();
- getname ='<?php echo get_mageia($name, $version, $release)?>' + '-';
- file = $('#live').is(':checked') ? format + livespin + '-' + desktop + '-' + arch + '-' + livespin + '.iso' : $('#classical').is(':checked') ? arch + '-' + format + '.iso' : format + nat + arch + '-CD.iso';
- file = (this.id == 'torrentlink') ? getname + file + '&torrent=1' : getname + file ;
- $("a.ui-button").attr('href','../downloads/get/?q=' + file);
- });
-
- gettooltip('.iso2usb', '#iso2usbEx',0,1)
- gettooltip('.classical', '#classicalEx',40,-70)
- gettooltip('.live', '#liveEx',40,-70)
- gettooltip('.lan','#lanEx',40,-70)
- gettooltip('.livecd', '#livecdEx',40,-70)
- gettooltip('.livedvd', '#livedvdEx',40,-70)
- gettooltip('.gnome', '#gnomeEx',40,-300)
- gettooltip('.kde', '#kdeEx',40,-300)
- gettooltip('.free', '#freeEx',40,-70)
- gettooltip('.nonfree','#nonfreeEx',40,-70)
- gettooltip('.32b', '#32bEx',40,-70)
- gettooltip('.64b', '#64bEx',40,-70)
- gettooltip('.dual', '#dualEx',40,-70)
- gettooltip('.directlink', '#directEx',40,-40)
- gettooltip('.torrentlink','#torrentEx',40,-40)
-
-});
-</script>
-</body>
-</html>
diff --git a/en/5_preview/index.php b/en/5_preview/index.php
deleted file mode 100644
index 4edc3b9ba..000000000
--- a/en/5_preview/index.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-define('HLANG', true);
-define('ALIGNMENT', 'Center');
-require '../../langs.php';
-
-$dictionary = read_translation_file($locale, '5');
-?>
-<!DOCTYPE html>
-<html lang="<?php echo $locale; ?>">
-<head>
- <meta charset="utf-8">
- <title><?php _g('Mageia 5')?></title>
- <link rel="stylesheet" href="/g/style/all.css">
- <meta name="description" content="<?php _g('Mageia 5 is the new, solid, stable Linux distribution from the Mageia project.')?>">
- <?php include '../../analytics.php'; ?>
- <style>.para{text-align: justify;text-align: -webkit-auto;}</style>
- <link rel="stylesheet" href="/g/style/bjqs.css">
- <script src="/g/js/jquery-1.10.1.min.js"></script>
- <script src="/g/js/bjqs-1.3.min.js"></script>
- </head>
-
-<body class="downloads">
- <?php echo $hsnav; ?>
- <header id="mgnavt">
- <h1 id="mgnavtitle"><a href="../5/">Mageia 5</a></h1>
- <?php include './nav.php'; ?>
- </header>
- <div id="doc5" class="yui-t3">
- <div id="bd" role="main">
- <div class="yui-ge bb1">
- <div class="yui-u first" style="width:55.5%">
- <div class="para">
-
-<?php _g('About Mageia 5', null, 'h2');
-
- _g('Mageia 5 is a GNU/Linux distribution for your computer, released by the <a href="%s">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods.', array('../community'), 'p');?>
-
- <p><a href="../downloads/" style="background: #1272B1; color: white; padding: 0.9em; margin: 1em; display: inline-block; text-shadow: 0 1px 6px #000; border-radius: 3px;"><?php _g('Download it right away!');?></a></p>
-
-<?php _g('Live ISO\'s let you try Mageia without installation. Use <a href="%s">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 5 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE.', array(_r('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F')), 'p');
- _g('If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media.', null, 'p');
-
- _g('The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href="%s">documentation</a> for this installer.', array('../doc/'), 'p');
-
- _g('Mageia 5 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon.', null, 'p');
-
- _g('There are lots of applications in the official repositories. You can have a look at the <a href="%s">Mageia Application Database</a> to get a complete list of packages inside Mageia.', array('http://mageia.madb.org'), 'p');
-
- _g('What\'s new?', null, 'h2');
-
- _g('There\'s plenty of new goodness in Mageia 5, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array($releasenotes), 'p');
-
- _g('There is one feature worth mentioning here. It took a lot of effort and time but it was worth it. Mageia 5 <a href="%s">supports UEFI</a>, which means it’s now even easier to install it on recent hardware.',
- array(_r('https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/')), 'p');
-
- _g('To help users configure and use Mageia, and to provide some information about the community and the project, there\'s a program called <a href="%s">MageiaWelcome</a>. It starts automatically when a session opens for the first time in any of the graphical environments.',array(_r('https://wiki.mageia.org/en/Feature:MageiaWelcome')), 'p');
- ?>
- </div>
- </div>
-
- <div class="yui-u" style="width:44.5%">
- <div id="banner" style="text-align:center; display: block; padding: 2em 0em 4em;">
- <!-- start Basic Jquery Slider -->
- <ul class="bjqs">
- <li><img src="/g/5/Cinnamon.png" title="Cinnamon"></li>
- <li><img src="/g/5/Enlightenment.png" title="Enlightenment"></li>
- <li><img src="/g/5/gnome.png" title="Gnome"></li>
- <li><img src="/g/5/kde.png" title="KDE"></li>
- <li><img src="/g/5/Lxde.png" title="Lxde"></li>
- <li><img src="/g/5/Lxqt.png" title="Lxqt"></li>
- <li><img src="/g/5/Mate.png" title="Mate"></li>
- <li><img src="/g/5/Xfce.png" title="Xfce"></li>
- <li><img src="/g/5/MageiaControlCenter.png" title="<?php _g('Mageia Control Center');?>"></li>
- <li><img src="/g/5/MageiaWelcome1.png" title="Mageia Welcome 1"></li>
- <li><img src="/g/5/MageiaWelcome2.png" title="Mageia Welcome 2"></li>
- <li><img src="/g/5/MageiaWelcome3.png" title="Mageia Welcome 3"></li>
- <li><img src="/g/5/MageiaWelcome4.png" title="Mageia Welcome 4"></li>
- <li><img src="/g/5/MageiaWelcome5.png" title="Mageia Welcome 5"></li>
- </ul>
-
- </div>
- <div class="para" style="padding: 1em 2em 1em 0em">
-
- <?php
- _g('Mageia in context', null, 'h2');
-
- _g('Mageia is both a Community and a Linux Distribution, with Mageia 5 being our fifth release.', null, 'p');
-
- _g('Mageia 5 is supported by the <a href="%s">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors.',array('../about/'), 'p');
-
- _g('Mageia 5 has been made by more than <a href="%s">100 people from all around the world</a>.',array('//people.mageia.org/g/'), 'p');
-
- _g('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.', null, 'p');
-
- _g('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>.', array('../contribute'), 'p');
- ?>
- </div>
-
-</div>
-</div>
-
- </body>
-</html>
diff --git a/en/5_preview/nav.php b/en/5_preview/nav.php
deleted file mode 100644
index 37199fe1f..000000000
--- a/en/5_preview/nav.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-$releasenotes = _r('https://wiki.mageia.org/en/Mageia_5_Release_Notes');
-$errata = _r('https://wiki.mageia.org/en/Mageia_5_Errata');
-$upgradeguide = _r('https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4');
-
-$nav = array(
- "./" => 'Mageia&nbsp;5',
-// "/{$locale}/downloads/" => _r('Download'),
- "./download_index.php" => _r('Download'),
- $releasenotes => _r('Release notes'),
- $errata => _r('Errata'),
-// "//bugs.mageia.org/" => _r('Bugs Reports'),
-);
-
-$sru = trim($_SERVER['REQUEST_URI']);
-
-$pnav = array();
-foreach ($nav as $k => $v) {
- $pnav[] = sprintf('<li><a href="%s"%s>%s</a></li>',
- $k,
- $k == $sru ? ' class="sel"' : null,
- $v);
-}
-$pnav = implode($pnav);
-
-echo <<<S
-<ul>{$pnav}</ul>
-S;
diff --git a/eo/5_preview b/eo/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/eo/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/es/5_preview b/es/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/es/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/et/5_preview b/et/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/et/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/eu/5_preview b/eu/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/eu/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/fi/5_preview b/fi/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/fi/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/fr/5_preview b/fr/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/fr/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/hr/5_preview b/hr/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/hr/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/hu/5_preview b/hu/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/hu/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/id/5_preview b/id/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/id/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/it/5_preview b/it/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/it/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/ja/5_preview b/ja/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/ja/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/langs/ast/5.po b/langs/ast/5.po
index 11ed9bd71..8843fd789 100644
--- a/langs/ast/5.po
+++ b/langs/ast/5.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/mageia/language/ast/)\n"
@@ -380,7 +380,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/ca/5.po b/langs/ca/5.po
index 63ac7c0bc..b6c90f595 100644
--- a/langs/ca/5.po
+++ b/langs/ca/5.po
@@ -7,16 +7,18 @@
# Domain: 5
#
# include translation strings from:
-# en/5/download_index.php
-# en/5/nav.php
+# en/5_preview/download_index.php
+# en/5_preview/nav.php
+# en/5_preview/index.php
#
# Translators:
+# Davidmp <medipas@gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
-"PO-Revision-Date: 2015-06-02 17:40+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
+"PO-Revision-Date: 2015-06-18 21:14+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/mageia/language/ca/)\n"
"Language: ca\n"
@@ -71,7 +73,7 @@ msgstr ""
#: "/web/en/5/download_index.php +158"
msgid "Unetbootin is not supported."
-msgstr ""
+msgstr "Unetbootin no s'admet."
#: "/web/en/5/download_index.php +160"
msgid "If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a href=\"%s\">wiki</a>."
@@ -378,8 +380,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -407,16 +409,15 @@ msgstr "vegeu la <a href=\"%s\" hreflang=\"en\">guia d'actualització</a>"
#: "/web/en/5/download_index.php +507"
msgid "Looking for %s ?"
-msgstr ""
+msgstr "Esteu buscant "
#: "/web/en/5/download_index.php +509"
msgid "It is <a href=\"%s\">here</a>."
msgstr ""
#: "/web/en/5/download_index.php +511"
-#, fuzzy
msgid "But please remember that it will soon <a href=\"%s\">reach EOL</a>."
-msgstr "Però recordeu que ja <a href=\"%s\">ha arribat a l'EOL</a>."
+msgstr ""
#: "/web/en/5/download_index.php +512"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
@@ -499,14 +500,12 @@ msgid "There is one feature worth mentioning here. It took a lot of effort and t
msgstr ""
#: "/web/en/5/index.php +54"
-#, fuzzy
msgid "https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/"
-msgstr "http://blog.mageia.org/en/2014/06/20/pulling-mageia-4-1-out-of-the-hat/"
+msgstr ""
#: "/web/en/5/index.php +56"
-#, fuzzy
msgid "To help users configure and use Mageia, and to provide some information about the community and the project, there's a program called <a href=\"%s\">MageiaWelcome</a>. It starts automatically when a session opens for the first time in any of the graphical environments."
-msgstr "Per a ajudar els usuaris a configurar i fer servir Mageia, i per a donar alguna informació sobre la comunitat i el projecte, hem afegit el nou <a href=\"%s\">MageiaWelcome</a>. Arrenca automàticament quan s'obre la sessió per primera vegada en qualsevol dels entorns gràfics."
+msgstr ""
#: "/web/en/5/index.php +56"
msgid "https://wiki.mageia.org/en/Feature:MageiaWelcome"
@@ -521,9 +520,8 @@ msgid "Mageia in context"
msgstr "Mageia en context"
#: "/web/en/5/index.php +87"
-#, fuzzy
msgid "Mageia is both a Community and a Linux Distribution, with Mageia 5 being our fifth release."
-msgstr "Mageia és tant una comunitat com una distribució de Linux, que presenta amb Mageia 5 la quarta versió."
+msgstr ""
#: "/web/en/5/index.php +89"
msgid "Mageia 5 is supported by the <a href=\"%s\">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors."
@@ -541,116 +539,6 @@ msgstr "La nostra feina s'afegeix a l'excel·lent tasca duta a terme per la comu
msgid "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>."
msgstr "Els nous contribuïdors en qualsevol dels molts equips diferents que conformen la comunitat Mageia són molt benvinguts, i us encoratgem a <a href=\"%s\">unir-vos</a>."
-#~ msgid "Be careful! This is an alpha, unstable release."
-#~ msgstr "Aneu amb compte! Aquesta és una versió alfa, inestable."
-
-#~ msgid "Be careful! This is a beta, unstable release."
-#~ msgstr "Aneu amb compte! Aquesta és una versió beta, inestable."
-
-#~ msgid "It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>"
-#~ msgstr "Només és per a ús de desenvolupament. <strong>NO HO FEU SERVIR PER A LA PRODUCTIVITAT O PER FER-NE UN COMENTARI OFICIAL.</strong>"
-
-#~ msgid "This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s."
-#~ msgstr "Això és un Release Candidate. Un programari com a candidat de versió és programari que ha superat les proves de la fase beta i ja hauria de ser un producte a punt per ser alliberat, adient per a usuaris avançats i revisadors. Tanmateix, seria millor que els usuaris novells i els usuaris d'aplicacions crítiques esperessin la versió final, prevista al %s."
-
-#~ msgid "May 2015"
-#~ msgstr "maig de 2015"
-
-#~ msgid "32bit"
-#~ msgstr "32bit"
-
-#~ msgid "64bit"
-#~ msgstr "64bit"
-
-#~ msgid "dualarch"
-#~ msgstr "dualarch"
-
-#~ msgid "Download Mageia 5 DVD, CD, LiveCD, network install ISO images."
-#~ msgstr "Descarrega les imatges ISO del DVD, el CD, el LiveCD, la instal·lació per xarxa."
-
-#~ msgid "mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
-#~ msgstr "mageia, mageia 4, linux, lliure, baixada, iso, torrent. vm, http, ftp, rsync, bittorrent"
-
-#~ msgid "If you want to put the ISO on USB key, <span class=\"warn\">please DO NOT use Unetbootin</span>. Have a look <a href=\"%s\">here</a> for the alternative."
-#~ msgstr "Si voleu posar la imatge ISO en una clau USB, <span class=\"warn\">NO feu servir Unetbootin</span>. Mireu l'alternativa <a href=\"%s\">aquí</a>."
-
-#~ msgid "Mageia 5.1 is a <a href=\"%s\">maintenance</a> release for Mageia 5 with the current packages from update medias. It also has a fix for a syslinux bug which prevented some people installing from a burned cd/dvd."
-#~ msgstr "Mageia 5.1 és una versió de <a href=\"%s\">manteniment</a> per a Mageia 5 amb els paquets actuals provinents dels suports d'actualització. També conté una solució per a l'error de syslinux que feia que algunes persones no poguessin fer la instal·lació des d'un dc/dvd enregistrat."
-
-#~ msgid "size"
-#~ msgstr "mida"
-
-#~ msgid "Notes:"
-#~ msgstr "Notes:"
-
-#~ msgid "https://wiki.mageia.org/en/Available_locales"
-#~ msgstr "https://wiki.mageia.org/en/Available_locales"
-
-#~ msgid "These DVD and CD ISOs contains Free Software and some proprietary drivers."
-#~ msgstr "Aquestes ISO de DVD i CD contenen programari lliure i alguns controladors de propietat."
-
-#~ msgid "The dualarch DVD contains only a minimal list of packages."
-#~ msgstr "Els DVD dualarch només contenen una llista mínima de paquets."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "NO feu servir aquests LiveCD i LiveDVD per a actualitzar-vos des de Mageia3!"
-
-#~ msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
-#~ msgstr "Feu servir els DVD i CD de sobre i mireu la <a href=\"%s\" hreflang=\"en\">guia d'actualització</a>."
-
-#~ msgid "All languages"
-#~ msgstr "Totes les llengües"
-
-#~ msgid "English only"
-#~ msgstr "Només anglès"
-
-#~ msgid "needed for some disc controllers, some network cards, etc."
-#~ msgstr "cal per a alguns controladors de disc, algunes targetes de xarxa, etc."
-
-#~ msgid "February 1<sup>st</sup> 2014"
-#~ msgstr "1 febrer 2014"
-
-#~ msgid "<a href=\"%s\">Release notes</a>"
-#~ msgstr "<a href=\"%s\">Notes de la versió</a>"
-
-#~ msgid "<a href=\"%s\">Errata</a>"
-#~ msgstr "<a href=\"%s\">Fe d'errates</a>"
-
-#~ msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
-#~ msgstr "<a href=\"%s\">Poseu l'ISO en una clau de memòria USB</a>"
-
-#~ msgid "Upgrading<br>from Mageia 3?"
-#~ msgstr "Us actualitzeu<br>des de Mageia 3?"
-
-#~ msgid "Looking for Mageia 3?"
-#~ msgstr "Cerqueu Mageia 3?"
-
-#~ msgid "It is <a href=\"%s\">here now</a>."
-#~ msgstr "Ara és <a href=\"%s\">aquí</a>."
-
-#~ msgid "https://blog.mageia.org/en/2014/11/26/lets-say-goodbye-to-mageia-3/"
-#~ msgstr "https://blog.mageia.org/en/2014/11/26/lets-say-goodbye-to-mageia-3/"
-
-#~ msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on Mageia 5</a>."
-#~ msgstr "Ens podeu <a href=\"%s\">ajudar</a> amb <a href=\"%s\">Mageia 5</a>."
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Release_Notes"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Release_Notes"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Errata"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Errata"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3"
-
-#~ msgid "Mageia&nbsp;4"
-#~ msgstr "Mageia&nbsp;4"
-
-#~ msgid "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>."
-#~ msgstr "Hem afegit dos nous entorns d'escriptori: Mate i Cinnamon, ambdós disponibles a l'instal·lador clàssic en DVD/ISO. Per a fer-la més amigable, hem redissenyat la <a href=\"%s\">tria d'entorn d'escriptori</a>."
-
-#~ msgid "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."
-#~ msgstr "S'ha fet molta feina en el programari de Mageia. Molts paquets s'han portat de Gtk2 a Gtk3, per a fer servir components més moderns. També hem portat totes les eines que requereixen privilegis, des de l'antic usermode a polkit."
-
-#~ msgid "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."
-#~ msgstr "TexLive requeria al voltant d'1GB per a la instal·lació - ara està separat en 3 paquets que ocuparan molt menys espai."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
diff --git a/langs/cs/5.po b/langs/cs/5.po
index 251225133..4ebdbd0cf 100644
--- a/langs/cs/5.po
+++ b/langs/cs/5.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/cs/)\n"
@@ -379,8 +379,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Dostat ISO na zařízení USB</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -541,6 +541,10 @@ msgstr "Naše práce se přidává k výborné práci širšího společenství
msgid "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>."
msgstr "Vítáme nové přispěvatele do kterékoli z mnoha skupin, kteří jdou a dělají z Mageii společenství, a povzbuzujeme vás v tom, abyste <a href=\"%s\">se k nám přidali</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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."
diff --git a/langs/de/5.po b/langs/de/5.po
index da812d3ad..d2046638e 100644
--- a/langs/de/5.po
+++ b/langs/de/5.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-17 21:58+0000\n"
"Last-Translator: psyca\n"
"Language-Team: German (http://www.transifex.com/projects/p/mageia/language/de/)\n"
@@ -384,7 +384,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Die ISO auf einen USB-Stick übertragen</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr "https://wiki.mageia.org/de/Installations_Medien#Eine_Mageia_ISO_auf_ein_USB_Laufwerk_.C3.BCbertragen"
#: "/web/en/5/download_index.php +495"
@@ -543,5 +543,9 @@ msgstr "Unsere Mageia-spezifischen Entwicklungen bauen auf der exzellenten Arbei
msgid "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>."
msgstr "Das Mageia-Projekt wird von vielen verschiedenen Teams getragen, die neue Mitstreiter jederzeit willkommen hei&szlig;en - <a href=\"%s\">Machen Sie mit!</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/de/Installations_Medien#Eine_Mageia_ISO_auf_ein_USB_Laufwerk_.C3.BCbertragen"
+
#~ 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 "Diese ISO-Abbilder &auml;ndern sich laufend. Da Sie stets den aktuellen Stand von Cauldron beinhalten kann es sein, dass sie nicht funktionieren. Verwenden Sie in diesem Fall das ISO-Abbild oberhalb."
diff --git a/langs/el/5.po b/langs/el/5.po
index 43caf3ed7..03c2ddca2 100644
--- a/langs/el/5.po
+++ b/langs/el/5.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-18 07:05+0200\n"
"Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
"Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -381,8 +381,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Βάλτε το ISO σε ένα USB stick</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -540,6 +540,10 @@ msgstr "Η εργασία μας προστίθεται στην εκλεκτή
msgid "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>."
msgstr "Καλωσορίζουμε νέους συνεισφέροντες σε κάθε ομάδα που αποτελούν την κοινότητα της Mageia, και σας ενθαρρύνουμε να <a href=\"%s\">λάβετε μέρος</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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, μπορεί να μην δουλεύουν. Αν συμβαίνει αυτό, χρησιμοποιήστε την παραπάνω."
diff --git a/langs/en-gb/5.po b/langs/en-gb/5.po
index 33d0710a7..c118e17a0 100644
--- a/langs/en-gb/5.po
+++ b/langs/en-gb/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/mageia/language/en_GB/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/en/5.pot b/langs/en/5.pot
index e3d487909..cd0fb209c 100644
--- a/langs/en/5.pot
+++ b/langs/en/5.pot
@@ -7,15 +7,15 @@
# Domain: 5
#
# include translation strings from:
-# en/5_preview/download_index.php
-# en/5_preview/nav.php
-# en/5_preview/index.php
+# en/5/download_index.php
+# en/5/nav.php
+# en/5/index.php
#
msgid ""
msgstr ""
"Project-Id-Version: 5\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+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"
@@ -377,7 +377,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/eo/5.po b/langs/eo/5.po
index f78c450af..90ce07492 100644
--- a/langs/eo/5.po
+++ b/langs/eo/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:22+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/language/eo/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/es/5.po b/langs/es/5.po
index 1c42bc1e0..447f19af8 100644
--- a/langs/es/5.po
+++ b/langs/es/5.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-18 10:10+0100\n"
"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/es/)\n"
@@ -384,8 +384,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Volcar ISO en memoria USB</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -543,5 +543,9 @@ msgstr "Nuestro trabajo se añade a la excelente tarea de la amplia comunidad de
msgid "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>."
msgstr "Damos la bienvenida a nuevos contribuidores a los muy diversos equipos que forman parte de la Comunidad Mageia y les animamos a <a href=\"%s\">unirse a nosotros</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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 imágenes ISO cambian frecuentemente, y ya que proporcionan el estado real de Cauldron, puede que no funcionen. Si es el caso, use alguna de la anteriores."
diff --git a/langs/et/5.po b/langs/et/5.po
index e2c316064..0d1a6be62 100644
--- a/langs/et/5.po
+++ b/langs/et/5.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-19 07:42+0300\n"
"Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
"Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -49,34 +49,19 @@ msgstr "Allalaadimine -"
#: "/web/en/5/download_index.php +68"
msgid "Download %s DVD, CD, LiveCD, network install ISO images."
-msgstr ""
-"Mageia 5 DVD, CD, LiveCD ja võrgupaigalduse ISO-tõmmiste allalaadimine."
+msgstr "Mageia 5 DVD, CD, LiveCD ja võrgupaigalduse ISO-tõmmiste allalaadimine."
#: "/web/en/5/download_index.php +69"
-msgid ""
-"mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, "
-"bittorrent"
-msgstr ""
-"mageia, %s, linux, vaba, tasuta, allalaadimine, iso, torrent, http, ftp, "
-"rsync, bittorrent"
+msgid "mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
+msgstr "mageia, %s, linux, vaba, tasuta, allalaadimine, iso, torrent, http, ftp, rsync, bittorrent"
#: "/web/en/5/download_index.php +149"
-msgid ""
-"It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> "
-"it to have better render. At the <a href=\"%s\">end</a> of this page there "
-"will be download link for you. But what is written between is important."
-msgstr ""
-"Tundub, et JavaScript ei ole lubatud. Palun <a href=\"%s\">lubage</a> see "
-"parema renderdamise huvides. Lehekülje <a href=\"%s\">lõpus</a> on teile "
-"mõeldud allalaadimislink. Kuid oluline on ka see, mis on enne seda kirjutatud."
+msgid "It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> it to have better render. At the <a href=\"%s\">end</a> of this page there will be download link for you. But what is written between is important."
+msgstr "Tundub, et JavaScript ei ole lubatud. Palun <a href=\"%s\">lubage</a> see parema renderdamise huvides. Lehekülje <a href=\"%s\">lõpus</a> on teile mõeldud allalaadimislink. Kuid oluline on ka see, mis on enne seda kirjutatud."
#: "/web/en/5/download_index.php +155"
-msgid ""
-"Mageia is provided as ISO image files that have to be written to blank <a "
-"href=\"%s\">CD or DVD discs</a>."
-msgstr ""
-"Mageiat pakutakse ISO-tõmmistena, mis tuleb kirjutada tühjale <a href=\"%s\">"
-"CD- või DVD-plaadile</a>."
+msgid "Mageia is provided as ISO image files that have to be written to blank <a href=\"%s\">CD or DVD discs</a>."
+msgstr "Mageiat pakutakse ISO-tõmmistena, mis tuleb kirjutada tühjale <a href=\"%s\">CD- või DVD-plaadile</a>."
#: "/web/en/5/download_index.php +155"
msgid "https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
@@ -91,12 +76,8 @@ msgid "Unetbootin is not supported."
msgstr "Unetbootin ei ole toetatud."
#: "/web/en/5/download_index.php +160"
-msgid ""
-"If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a "
-"href=\"%s\">wiki</a>."
-msgstr ""
-"Kui teil on <a href=\"%s\">UEFI</a>, siis kirjeldatakse protseduuri lähemalt "
-"<a href=\"%s\">meie wikis</a>."
+msgid "If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a href=\"%s\">wiki</a>."
+msgstr "Kui teil on <a href=\"%s\">UEFI</a>, siis kirjeldatakse protseduuri lähemalt <a href=\"%s\">meie wikis</a>."
#: "/web/en/5/download_index.php +160"
msgid "http://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface"
@@ -111,65 +92,36 @@ msgid "Dump Mageia ISO on a USB flash drive"
msgstr "Mageia ISO kirjutamine USB-pulgale"
#: "/web/en/5/download_index.php +165"
-msgid ""
-"\"Dumping\" an image onto a flash device destroys any prior file-system in "
-"the partition; access to any data not destroyed will be lost, and partition "
-"capacity will be reduced to the image size. In other words, all prior data on "
-"the device is at risk."
-msgstr ""
-"Tõmmise kirjutamine USB-pulgale hävitab kõik varasemad failisüsteemid "
-"partitsioonis, kaob võimalus kasutada kõiki hävitamata jäänud andmeid ning "
-"partitsiooni suurus väheneb tõmmise suurusele. Teisisõnu, kõik pulgal varem "
-"olnud andmed on ohus."
+msgid "\"Dumping\" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk."
+msgstr "Tõmmise kirjutamine USB-pulgale hävitab kõik varasemad failisüsteemid partitsioonis, kaob võimalus kasutada kõiki hävitamata jäänud andmeid ning partitsiooni suurus väheneb tõmmise suurusele. Teisisõnu, kõik pulgal varem olnud andmed on ohus."
#: "/web/en/5/download_index.php +166"
-msgid ""
-"Unetbootin should not be used to copy the iso image to a USB drive (see "
-"below)."
-msgstr ""
-"ISO-tõmmise kirjutamiseks USB-pulgale ei tohiks kasutada Unetbootini (vt "
-"allpool)."
+msgid "Unetbootin should not be used to copy the iso image to a USB drive (see below)."
+msgstr "ISO-tõmmise kirjutamiseks USB-pulgale ei tohiks kasutada Unetbootini (vt allpool)."
#: "/web/en/5/download_index.php +167"
-msgid ""
-"To dump a Mageia installation ISO on a USB stick, you may try one of several "
-"tools:"
-msgstr ""
-"Mageia paigaldus-ISO kirjutamiseks USB-pulgale võib kasutada mitut tööriista:"
+msgid "To dump a Mageia installation ISO on a USB stick, you may try one of several tools:"
+msgstr "Mageia paigaldus-ISO kirjutamiseks USB-pulgale võib kasutada mitut tööriista:"
#: "/web/en/5/download_index.php +169"
msgid "For Linux, IsoDumper, available inside repo. Or any tools based on dd."
-msgstr ""
-"Linuxi korral IsoDumper, mille leiab hoidlast, või mõni muu tööriist, mille "
-"aluseks on dd."
+msgstr "Linuxi korral IsoDumper, mille leiab hoidlast, või mõni muu tööriist, mille aluseks on dd."
#: "/web/en/5/download_index.php +171"
msgid "For windows use <a href=\"%s\">usbdumper.</a>"
msgstr "Windowsi kasutajatele sobib <a href=\"%s\">usbdumper</a>. "
#: "/web/en/5/download_index.php +172"
-msgid ""
-"If it show \"writing error or access denied\" try the fallowing method: run "
-"the console (cmd), then type \"diskpart\", then \"list disk\", then select "
-"your disk with \"select disk\", and type \"clean\" (it will erase the key)."
-msgstr ""
-"Kui näete teadet \"writing error or access denied\", proovige järgmist viisi: "
-"käivitage konsool (cmd), kirjutage \"diskpart\", seejärel \"list disk\", siis "
-"valite soovitud ketas käsuga \"select disk\" ja kirjutage \"clean\" (see "
-"tühjendab pulga)."
+msgid "If it show \"writing error or access denied\" try the fallowing method: run the console (cmd), then type \"diskpart\", then \"list disk\", then select your disk with \"select disk\", and type \"clean\" (it will erase the key)."
+msgstr "Kui näete teadet \"writing error or access denied\", proovige järgmist viisi: käivitage konsool (cmd), kirjutage \"diskpart\", seejärel \"list disk\", siis valite soovitud ketas käsuga \"select disk\" ja kirjutage \"clean\" (see tühjendab pulga)."
#: "/web/en/5/download_index.php +182"
msgid "Classical Installation Flavours"
msgstr "Klassikalised paigaldusandmekandjad"
#: "/web/en/5/download_index.php +184"
-msgid ""
-"The Classical ISO is the traditional way to install Mageia directly. Take a "
-"look at the complete <a href=\"%s\">documentation</a> for this installer."
-msgstr ""
-"Klassikaline paigaldus-ISO on traditsioonilisem viis paigaldada Mageia "
-"otsekohe. Eelnevalt võite tutvuda ka paigaldusprogrammi põhjaliku <a href=\"%"
-"s\">käsiraamatuga</a>."
+msgid "The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href=\"%s\">documentation</a> for this installer."
+msgstr "Klassikaline paigaldus-ISO on traditsioonilisem viis paigaldada Mageia otsekohe. Eelnevalt võite tutvuda ka paigaldusprogrammi põhjaliku <a href=\"%s\">käsiraamatuga</a>."
#: "/web/en/5/download_index.php +186"
msgid "Up to 167 locales are supported:"
@@ -185,75 +137,46 @@ msgstr "Siin näeb täielikku nimekirja"
#: "/web/en/5/download_index.php +192"
msgid "These ISOs contains Free Software and some proprietary drivers."
-msgstr ""
-"Need DVD ja CD ISO-d sisaldavad vaba tarkvara ja mõningaid omanduslikke "
-"draivereid."
+msgstr "Need DVD ja CD ISO-d sisaldavad vaba tarkvara ja mõningaid omanduslikke draivereid."
#: "/web/en/5/download_index.php +193"
msgid "You will be asked of which kind of Software you want to install."
msgstr "Teie käest päritakse, millist laadi tarkvara soovite paigaldada."
#: "/web/en/5/download_index.php +194"
-msgid ""
-"The installer includes the capability of adding the online Mageia "
-"repositories during the installation, which means you can install even more "
-"packages than those available on the ISO."
-msgstr ""
-"Paigaldusprogramm suudab paigaldamise ajal lisada Mageia võrguhoidlad, mis "
-"tähendab, et saate paigaldada veel rohkem tarkvara, kui seda saab pakkuda ISO."
+msgid "The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO."
+msgstr "Paigaldusprogramm suudab paigaldamise ajal lisada Mageia võrguhoidlad, mis tähendab, et saate paigaldada veel rohkem tarkvara, kui seda saab pakkuda ISO."
#: "/web/en/5/download_index.php +197"
-msgid ""
-"For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it's about "
-"%sGB."
-msgstr ""
-"32- ja 64-bitise puhul on ISO suurus umbes %s GB. Mõlema arhitektuuriga ISO "
-"korral on see umbes %s GB."
+msgid "For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it's about %sGB."
+msgstr "32- ja 64-bitise puhul on ISO suurus umbes %s GB. Mõlema arhitektuuriga ISO korral on see umbes %s GB."
#: "/web/en/5/download_index.php +205"
msgid "LiveCDs and LiveDVDs"
msgstr "LiveCD-d ja LiveDVD-d"
#: "/web/en/5/download_index.php +207"
-msgid ""
-"Live ISO's let you try %s without installation. You can run Mageia directly "
-"from a CD, DVD or USB device, and try it using one of the graphical user "
-"interfaces such as GNOME or KDE."
-msgstr ""
-"LiveISO-d võimaldavad proovida %s ilma paigaldamata. Mageia saab käivitada "
-"otse CD, DVD või USB-pulga pealt ning järele proovida meeldiva graafilise "
-"töökeskkonna, näiteks GNOME või KDE."
+msgid "Live ISO's let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE."
+msgstr "LiveISO-d võimaldavad proovida %s ilma paigaldamata. Mageia saab käivitada otse CD, DVD või USB-pulga pealt ning järele proovida meeldiva graafilise töökeskkonna, näiteks GNOME või KDE."
#: "/web/en/5/download_index.php +208"
-msgid ""
-"If you are happy with the Mageia experience, you can then install it onto "
-"your hard drive from the Live media."
-msgstr ""
-"Kui Mageia jätab teile hea mulje, võite selle otse Live-andmekandjalt "
-"kõvakettale paigaldada."
+msgid "If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media."
+msgstr "Kui Mageia jätab teile hea mulje, võite selle otse Live-andmekandjalt kõvakettale paigaldada."
#: "/web/en/5/download_index.php +210"
msgid "Use LiveCDs and LiveDVDs for fresh new installs ONLY."
-msgstr ""
-"LiveCD-sid ja LiveDVD-sid tuleks kasutada AINULT värske paigalduse jaoks."
+msgstr "LiveCD-sid ja LiveDVD-sid tuleks kasutada AINULT värske paigalduse jaoks."
#: "/web/en/5/download_index.php +211"
-msgid ""
-"DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia release!"
-msgstr ""
-"ÄRGE kasutage LiveCD-sid või LiveDVD-sid uuendamiseks varasema Mageia pealt!"
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia release!"
+msgstr "ÄRGE kasutage LiveCD-sid või LiveDVD-sid uuendamiseks varasema Mageia pealt!"
#: "/web/en/5/download_index.php +212"
-msgid ""
-"Use a classical installation 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>."
+msgid "Use a classical installation 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 +215"
-msgid ""
-"For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it's about %sMB."
+msgid "For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it's about %sMB."
msgstr "LiveDVD-de ISO suurus on umbes %s GB. LiveCD-de suurus on umbes %s MB."
#: "/web/en/5/download_index.php +220"
@@ -261,16 +184,11 @@ msgid "Wired Network-based Installation CD"
msgstr "Juhtmega võrgu põhise paigalduse CD"
#: "/web/en/5/download_index.php +221"
-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."
+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 +222"
-msgid ""
-"Have a look in the <a href=\"%s\">wiki</a> to get a list of possibilities."
+msgid "Have a look in the <a href=\"%s\">wiki</a> to get a list of possibilities."
msgstr "Kõiki võimalusi tutvustab <a href=\"%s\">wiki</a>."
#: "/web/en/5/download_index.php +222"
@@ -299,8 +217,7 @@ msgstr "Mõlema arhitektuuriga versioon pole veel saadaval."
#: "/web/en/5/download_index.php +238"
msgid "LiveCDs and LiveDVDs are not yet available."
-msgstr ""
-"LiveCD-sid ja LiveDVD-sid tuleks kasutada AINULT värske paigalduse jaoks."
+msgstr "LiveCD-sid ja LiveDVD-sid tuleks kasutada AINULT värske paigalduse jaoks."
#: "/web/en/5/download_index.php +239"
msgid "Classical Installation flavours is not yet available."
@@ -323,11 +240,8 @@ msgid "LiveCDs contain only English and is available only in 32bit."
msgstr "LiveCD-d sisaldavad ainult inglise keelt ja on ainult 32-bitised."
#: "/web/en/5/download_index.php +256"
-msgid ""
-"Do not use unless you really DON'T NEED any other language than English."
-msgstr ""
-"Ärge seda kasutage, kui te just tõesti EI VAJA ühtegi teist keelt peale "
-"inglise keele."
+msgid "Do not use unless you really DON'T NEED any other language than English."
+msgstr "Ärge seda kasutage, kui te just tõesti EI VAJA ühtegi teist keelt peale inglise keele."
#: "/web/en/5/download_index.php +263"
msgid "English only (CD)"
@@ -362,9 +276,7 @@ msgid "Network installer + nonfree firmware CD"
msgstr "Võrgupaigaldus + mittevaba püsivara CD"
#: "/web/en/5/download_index.php +296"
-msgid ""
-"Contain nonfree drivers needed for some disc controllers, some network cards, "
-"etc."
+msgid "Contain nonfree drivers needed for some disc controllers, some network cards, etc."
msgstr "vajalik mõningate kettakontrollerite, võrgukaartide jms puhul"
#: "/web/en/5/download_index.php +300"
@@ -380,63 +292,36 @@ msgid "Supported Architecture"
msgstr "Toetatud arhitektuur"
#: "/web/en/5/download_index.php +310"
-msgid ""
-"Most new computers support x86-64 (also known as AMD64 and Intel64), but some "
-"laptop processors and netbook processors do not support it."
-msgstr ""
-"Enamik uuemaid arvuteid toetab x86-64 (tuntud ka kui AMD64 või Intel64), kuid "
-"mõned sülearvutite ja väikearvutite protsessorid ei pruugi seda toetada."
+msgid "Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it."
+msgstr "Enamik uuemaid arvuteid toetab x86-64 (tuntud ka kui AMD64 või Intel64), kuid mõned sülearvutite ja väikearvutite protsessorid ei pruugi seda toetada."
#: "/web/en/5/download_index.php +314"
-msgid ""
-"This version runs on all PCs including those that support 64 Bit. If you have "
-"more than 3 GB of RAM you should prefer the 64 Bit version though."
-msgstr ""
-"See versioon töötab kõigis arvutites, sealhulgas neis, mis toetavad 64-bitist "
-"tarkvara. Kui teil on üle 3 GB RAM-i, tasuks siiski eelistada 64-bitist "
-"versiooni."
+msgid "This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though."
+msgstr "See versioon töötab kõigis arvutites, sealhulgas neis, mis toetavad 64-bitist tarkvara. Kui teil on üle 3 GB RAM-i, tasuks siiski eelistada 64-bitist versiooni."
#: "/web/en/5/download_index.php +320"
-msgid ""
-"The dualarch DVD contains only a minimal list of packages and a lite desktop, "
-"%s, to fit on %sGB."
-msgstr ""
-"Nii 32- kui 64-bitisele arhitektuurile mõeldud (dualarch) DVD sisaldab ainult "
-"minimaalsel hulgal vajalikku tarkvara ja lihtsa töökeskkonna %s, et mitte "
-"ületada %s GB piiri."
+msgid "The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB."
+msgstr "Nii 32- kui 64-bitisele arhitektuurile mõeldud (dualarch) DVD sisaldab ainult minimaalsel hulgal vajalikku tarkvara ja lihtsa töökeskkonna %s, et mitte ületada %s GB piiri."
#: "/web/en/5/download_index.php +322"
-msgid ""
-"Dual iso size is intended to be small for advanced users, only network "
-"proprietary drivers are included."
-msgstr ""
-"Kahe arhitektuuriga ISO on väike ja mõeldud kogenud kasutajatele, kaasas on "
-"ainult omanduslikud võrgudraiverid."
+msgid "Dual iso size is intended to be small for advanced users, only network proprietary drivers are included."
+msgstr "Kahe arhitektuuriga ISO on väike ja mõeldud kogenud kasutajatele, kaasas on ainult omanduslikud võrgudraiverid."
#: "/web/en/5/download_index.php +323"
msgid "You will have to add remote nonfree media if you need some more."
-msgstr ""
-"Kui vajate midagi rohkem, tuleb kasutusele võtta mittevabad võrguandmekandjad."
+msgstr "Kui vajate midagi rohkem, tuleb kasutusele võtta mittevabad võrguandmekandjad."
#: "/web/en/5/download_index.php +324"
msgid "Furthermore UEFI is not supported."
msgstr "Lisaks ei ole UEFI toetatud."
#: "/web/en/5/download_index.php +326"
-msgid ""
-"It can be used to install either a 32bit system or a 64bit system, the "
-"installer defaults to x86_64 when it detects a 64bit capable CPU."
-msgstr ""
-"Seda saab paigaldada nii 32- kui ka 64-bitisesse süsteemi: paigaldusprogramm "
-"valib automaatselt x86-64, kui tuvastab 64-bitise protsessori."
+msgid "It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU."
+msgstr "Seda saab paigaldada nii 32- kui ka 64-bitisesse süsteemi: paigaldusprogramm valib automaatselt x86-64, kui tuvastab 64-bitise protsessori."
#: "/web/en/5/download_index.php +327"
-msgid ""
-"This ISO is generally for advanced users and system administrator for fast "
-"deployment of Mageia."
-msgstr ""
-"See ISO on üldiselt mõeldud kogenud kasutajatele ning "
-"süsteemiadministraatoritele Mageia kiireks paigaldamiseks."
+msgid "This ISO is generally for advanced users and system administrator for fast deployment of Mageia."
+msgstr "See ISO on üldiselt mõeldud kogenud kasutajatele ning süsteemiadministraatoritele Mageia kiireks paigaldamiseks."
#: "/web/en/5/download_index.php +341"
msgid "Download Method"
@@ -455,13 +340,8 @@ msgid "BitTorrent"
msgstr "BitTorrent"
#: "/web/en/5/download_index.php +351"
-msgid ""
-"We recommend you to use <a href=%s>BitTorrent</a> for downloading as it "
-"usually give a higher speeds and more reliable download of large files."
-msgstr ""
-"Me soovitame kasutada allalaadimiseks <a href=%s>BitTorrentit</a>, sest see "
-"tagab tavaliselt parema kiiruse ja eriti suurte failide puhul usaldusväärsema "
-"allalaadimise."
+msgid "We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files."
+msgstr "Me soovitame kasutada allalaadimiseks <a href=%s>BitTorrentit</a>, sest see tagab tavaliselt parema kiiruse ja eriti suurte failide puhul usaldusväärsema allalaadimise."
#: "/web/en/5/download_index.php +351"
msgid "http://en.wikipedia.org/wiki/BitTorrent"
@@ -485,9 +365,7 @@ msgstr "Väljalaskemärkmed"
#: "/web/en/5/download_index.php +492"
msgid "More about known issues or limitation in installation and usage"
-msgstr ""
-"Täpsemalt teadaolevatest paigaldamise ja kasutamisega seotud probleemidest "
-"või piirangutest"
+msgstr "Täpsemalt teadaolevatest paigaldamise ja kasutamisega seotud probleemidest või piirangutest"
#: "/web/en/5/download_index.php +493"
msgid "<a href=\"%s\">Which to choose</a>"
@@ -502,12 +380,9 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">ISO-tõmmis otse USB-pulgale</a>"
#: "/web/en/5/download_index.php +494"
-msgid ""
-"https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_d"
-"rive.3F"
-msgstr ""
-"https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_d"
-"rive.3F"
+#, fuzzy
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -543,8 +418,7 @@ msgstr "Selle leiab <a href=\"%s\">siit</a>."
#: "/web/en/5/download_index.php +511"
msgid "But please remember that it will soon <a href=\"%s\">reach EOL</a>."
-msgstr ""
-"Kuid palun arvestage, et selle <a href=\"%s\">eluiga saab peagi läbi</a>."
+msgstr "Kuid palun arvestage, et selle <a href=\"%s\">eluiga saab peagi läbi</a>."
#: "/web/en/5/download_index.php +512"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
@@ -556,8 +430,7 @@ msgstr "Vajate veel suuremat väljakutset?"
#: "/web/en/5/download_index.php +517"
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 %s</a>."
+msgstr "Siis võite <a href=\"%s\">aidata</a> meil <a href=\"%s\">arendada %s</a>."
#: "/web/en/5/nav.php +3"
msgid "https://wiki.mageia.org/en/Mageia_5_Release_Notes"
@@ -568,10 +441,8 @@ msgid "https://wiki.mageia.org/en/Mageia_5_Errata"
msgstr "https://wiki.mageia.org/en/Mageia_5_Errata"
#: "/web/en/5/nav.php +5"
-msgid ""
-"https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
-msgstr ""
-"https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
+msgid "https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
+msgstr "https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
#: "/web/en/5/nav.php +12"
msgid "Errata"
@@ -586,110 +457,56 @@ msgid "Mageia 5"
msgstr "Mageia 5"
#: "/web/en/5/index.php +14"
-msgid ""
-"Mageia 5 is the new, solid, stable Linux distribution from the Mageia project."
-msgstr ""
-"Mageia 5 on Mageia projekti uus töökindel stabiilne Linuxi distributsioon."
+msgid "Mageia 5 is the new, solid, stable Linux distribution from the Mageia project."
+msgstr "Mageia 5 on Mageia projekti uus töökindel stabiilne Linuxi distributsioon."
#: "/web/en/5/index.php +34"
msgid "About Mageia 5"
msgstr "Mis on Mageia 5"
#: "/web/en/5/index.php +36"
-msgid ""
-"Mageia 5 is a GNU/Linux distribution for your computer, released by the <a "
-"href=\"%s\">Mageia community</a>. It can be installed in several ways, with "
-"the Live or Classical ISOs being the most popular methods."
-msgstr ""
-"Mageia 5 on just teie arvutile mõeldud GNU/Linuxi distributsioon, mille on "
-"valmistanud <a href=\"%s\">Mageia kogukond</a>. Seda saab paigaldada mitmel "
-"moel, levinuimad viisid on Live-plaadid või klassikalised paigaldus-ISO-d."
+msgid "Mageia 5 is a GNU/Linux distribution for your computer, released by the <a href=\"%s\">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods."
+msgstr "Mageia 5 on just teie arvutile mõeldud GNU/Linuxi distributsioon, mille on valmistanud <a href=\"%s\">Mageia kogukond</a>. Seda saab paigaldada mitmel moel, levinuimad viisid on Live-plaadid või klassikalised paigaldus-ISO-d."
#: "/web/en/5/index.php +38"
msgid "Download it right away!"
msgstr "Laadige kohe alla!"
#: "/web/en/5/index.php +40"
-msgid ""
-"Live ISO's let you try Mageia without installation. Use <a href=\"%s\">these "
-"instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can "
-"run Mageia 5 directly from there, and try Mageia using one of the graphical "
-"user interfaces such as GNOME or KDE."
-msgstr ""
-"Live-plaatide ISO-d annavad võimaluse proovida Mageiat ilma seda "
-"paigaldamata. Kirjutage <a href=\"%s\">nende juhiste</a> põhjal Live-ISO "
-"CD-le, DVD-le või USB-pulgale. Siis võite Mageia otse sellelt käima panna "
-"ning kasutada mõnda graafilist töökeskkonda, näiteks GNOME või KDE."
+msgid "Live ISO's let you try Mageia without installation. Use <a href=\"%s\">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 5 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE."
+msgstr "Live-plaatide ISO-d annavad võimaluse proovida Mageiat ilma seda paigaldamata. Kirjutage <a href=\"%s\">nende juhiste</a> põhjal Live-ISO CD-le, DVD-le või USB-pulgale. Siis võite Mageia otse sellelt käima panna ning kasutada mõnda graafilist töökeskkonda, näiteks GNOME või KDE."
#: "/web/en/5/index.php +43"
-msgid ""
-"The Classical ISO is the more traditional way to install Mageia directly. "
-"Take a look at the complete <a href=\"%s\">documentation</a> for this "
-"installer."
-msgstr ""
-"Klassikaline paigaldus-ISO on traditsioonilisem viis paigaldada Mageia "
-"otsekohe. Eelnevalt võite tutvuda ka paigaldusprogrammi põhjaliku <a href=\"%"
-"s\">käsiraamatuga</a>."
+msgid "The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href=\"%s\">documentation</a> for this installer."
+msgstr "Klassikaline paigaldus-ISO on traditsioonilisem viis paigaldada Mageia otsekohe. Eelnevalt võite tutvuda ka paigaldusprogrammi põhjaliku <a href=\"%s\">käsiraamatuga</a>."
#: "/web/en/5/index.php +45"
-msgid ""
-"Mageia 5 includes several desktop managers including KDE, Gnome, XFCE, Mate, "
-"and Cinnamon."
-msgstr ""
-"Mageia 5 pakub mitmeid töökeskkondi, nende seas KDE, GNOME, XFCE, Mate ja "
-"Cinnamon."
+msgid "Mageia 5 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon."
+msgstr "Mageia 5 pakub mitmeid töökeskkondi, nende seas KDE, GNOME, XFCE, Mate ja Cinnamon."
#: "/web/en/5/index.php +47"
-msgid ""
-"There are lots of applications in the official repositories. You can have a "
-"look at the <a href=\"%s\">Mageia Application Database</a> to get a complete "
-"list of packages inside Mageia."
-msgstr ""
-"Ametlikes tarkvarahoidlates leiab rohkelt kõikvõimalikke rakendusi. Täieliku "
-"pildi saamiseks Mageia pakutavatest tarkvarapakettidest võib uurida <a "
-"href=\"%s\">Mageia rakenduste andmebaasi</a>."
+msgid "There are lots of applications in the official repositories. You can have a look at the <a href=\"%s\">Mageia Application Database</a> to get a complete list of packages inside Mageia."
+msgstr "Ametlikes tarkvarahoidlates leiab rohkelt kõikvõimalikke rakendusi. Täieliku pildi saamiseks Mageia pakutavatest tarkvarapakettidest võib uurida <a href=\"%s\">Mageia rakenduste andmebaasi</a>."
#: "/web/en/5/index.php +49"
msgid "What's new?"
msgstr "Mida on uut?"
#: "/web/en/5/index.php +51"
-msgid ""
-"There's plenty of new goodness in Mageia 5, too much to include here - see "
-"the <a hreflang=\"en\" href=\"%s\">release notes</a> for an extensive exposé."
-msgstr ""
-"eda ei jõua siin ära rääkida! Põhjaliku ülevaate annavad <a hreflang=\"en\" "
-"href=\"%s\">väljalaskemärkmed</a>."
+msgid "There's plenty of new goodness in Mageia 5, too much to include here - see the <a hreflang=\"en\" href=\"%s\">release notes</a> for an extensive exposé."
+msgstr "eda ei jõua siin ära rääkida! Põhjaliku ülevaate annavad <a hreflang=\"en\" href=\"%s\">väljalaskemärkmed</a>."
#: "/web/en/5/index.php +53"
-msgid ""
-"There is one feature worth mentioning here. It took a lot of effort and time "
-"but it was worth it. Mageia 5 <a href=\"%s\">supports UEFI</a>, which means "
-"it’s now even easier to install it on recent hardware."
-msgstr ""
-"Siiski väärib märkimist üks omadus. See nõudis palju aega ja vaeva, aga oli "
-"seda väärt. Mageia 5 <a href=\"%s\">toetab UEFI-t</a>, mis tähendab, et nüüd "
-"on seda veel hõlpsam paigaldada uuemale riistvarale."
+msgid "There is one feature worth mentioning here. It took a lot of effort and time but it was worth it. Mageia 5 <a href=\"%s\">supports UEFI</a>, which means it’s now even easier to install it on recent hardware."
+msgstr "Siiski väärib märkimist üks omadus. See nõudis palju aega ja vaeva, aga oli seda väärt. Mageia 5 <a href=\"%s\">toetab UEFI-t</a>, mis tähendab, et nüüd on seda veel hõlpsam paigaldada uuemale riistvarale."
#: "/web/en/5/index.php +54"
-msgid ""
-"https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-s"
-"upport/"
-msgstr ""
-"https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-s"
-"upport/"
+msgid "https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/"
+msgstr "https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/"
#: "/web/en/5/index.php +56"
-msgid ""
-"To help users configure and use Mageia, and to provide some information about "
-"the community and the project, there's a program called <a href=\"%s\">"
-"MageiaWelcome</a>. It starts automatically when a session opens for the first "
-"time in any of the graphical environments."
-msgstr ""
-"Aitamaks kasutajatel Mageiat seadistada ja edukalt pruukida ning mõningase "
-"teabe jagamiseks kogukonna ja projekti kohta tervikuna oleme lisanud uue "
-"tervitusakna <a href=\"%s\">MageiaWelcome</a>. See käivitub automaatselt mis "
-"tahes töökeskkonna esmakordsel käivitamisel."
+msgid "To help users configure and use Mageia, and to provide some information about the community and the project, there's a program called <a href=\"%s\">MageiaWelcome</a>. It starts automatically when a session opens for the first time in any of the graphical environments."
+msgstr "Aitamaks kasutajatel Mageiat seadistada ja edukalt pruukida ning mõningase teabe jagamiseks kogukonna ja projekti kohta tervikuna oleme lisanud uue tervitusakna <a href=\"%s\">MageiaWelcome</a>. See käivitub automaatselt mis tahes töökeskkonna esmakordsel käivitamisel."
#: "/web/en/5/index.php +56"
msgid "https://wiki.mageia.org/en/Feature:MageiaWelcome"
@@ -704,52 +521,27 @@ msgid "Mageia in context"
msgstr "Mageia kontekstis"
#: "/web/en/5/index.php +87"
-msgid ""
-"Mageia is both a Community and a Linux Distribution, with Mageia 5 being our "
-"fifth release."
-msgstr ""
-"Mageia on ühtaegu kogukonna ja Linuxi distributsioon, mis praegu on jõudnud "
-"oma viienda väljalaskeni: Mageia 5."
+msgid "Mageia is both a Community and a Linux Distribution, with Mageia 5 being our fifth release."
+msgstr "Mageia on ühtaegu kogukonna ja Linuxi distributsioon, mis praegu on jõudnud oma viienda väljalaskeni: Mageia 5."
#: "/web/en/5/index.php +89"
-msgid ""
-"Mageia 5 is supported by the <a href=\"%s\">Mageia.org nonprofit "
-"organisation</a>, which is governed by a body of recognized and elected "
-"contributors."
-msgstr ""
-"Mageia 5 toetab <a href=\"%s\">mittetulundusorganisatsioon Mageia.org</a>, "
-"mida juhivad selleks valitud tunnustatud kaastöötajad."
+msgid "Mageia 5 is supported by the <a href=\"%s\">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors."
+msgstr "Mageia 5 toetab <a href=\"%s\">mittetulundusorganisatsioon Mageia.org</a>, mida juhivad selleks valitud tunnustatud kaastöötajad."
#: "/web/en/5/index.php +91"
-msgid ""
-"Mageia 5 has been made by more than <a href=\"%s\">100 people from all around "
-"the world</a>."
-msgstr ""
-"Mageia 5 valmimise taga seisis <a href=\"%s\">üle 100 inimese kogu maailmast<"
-"/a>."
+msgid "Mageia 5 has been made by more than <a href=\"%s\">100 people from all around the world</a>."
+msgstr "Mageia 5 valmimise taga seisis <a href=\"%s\">üle 100 inimese kogu maailmast</a>."
#: "/web/en/5/index.php +93"
-msgid ""
-"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."
-msgstr ""
-"Meie töö täiendab laiema Linuxi ja vaba tarkvara kogukonna suurepärast "
-"tegevust. Me püüame pakkuda oma võimete ja oskuste piires parimat, "
-"stabiilseimat, usaldusväärseimat ja nauditavaimat kogemust ja platvormi nii "
-"tavalistele kasutajatele, arendajatele kui ka ettevõtetele."
+msgid "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."
+msgstr "Meie töö täiendab laiema Linuxi ja vaba tarkvara kogukonna suurepärast tegevust. Me püüame pakkuda oma võimete ja oskuste piires parimat, stabiilseimat, usaldusväärseimat ja nauditavaimat kogemust ja platvormi nii tavalistele kasutajatele, arendajatele kui ka ettevõtetele."
#: "/web/en/5/index.php +95"
-msgid ""
-"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>."
-msgstr ""
-"Me võtame rõõmuga vastu uusi kaastöötajaid oma arvukatesse meeskondadesse, "
-"millest Mageia kogukond lõppeks koosnebki, ja julgustame teid <a href=\"%s\">"
-"meiega ühinema</a>."
+msgid "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>."
+msgstr "Me võtame rõõmuga vastu uusi kaastöötajaid oma arvukatesse meeskondadesse, millest Mageia kogukond lõppeks koosnebki, ja julgustame teid <a href=\"%s\">meiega ühinema</a>."
+
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
#~ 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."
diff --git a/langs/eu/5.po b/langs/eu/5.po
index c85f3ec20..69f2be0bc 100644
--- a/langs/eu/5.po
+++ b/langs/eu/5.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-18 13:29+0100\n"
"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/eu/)\n"
@@ -381,8 +381,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Lortu ISOa USB flash makilean</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -540,5 +540,9 @@ msgstr "Gure lana gehitzen zaie Linux-ek oro har egindako lanari eta Software Li
msgid "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>."
msgstr "Ongietorria ematen diegu laguntzaile berriei, Mageia Erkidegoa osatuko duten talde desberdinetan izango direnak, eta gurekin <a href=\"%s\">elkartzera</a> animatzen ditugu."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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 horiek sarritan aldatzen dira eta Cauldron-en egoera erreala ematen baitute, agian ez dute funtzionatuko. Horrela bada ere, honen gainekoa erabili."
diff --git a/langs/fi/5.po b/langs/fi/5.po
index 007c1f329..feb319b2d 100644
--- a/langs/fi/5.po
+++ b/langs/fi/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/mageia/language/fi/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/fr/5.po b/langs/fr/5.po
index 0baea1f24..683995e59 100644
--- a/langs/fr/5.po
+++ b/langs/fr/5.po
@@ -2,29 +2,29 @@
# Copyright (C) 2014 - 2015 Mageia
# This file is distributed under the same license as
# the content of the corresponding web page(s).
-#
+#
# Generated by extract2gettext.php
# Domain: 5
-#
+#
# include translation strings from:
# en/5_preview/download_index.php
# en/5_preview/nav.php
# en/5_preview/index.php
-#
+#
# Translators:
# Eric Barbero <dune06@free.fr>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-19 05:04+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/fr/)\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: "/web/en/5/download_index.php +36"
@@ -52,22 +52,15 @@ msgid "Download %s DVD, CD, LiveCD, network install ISO images."
msgstr "Télécharger les images ISO %s DVD, CD, LiveCD et installation réseau."
#: "/web/en/5/download_index.php +69"
-msgid ""
-"mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, "
-"bittorrent"
+msgid "mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
msgstr "mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
#: "/web/en/5/download_index.php +149"
-msgid ""
-"It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> "
-"it to have better render. At the <a href=\"%s\">end</a> of this page there "
-"will be download link for you. But what is written between is important."
+msgid "It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> it to have better render. At the <a href=\"%s\">end</a> of this page there will be download link for you. But what is written between is important."
msgstr "Il semble que JavaScript soit désactivé. Merci de <a href=\"%s\">l'activer</a> pour obtenir un meilleur affichage. A la <a href=\"%s\">fin</a> de cette page vous trouverez un lien de téléchargement à votre attention. Mais ce qui est écrit avant est également important."
#: "/web/en/5/download_index.php +155"
-msgid ""
-"Mageia is provided as ISO image files that have to be written to blank <a "
-"href=\"%s\">CD or DVD discs</a>."
+msgid "Mageia is provided as ISO image files that have to be written to blank <a href=\"%s\">CD or DVD discs</a>."
msgstr "Mageia est fourni sous forme de fichiers images ISO, à graver sur des disques <a href=\"%s\">CD ou DVD</a> vierges."
#: "/web/en/5/download_index.php +155"
@@ -83,9 +76,7 @@ msgid "Unetbootin is not supported."
msgstr "Unetbootin n'est pas supporté."
#: "/web/en/5/download_index.php +160"
-msgid ""
-"If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a "
-"href=\"%s\">wiki</a>."
+msgid "If you have <a href=\"%s\">UEFI</a>, a procedure is available in the <a href=\"%s\">wiki</a>."
msgstr "Si vous disposez de <a href=\"%s\">UEFI</a>, une procédure est disponible dans le <a href=\"%s\">wiki</a>."
#: "/web/en/5/download_index.php +160"
@@ -101,23 +92,15 @@ msgid "Dump Mageia ISO on a USB flash drive"
msgstr "Copier l'ISO Mageia sur une clé USB."
#: "/web/en/5/download_index.php +165"
-msgid ""
-"\"Dumping\" an image onto a flash device destroys any prior file-system in "
-"the partition; access to any data not destroyed will be lost, and partition "
-"capacity will be reduced to the image size. In other words, all prior data "
-"on the device is at risk."
+msgid "\"Dumping\" an image onto a flash device destroys any prior file-system in the partition; access to any data not destroyed will be lost, and partition capacity will be reduced to the image size. In other words, all prior data on the device is at risk."
msgstr "Copier une image sur un périphérique flash détruit tout le système de fichiers présent antérieurement sur la partition. L'accès à toute donnée non détruite sera perdu, et la taille de la partition sera réduite à celle de l'image. En d'autres termes, tout donnée déjà présente sur le périphérique risque de disparaître."
#: "/web/en/5/download_index.php +166"
-msgid ""
-"Unetbootin should not be used to copy the iso image to a USB drive (see "
-"below)."
+msgid "Unetbootin should not be used to copy the iso image to a USB drive (see below)."
msgstr "Unetbootin ne devrait pas être utilisé pour copier l'image ISO sur une clé USB (voir ci-dessous)."
#: "/web/en/5/download_index.php +167"
-msgid ""
-"To dump a Mageia installation ISO on a USB stick, you may try one of several"
-" tools:"
+msgid "To dump a Mageia installation ISO on a USB stick, you may try one of several tools:"
msgstr "Pour copier une ISO d'installation de Mageia sur une clé USB, vous devriez essayer l'un des multiples outils suivants :"
#: "/web/en/5/download_index.php +169"
@@ -129,10 +112,7 @@ msgid "For windows use <a href=\"%s\">usbdumper.</a>"
msgstr "Pour Windows utiliser <a href=\"%s\">usbdumper</a>."
#: "/web/en/5/download_index.php +172"
-msgid ""
-"If it show \"writing error or access denied\" try the fallowing method: run "
-"the console (cmd), then type \"diskpart\", then \"list disk\", then select "
-"your disk with \"select disk\", and type \"clean\" (it will erase the key)."
+msgid "If it show \"writing error or access denied\" try the fallowing method: run the console (cmd), then type \"diskpart\", then \"list disk\", then select your disk with \"select disk\", and type \"clean\" (it will erase the key)."
msgstr "S'il affiche \"writing error\" ou \"access denied\", tentez la méthode suivante : lancez la console (cmd), puis tapez \"diskpart\", puis \"list disk\", puis sélectionnez votre disque avec \"select disk\", et enfin tapez \"clean\" (cela effacera la clé)."
#: "/web/en/5/download_index.php +182"
@@ -140,9 +120,7 @@ msgid "Classical Installation Flavours"
msgstr "Installation classique"
#: "/web/en/5/download_index.php +184"
-msgid ""
-"The Classical ISO is the traditional way to install Mageia directly. Take a "
-"look at the complete <a href=\"%s\">documentation</a> for this installer."
+msgid "The Classical ISO is the traditional way to install Mageia directly. Take a look at the complete <a href=\"%s\">documentation</a> for this installer."
msgstr "La classique image ISO est le moyen traditionnel d'installer directement Mageia. Jetez un oeil sur la <a href=\"%s\">documentation</a> complète de cet installeur."
#: "/web/en/5/download_index.php +186"
@@ -166,16 +144,11 @@ msgid "You will be asked of which kind of Software you want to install."
msgstr "Il vous sera demandé quels types de logiciels vous souhaitez installer."
#: "/web/en/5/download_index.php +194"
-msgid ""
-"The installer includes the capability of adding the online Mageia "
-"repositories during the installation, which means you can install even more "
-"packages than those available on the ISO."
+msgid "The installer includes the capability of adding the online Mageia repositories during the installation, which means you can install even more packages than those available on the ISO."
msgstr "L'installateur a la capacité d'ajouter les dépôts Mageia en ligne lors de l'installation, ce qui signifie que vous pouvez installer encore plus de paquetages que ceux présents sur l'ISO."
#: "/web/en/5/download_index.php +197"
-msgid ""
-"For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it's "
-"about %sGB."
+msgid "For 32 and 64bit, size of the ISOs is about %sGB. For the dualarch it's about %sGB."
msgstr "Pour 32 et 64 bit, la taille de l'image ISO est d'environ %s Go. Pour le dualarch, elle est d'environ %s Go."
#: "/web/en/5/download_index.php +205"
@@ -183,16 +156,11 @@ msgid "LiveCDs and LiveDVDs"
msgstr "LiveCD et LiveDVD"
#: "/web/en/5/download_index.php +207"
-msgid ""
-"Live ISO's let you try %s without installation. You can run Mageia directly "
-"from a CD, DVD or USB device, and try it using one of the graphical user "
-"interfaces such as GNOME or KDE."
+msgid "Live ISO's let you try %s without installation. You can run Mageia directly from a CD, DVD or USB device, and try it using one of the graphical user interfaces such as GNOME or KDE."
msgstr "L'ISO Live vous permet d'essayer %s sans installation. Vous pouvez lancer Mageia directement à partir d'un CD, d'un DVD ou d'une clé USB, et de l'essayer en utilisant l'une des interfaces graphiques telles que GNOME ou KDE."
#: "/web/en/5/download_index.php +208"
-msgid ""
-"If you are happy with the Mageia experience, you can then install it onto "
-"your hard drive from the Live media."
+msgid "If you are happy with the Mageia experience, you can then install it onto your hard drive from the Live media."
msgstr "Si vous êtes satisfaits de votre test, vous pouvez ensuite installer Mageia sur votre disque dur."
#: "/web/en/5/download_index.php +210"
@@ -200,21 +168,15 @@ 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 +211"
-msgid ""
-"DO NOT use these LiveCDs or LiveDVDs to upgrade from the prior Mageia "
-"release!"
+msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade 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 +212"
-msgid ""
-"Use a classical installation and see <a href=\"%s\" hreflang=\"en\">upgrade "
-"guide</a>."
+msgid "Use a classical installation and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
msgstr "Utilisez une installation classique et consultez le <a href=\"%s\" hreflang=\"en\">guide de mise à niveau</a>."
#: "/web/en/5/download_index.php +215"
-msgid ""
-"For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it's about "
-"%sMB."
+msgid "For LiveDVDs, size of the ISOs is about %sGB. For the LiveCDs it's about %sMB."
msgstr "Pour les DVD Live, la taille des images ISO est d'environ %s Go. Pour les CD Live elle est d'environ %s Mo."
#: "/web/en/5/download_index.php +220"
@@ -222,9 +184,7 @@ msgid "Wired Network-based Installation CD"
msgstr "CD d'installation en réseau filaire"
#: "/web/en/5/download_index.php +221"
-msgid ""
-"Download quickly and immediately boot into install mode from <em>wired</em> "
-"network or a local disk."
+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 +222"
@@ -280,8 +240,7 @@ msgid "LiveCDs contain only English and is available only in 32bit."
msgstr "Les LiveCDs comprennent uniquement l'Anglais et ne sont disponibles qu'en 32bit."
#: "/web/en/5/download_index.php +256"
-msgid ""
-"Do not use unless you really DON'T NEED any other language than English."
+msgid "Do not use unless you really DON'T NEED any other language than English."
msgstr "Ne pas utiliser à moins que vous n'ayez VRAIMENT PAS BESOIN d'une autre langue que l'anglais."
#: "/web/en/5/download_index.php +263"
@@ -317,9 +276,7 @@ msgid "Network installer + nonfree firmware CD"
msgstr "Installeur réseau incluant des firmwares non libres"
#: "/web/en/5/download_index.php +296"
-msgid ""
-"Contain nonfree drivers needed for some disc controllers, some network "
-"cards, etc."
+msgid "Contain nonfree drivers needed for some disc controllers, some network cards, etc."
msgstr "Contient des pilotes non-libres pour les besoins de certains contrôleurs de disques, certaines cartes réseau, etc."
#: "/web/en/5/download_index.php +300"
@@ -335,27 +292,19 @@ msgid "Supported Architecture"
msgstr "Architecture supportée"
#: "/web/en/5/download_index.php +310"
-msgid ""
-"Most new computers support x86-64 (also known as AMD64 and Intel64), but "
-"some laptop processors and netbook processors do not support it."
+msgid "Most new computers support x86-64 (also known as AMD64 and Intel64), but some laptop processors and netbook processors do not support it."
msgstr "La plupart des nouveaux ordinateurs supportent x86-64 (également connu comme AMD64 et Intel64), mais certains processeurs de portables et d'ultra-portables ne le supportent pas."
#: "/web/en/5/download_index.php +314"
-msgid ""
-"This version runs on all PCs including those that support 64 Bit. If you "
-"have more than 3 GB of RAM you should prefer the 64 Bit version though."
+msgid "This version runs on all PCs including those that support 64 Bit. If you have more than 3 GB of RAM you should prefer the 64 Bit version though."
msgstr "Cette version fonctionne sur tous les PC, incluant ceux en architecture 64bit. Si vous disposez de plus de 3 Go de mémoire vive, vous devriez choisir la version 64bit."
#: "/web/en/5/download_index.php +320"
-msgid ""
-"The dualarch DVD contains only a minimal list of packages and a lite "
-"desktop, %s, to fit on %sGB."
+msgid "The dualarch DVD contains only a minimal list of packages and a lite desktop, %s, to fit on %sGB."
msgstr "Le DVD dualarch contient uniquement une liste minimale de paquetages et un bureau léger, %s, pour tenir dans %s Go."
#: "/web/en/5/download_index.php +322"
-msgid ""
-"Dual iso size is intended to be small for advanced users, only network "
-"proprietary drivers are included."
+msgid "Dual iso size is intended to be small for advanced users, only network proprietary drivers are included."
msgstr "La taille de l'ISO Dual est destinée à être petite, pour les utilisateurs avancés. Seuls des pilotes réseau propriétaires sont inclus."
#: "/web/en/5/download_index.php +323"
@@ -367,15 +316,11 @@ msgid "Furthermore UEFI is not supported."
msgstr "Par ailleurs UEFI n'est pas supporté."
#: "/web/en/5/download_index.php +326"
-msgid ""
-"It can be used to install either a 32bit system or a 64bit system, the "
-"installer defaults to x86_64 when it detects a 64bit capable CPU."
+msgid "It can be used to install either a 32bit system or a 64bit system, the installer defaults to x86_64 when it detects a 64bit capable CPU."
msgstr "Il peut être utilisé pour installer soit un système 32bit soit un système 64bit. L'installateur utilise automatiquement x86_64 quand il détecte un processeur 64bit."
#: "/web/en/5/download_index.php +327"
-msgid ""
-"This ISO is generally for advanced users and system administrator for fast "
-"deployment of Mageia."
+msgid "This ISO is generally for advanced users and system administrator for fast deployment of Mageia."
msgstr "L'ISO est destinée généralement aux utilisateurs expérimentés et administrateurs système, pour un déploiement rapide de Mageia."
#: "/web/en/5/download_index.php +341"
@@ -395,9 +340,7 @@ msgid "BitTorrent"
msgstr "BitTorrent"
#: "/web/en/5/download_index.php +351"
-msgid ""
-"We recommend you to use <a href=%s>BitTorrent</a> for downloading as it "
-"usually give a higher speeds and more reliable download of large files."
+msgid "We recommend you to use <a href=%s>BitTorrent</a> for downloading as it usually give a higher speeds and more reliable download of large files."
msgstr "Nous recommandons d'utiliser <a href=%s>BitTorrent</a> pour télécharger car il permet habituellement un débit plus élevé et un téléchargement plus fiable de gros fichiers."
#: "/web/en/5/download_index.php +351"
@@ -437,9 +380,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Copier l'ISO sur un lecteur flash USB</a>"
#: "/web/en/5/download_index.php +494"
-msgid ""
-"https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -498,8 +440,7 @@ msgid "https://wiki.mageia.org/en/Mageia_5_Errata"
msgstr "https://wiki.mageia.org/en/Mageia_5_Errata"
#: "/web/en/5/nav.php +5"
-msgid ""
-"https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
+msgid "https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
msgstr "https://wiki.mageia.org/en/Mageia_5_Release_Notes#Upgrading_from_Mageia_4"
#: "/web/en/5/nav.php +12"
@@ -515,9 +456,7 @@ msgid "Mageia 5"
msgstr "Mageia 5"
#: "/web/en/5/index.php +14"
-msgid ""
-"Mageia 5 is the new, solid, stable Linux distribution from the Mageia "
-"project."
+msgid "Mageia 5 is the new, solid, stable Linux distribution from the Mageia project."
msgstr "Mageia 5 est la nouvelle distribution Linux stable et sécurisée du projet Mageia."
#: "/web/en/5/index.php +34"
@@ -525,10 +464,7 @@ msgid "About Mageia 5"
msgstr "A propos de Mageia 5"
#: "/web/en/5/index.php +36"
-msgid ""
-"Mageia 5 is a GNU/Linux distribution for your computer, released by the <a "
-"href=\"%s\">Mageia community</a>. It can be installed in several ways, with "
-"the Live or Classical ISOs being the most popular methods."
+msgid "Mageia 5 is a GNU/Linux distribution for your computer, released by the <a href=\"%s\">Mageia community</a>. It can be installed in several ways, with the Live or Classical ISOs being the most popular methods."
msgstr "Mageia 5 est une distribution GNU/Linux pour votre ordinateur, réalisée par la <a href=\"%s\">communauté Mageia</a>. Elle peut être installée de différentes manières. L'utilisation d'iso Live ou Classique étant les plus populaire."
#: "/web/en/5/index.php +38"
@@ -536,31 +472,19 @@ msgid "Download it right away!"
msgstr "Téléchargez-la&nbsp;!"
#: "/web/en/5/index.php +40"
-msgid ""
-"Live ISO's let you try Mageia without installation. Use <a href=\"%s\">these"
-" instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you "
-"can run Mageia 5 directly from there, and try Mageia using one of the "
-"graphical user interfaces such as GNOME or KDE."
+msgid "Live ISO's let you try Mageia without installation. Use <a href=\"%s\">these instructions</a> to put the Live ISO on a CD, DVD or USB device. Then you can run Mageia 5 directly from there, and try Mageia using one of the graphical user interfaces such as GNOME or KDE."
msgstr "Les iso Live vous permettent de tester Mageia sans avoir à l'installer. Utilisez <a href=\"%s\">ces instructions</a> afin de mettre l'iso sur un CD, DVD ou une clé USB. Vous pouvez ensuite lancer directement Mageia 5 à partir de ceux-ci, et tester Mageia en utilisant une interface graphique comme KDE ou GNOME."
#: "/web/en/5/index.php +43"
-msgid ""
-"The Classical ISO is the more traditional way to install Mageia directly. "
-"Take a look at the complete <a href=\"%s\">documentation</a> for this "
-"installer."
+msgid "The Classical ISO is the more traditional way to install Mageia directly. Take a look at the complete <a href=\"%s\">documentation</a> for this installer."
msgstr "L'iso Classique est la manière traditionnelle d'installer directement Mageia. Vous pouvez lire la <a href=\"%s\">documentation</a> complète faite à ce propos."
#: "/web/en/5/index.php +45"
-msgid ""
-"Mageia 5 includes several desktop managers including KDE, Gnome, XFCE, Mate,"
-" and Cinnamon."
+msgid "Mageia 5 includes several desktop managers including KDE, Gnome, XFCE, Mate, and Cinnamon."
msgstr "Mageia 5 inclut différents environnement de bureau, parmi eux, KDE, GNOME, XFCE, Mate ou Cinnamon."
#: "/web/en/5/index.php +47"
-msgid ""
-"There are lots of applications in the official repositories. You can have a "
-"look at the <a href=\"%s\">Mageia Application Database</a> to get a complete"
-" list of packages inside Mageia."
+msgid "There are lots of applications in the official repositories. You can have a look at the <a href=\"%s\">Mageia Application Database</a> to get a complete list of packages inside Mageia."
msgstr "Il y a beaucoup d'applications dans les dépôts officiels. Une liste complète peut être trouvée dans la <a href=\"%s\">base de donnée</a> des applications de Mageia."
#: "/web/en/5/index.php +49"
@@ -568,31 +492,19 @@ msgid "What's new?"
msgstr "Quoi de neuf&nbsp;?"
#: "/web/en/5/index.php +51"
-msgid ""
-"There's plenty of new goodness in Mageia 5, too much to include here - see "
-"the <a hreflang=\"en\" href=\"%s\">release notes</a> for an extensive "
-"exposé."
+msgid "There's plenty of new goodness in Mageia 5, too much to include here - see the <a hreflang=\"en\" href=\"%s\">release notes</a> for an extensive exposé."
msgstr "Il y'a de nombreuses nouveautés dans Mageia 5, trop pour les énumérer ici. Consultez les <a href=\"%s\">notes de publication</a> pour une liste exhaustive."
#: "/web/en/5/index.php +53"
-msgid ""
-"There is one feature worth mentioning here. It took a lot of effort and time"
-" but it was worth it. Mageia 5 <a href=\"%s\">supports UEFI</a>, which means"
-" it’s now even easier to install it on recent hardware."
+msgid "There is one feature worth mentioning here. It took a lot of effort and time but it was worth it. Mageia 5 <a href=\"%s\">supports UEFI</a>, which means it’s now even easier to install it on recent hardware."
msgstr "Il y a une fonctionnalité importante à mentionner ici. Cela a demandé beaucoup d'efforts et de temps mais ça en valait la peine. Mageia 5 <a href=\"%s\">supporte l'UEFI</a>, ce qui signifie qu'elle est maintenant plus facile à installer sur des ordinateurs récents."
#: "/web/en/5/index.php +54"
-msgid ""
-"https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-"
-"uefi-support/"
+msgid "https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/"
msgstr "https://blog.mageia.org/fr/2015/05/30/en-attendant-mageia-5-focus-sur-le-support-de-luefi/"
#: "/web/en/5/index.php +56"
-msgid ""
-"To help users configure and use Mageia, and to provide some information "
-"about the community and the project, there's a program called <a "
-"href=\"%s\">MageiaWelcome</a>. It starts automatically when a session opens "
-"for the first time in any of the graphical environments."
+msgid "To help users configure and use Mageia, and to provide some information about the community and the project, there's a program called <a href=\"%s\">MageiaWelcome</a>. It starts automatically when a session opens for the first time in any of the graphical environments."
msgstr "Afin d'aider les utilisateurs à configurer et utiliser Mageia, mais aussi pour donner des informations à propos de la communauté et du projet, <a href=\"%s\">MageiaWelcome</a> a été développé. Ce programme démarre automatiquement lors de la première ouverture de session dans n'importe lequel des environnements graphiques."
#: "/web/en/5/index.php +56"
@@ -608,36 +520,25 @@ msgid "Mageia in context"
msgstr "Mageia en contexte"
#: "/web/en/5/index.php +87"
-msgid ""
-"Mageia is both a Community and a Linux Distribution, with Mageia 5 being our"
-" fifth release."
+msgid "Mageia is both a Community and a Linux Distribution, with Mageia 5 being our fifth release."
msgstr "Magiea est en même temps une Communauté et une Distribution Linux, Mageia5 étant notre cinquième version."
#: "/web/en/5/index.php +89"
-msgid ""
-"Mageia 5 is supported by the <a href=\"%s\">Mageia.org nonprofit "
-"organisation</a>, which is governed by a body of recognized and elected "
-"contributors."
+msgid "Mageia 5 is supported by the <a href=\"%s\">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors."
msgstr "Mageia 5 est soutenue par <a href=\"../about/\">l&rsquo;association Mageia.Org</a>, gouvernée par des contributeurs reconnus et élus."
#: "/web/en/5/index.php +91"
-msgid ""
-"Mageia 5 has been made by more than <a href=\"%s\">100 people from all "
-"around the world</a>."
+msgid "Mageia 5 has been made by more than <a href=\"%s\">100 people from all around the world</a>."
msgstr "Mageia 5 a été réalisée par plus de <a href=\"%s\">100&nbsp;personnes du monde entier</a>."
#: "/web/en/5/index.php +93"
-msgid ""
-"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."
+msgid "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."
msgstr "Notre contribution s'ajoute à l'excellent travail de la communauté Linux et du logiciel libre dans son ensemble. Notre but est de fournir la plateforme la plus stable, fiable et agréable que nous puissions réaliser, tant pour les utilisateurs classiques que pour les développeurs et les entreprises."
#: "/web/en/5/index.php +95"
-msgid ""
-"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>."
+msgid "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>."
msgstr "Nous accueillons de nouveaux contributeurs dans chacune des nombreuses équipes qui constituent la communauté Mageia, et nous vous invitons à <a href=\"%s\">nous rejoindre</a>."
+
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
diff --git a/langs/hr/5.po b/langs/hr/5.po
index 776228823..006802026 100644
--- a/langs/hr/5.po
+++ b/langs/hr/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/mageia/language/hr/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/hu/5.po b/langs/hu/5.po
index 8e5721288..286169cd2 100644
--- a/langs/hu/5.po
+++ b/langs/hu/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:22+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/mageia/language/hu/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/id/5.po b/langs/id/5.po
index e403b197d..af98bad97 100644
--- a/langs/id/5.po
+++ b/langs/id/5.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/language/id/)\n"
@@ -379,8 +379,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Dapatkan ISO dalam flashdisk</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -542,6 +542,10 @@ msgstr "Pekerjaan kami memberikan kontribusi yang luar biasa kepada komunitas Li
msgid "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>."
msgstr "Kami menyambut kontributor-kontributor baru untuk bergabung ke berbagai tim berbeda untuk membangun Komunitas Mageia, dan kami mendorong kamu untuk <a href=\"%s\">bergabung bersama kami</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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."
diff --git a/langs/it/5.po b/langs/it/5.po
index 7a1f7d97a..bb0db39de 100644
--- a/langs/it/5.po
+++ b/langs/it/5.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:12+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/it/)\n"
@@ -379,8 +379,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Mettere la ISO su di una chiavetta USB</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -542,6 +542,10 @@ msgstr "Il nostro sforzo si aggiunge all'ottimo lavoro della comunità Linux e d
msgid "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>."
msgstr "Accogliamo nuovi collaboratori in qualsiasi delle molte squadre diverse che costituiranno la comunità Mageia, e ti invitiamo a unirti a noi."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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 "Queste ISO cambiano frequentemente e in quanto danno lo stato reale di Cauldron, potrebbero non funzionare. Se è questo il caso usane più di una."
diff --git a/langs/lv/5.po b/langs/lv/5.po
index 592cbe723..76b623fe0 100644
--- a/langs/lv/5.po
+++ b/langs/lv/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 18:53+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/mageia/language/lv/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/nb/5.po b/langs/nb/5.po
index 8f9800dd3..bc46b2973 100644
--- a/langs/nb/5.po
+++ b/langs/nb/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 18:53+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mageia/language/nb/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/nl/5.po b/langs/nl/5.po
index 6f7ba5ed7..d540b564a 100644
--- a/langs/nl/5.po
+++ b/langs/nl/5.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-10 16:38+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/mageia/language/nl/)\n"
@@ -380,7 +380,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Zet ISO op een USB-stick</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/pl/5.po b/langs/pl/5.po
index 5472ac742..1fff6e30c 100644
--- a/langs/pl/5.po
+++ b/langs/pl/5.po
@@ -7,8 +7,9 @@
# Domain: 5
#
# include translation strings from:
-# en/5/download_index.php
-# en/5/nav.php
+# en/5_preview/download_index.php
+# en/5_preview/nav.php
+# en/5_preview/index.php
#
# Translators:
# Daniel Napora <napcok@gmail.com>, 2015
@@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
-"PO-Revision-Date: 2015-05-26 18:53+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
+"PO-Revision-Date: 2015-06-18 21:14+0000\n"
+"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/mageia/language/pl/)\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
@@ -53,7 +54,7 @@ msgstr "Pobierz obrazy ISO Mageia 5 DVD, CD, LiveCD, instalacji sieciowej."
#: "/web/en/5/download_index.php +69"
msgid "mageia, %s, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
-msgstr ""
+msgstr "mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
#: "/web/en/5/download_index.php +149"
msgid "It looks like you have JavaScript disable. Please <a href=\"%s\">enable</a> it to have better render. At the <a href=\"%s\">end</a> of this page there will be download link for you. But what is written between is important."
@@ -380,8 +381,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Wrzucanie ISO na USB</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -416,9 +417,8 @@ msgid "It is <a href=\"%s\">here</a>."
msgstr "Znajdziesz je <a href=\"%s\">tutaj</a>."
#: "/web/en/5/download_index.php +511"
-#, fuzzy
msgid "But please remember that it will soon <a href=\"%s\">reach EOL</a>."
-msgstr "Pamiętaj że wsparcie zostało już <a href=\"%s\">zakończone</a>."
+msgstr ""
#: "/web/en/5/download_index.php +512"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
@@ -501,14 +501,12 @@ msgid "There is one feature worth mentioning here. It took a lot of effort and t
msgstr ""
#: "/web/en/5/index.php +54"
-#, fuzzy
msgid "https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/"
-msgstr "https://blog.mageia.org/en/2014/11/26/lets-say-goodbye-to-mageia-3/"
+msgstr ""
#: "/web/en/5/index.php +56"
-#, fuzzy
msgid "To help users configure and use Mageia, and to provide some information about the community and the project, there's a program called <a href=\"%s\">MageiaWelcome</a>. It starts automatically when a session opens for the first time in any of the graphical environments."
-msgstr "Aby pomóc użytkownikom skonfigurować i używać Mageia, oraz aby dostarczyć informacje o społeczności i projekcie, dodaliśmy nowy ekran powitalny <a href=\"%s\">MageiaWelcome</a>. Uruchamia się on automatycznie przy pierwszym uruchomieniu środowiska graficznego."
+msgstr ""
#: "/web/en/5/index.php +56"
msgid "https://wiki.mageia.org/en/Feature:MageiaWelcome"
@@ -523,9 +521,8 @@ msgid "Mageia in context"
msgstr "Mageia ..."
#: "/web/en/5/index.php +87"
-#, fuzzy
msgid "Mageia is both a Community and a Linux Distribution, with Mageia 5 being our fifth release."
-msgstr "Mageia jest zarówno społecznością jak i dystrybucją GNU/Linux, z Mageia 5 będącą naszym czwartym wydaniem."
+msgstr ""
#: "/web/en/5/index.php +89"
msgid "Mageia 5 is supported by the <a href=\"%s\">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors."
@@ -543,128 +540,6 @@ msgstr "Nasza praca przyczynia się do doskonałej pracy ogólnie Linuxa i społ
msgid "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>."
msgstr "Zapraszamy nowych użytkowników do przyłączenia się do jednego z wielu zespołów, które tworzą społeczność Mageia, zachęcamy do <a href=\"%s\">przyłączenia się do nas</a>."
-#~ 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."
-
-#~ msgid "Be careful! This is an alpha, unstable release."
-#~ msgstr "Uwaga! To jest niestabilne wydanie alpha."
-
-#~ msgid "Be careful! This is a beta, unstable release."
-#~ msgstr "Uwaga! To jest niestabilne wydanie beta."
-
-#~ msgid "This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s."
-#~ msgstr "To jest Wersja Kandydująca. Oprogramowanie w wersji kandydującej to takie, które pomyślnie przeszło beta testy i powinno nadawać się dla zaawansowanych użytkowników oraz recenzentów. Jednak początkujący użytkownicy mogą poczekać na wersję finalną, która jest planowana na %s."
-
-#~ msgid "May 2015"
-#~ msgstr "Maj 2015"
-
-#~ msgid "Release Candidate is intended to identify any remaining bugs or missing packages."
-#~ msgstr "Wersja kandydująca jest przeznaczona do znalezienia ostatnich błędów."
-
-#~ msgid "Looking for a stable release?"
-#~ msgstr "Szukasz wydania stabilnego?"
-
-#~ msgid "Development roadmap"
-#~ msgstr "Plan wydawniczy"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning"
-
-#~ msgid "Features review"
-#~ msgstr "Przegląd nowości"
-
-#~ msgid "https://wiki.mageia.org/en/FeatureMageia5_Review"
-#~ msgstr "https://wiki.mageia.org/en/FeatureMageia5_Review"
-
-#~ msgid "32bit"
-#~ msgstr "32bit"
-
-#~ msgid "64bit"
-#~ msgstr "64bit"
-
-#~ msgid "dualarch"
-#~ msgstr "dualarch (obie architektury: 32bit oraz 64bit)"
-
-#~ msgid "Download Mageia 5 DVD, CD, LiveCD, network install ISO images."
-#~ msgstr "Pobierz obrazy ISO Mageia 5 DVD, CD, LiveCD, instalacji sieciowej."
-
-#~ msgid "mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
-#~ msgstr "mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
-
-#~ msgid "If you want to put the ISO on USB key, <span class=\"warn\">please DO NOT use Unetbootin</span>. Have a look <a href=\"%s\">here</a> for the alternative."
-#~ msgstr "Jeżeli chcesz umieścić plik ISO na nośniku USB, <span class=\"warn\">NIE UŻYWAJ programu Unetbootin</span>. Przejdź <a href=\"%s\">tutaj</a>, aby znaleźć alternatywe."
-
-#~ msgid "size"
-#~ msgstr "rozmiar"
-
-#~ msgid "Notes:"
-#~ msgstr "Uwagi:"
-
-#~ msgid "https://wiki.mageia.org/en/Available_locales"
-#~ msgstr "https://wiki.mageia.org/en/Available_locales"
-
-#~ msgid "These DVD and CD ISOs contains Free Software and some proprietary drivers."
-#~ msgstr "Te obrazy ISO (DVD oraz CD) zawierają Wolne Oprogramowanie oraz niektóre własnościowe sterowniki."
-
-#~ msgid "The dualarch DVD contains only a minimal list of packages."
-#~ msgstr "Dualarch DVD zawiera minimalną liczbę pakietów."
-
-#~ 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 "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>."
-
-#~ msgid "All languages"
-#~ msgstr "Wszystkie języki"
-
-#~ msgid "English only"
-#~ msgstr "Tylko angielski"
-
-#~ msgid "needed for some disc controllers, some network cards, etc."
-#~ msgstr "konieczny do niektórych kontrolerów dysków, kart sieciowych itd."
-
-#~ msgid "February 1<sup>st</sup> 2014"
-#~ msgstr "1<sup>szy</sup> luty 2014"
-
-#~ msgid "<a href=\"%s\">Release notes</a>"
-#~ msgstr "<a href=\"%s\">Informacje o wydaniu</a>"
-
-#~ msgid "<a href=\"%s\">Errata</a>"
-#~ msgstr "<a href=\"%s\">Errata</a>"
-
-#~ msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
-#~ msgstr "<a href=\"%s\">Wrzucanie ISO na USB</a>"
-
-#~ msgid "Upgrading<br>from Mageia 3?"
-#~ msgstr "Aktualizacja<br> z Mageia 3?"
-
-#~ msgid "Looking for Mageia 3?"
-#~ msgstr "Szukasz Mageia 3?"
-
-#~ msgid "It is <a href=\"%s\">here now</a>."
-#~ msgstr "Jest <a href=\"%s\">tutaj</a>."
-
-#~ msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on Mageia 5</a>."
-#~ msgstr "Możesz <a href=\"%s\">pomóc</a> nam <a href=\"%s\">przy Mageia 5</a>."
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Release_Notes"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Release_Notes"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Errata"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Errata"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3"
-
-#~ msgid "Mageia&nbsp;4"
-#~ msgstr "Mageia&nbsp;4"
-
-#~ msgid "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>."
-#~ msgstr "Dostępne są dwa nowe środowiska graficzne: Mate oraz Cinnamon, oba dostępne na DVD z klasycznym instalatorem."
-
-#~ msgid "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."
-#~ msgstr "Sporo wysiłku włożyliśmy w aktualizację narzędzi Mageia. Wiele pakietów zostało przeportowanych z Gtk2 do Gtk3. Wszystkie narzędzia Mageia zostały przeportowane, aby do uwierzytelniania używać polkit zamiast wysłużonego usermode."
-
-#~ msgid "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."
-#~ msgstr "Instalacja TexLive wymagała pobrania około 1 GB danych - teraz rozdzielony został na 3 pakiety co zazwyczaj pozwala uniknąć pobieranie tak dużej ilości danych."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
diff --git a/langs/pt-br/5.po b/langs/pt-br/5.po
index 650d11520..30829063a 100644
--- a/langs/pt-br/5.po
+++ b/langs/pt-br/5.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-17 01:03+0000\n"
"Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mageia/language/pt_BR/)\n"
@@ -380,8 +380,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Obter ISO na unidade USB (Pendrive) </a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -539,5 +539,9 @@ msgstr "Nosso trabalho contribui para o excelente trabalho da comunidade Linux e
msgid "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>."
msgstr "Congratulamo-nos com novos colaboradores para qualquer uma das muitas equipes diferentes que vão fazer parte da Comunidade Mageia, e nós encorajamos você a se <a href=\"%s\">juntar a nós</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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."
diff --git a/langs/pt/5.po b/langs/pt/5.po
index 5b4373083..935be5a5b 100644
--- a/langs/pt/5.po
+++ b/langs/pt/5.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:12+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/mageia/language/pt/)\n"
@@ -379,7 +379,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/ro/5.po b/langs/ro/5.po
index cf2829c52..a49d57db8 100644
--- a/langs/ro/5.po
+++ b/langs/ro/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:12+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/ro/)\n"
@@ -378,8 +378,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Puneți imaginea ISO pe o cheie USB</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -541,6 +541,10 @@ msgstr "Munca noastră se adaugă efortului întregii comunități Linux și al
msgid "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>."
msgstr "Primim bucuroși noii contribuitori în oricare din diferitele noastre echipe care formează comunitatea Mageia și vă încurajăm pe toți să vă <a href=\"%s\">alăturați nouă</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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 "Aceste imagini ISO evoluează permanent, iar după cum reflectă starea reală a versiunii de dezvoltare Cauldron, s-ar putea să nu funcționeze. În acest caz, utilizați-o pe cea de mai sus."
diff --git a/langs/ru/5.po b/langs/ru/5.po
index c37db9d1c..9655c227a 100644
--- a/langs/ru/5.po
+++ b/langs/ru/5.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/mageia/language/ru/)\n"
@@ -379,8 +379,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Скачать ISO для USB флеш накопителя</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -542,6 +542,10 @@ msgstr "Наша деятельность основана на работе ш
msgid "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>."
msgstr "Мы будем рады новым участникам для многих команд, из которых состоит Сообщество Mageia, и хотим, чтобы вы к нам <a href=\"%s\">присоединились</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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, поэтому они могут быть неработоспособными."
diff --git a/langs/sco/5.po b/langs/sco/5.po
index 5d131ea2d..55583bdaa 100644
--- a/langs/sco/5.po
+++ b/langs/sco/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Scots (http://www.transifex.com/projects/p/mageia/language/sco/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/sl/5.po b/langs/sl/5.po
index 8eb3ebc64..cacccf1f6 100644
--- a/langs/sl/5.po
+++ b/langs/sl/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-17 20:52:00+0200\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-i18n@mageia.org>\n"
@@ -378,8 +378,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\" hreflang=\"en\">Odlaganje odtisa nosilca za namestitev na ključek USB</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -537,6 +537,10 @@ msgstr "Naše delo prispeva k odličnemu delu širše Linux in odprtokodne skupn
msgid "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>."
msgstr "Toplo dobrodošli vsi, ki bi radi <a href=\"%s\">sodelovali v katerikoli od mnogih različnih ekip</a>, ki sestavljajo aktivno skupnost Mageia."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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."
diff --git a/langs/sq/5.po b/langs/sq/5.po
index 97799b2f4..2b8f1dcb9 100644
--- a/langs/sq/5.po
+++ b/langs/sq/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:22+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/mageia/language/sq/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/sv/5.po b/langs/sv/5.po
index b8d6c6d15..84e7b93f8 100644
--- a/langs/sv/5.po
+++ b/langs/sv/5.po
@@ -7,17 +7,19 @@
# Domain: 5
#
# include translation strings from:
-# en/5/download_index.php
-# en/5/nav.php
+# en/5_preview/download_index.php
+# en/5_preview/nav.php
+# en/5_preview/index.php
#
# Translators:
# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2014
+# Michael Eklund <willard@null.net>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
-"PO-Revision-Date: 2015-05-26 19:12+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
+"PO-Revision-Date: 2015-06-18 21:14+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/sv/)\n"
"Language: sv\n"
@@ -379,8 +381,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Få ISOn på en USB-enhet</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -415,9 +417,8 @@ msgid "It is <a href=\"%s\">here</a>."
msgstr "Den finns <a href=\"%s\">här</>."
#: "/web/en/5/download_index.php +511"
-#, fuzzy
msgid "But please remember that it will soon <a href=\"%s\">reach EOL</a>."
-msgstr "Snälla, kom ihåg att den redan har <a href=\"%s\">nått slutcykeln</a>."
+msgstr "Men tänk på att den snart kommer att <a href=\"%s\">nå sin EOL</a>."
#: "/web/en/5/download_index.php +512"
msgid "But please remember that it already <a href=\"%s\">reached EOL</a>."
@@ -497,17 +498,15 @@ msgstr "Det finns massor med trevliga nyheter i Mageia 5. Ta en titt på <a href
#: "/web/en/5/index.php +53"
msgid "There is one feature worth mentioning here. It took a lot of effort and time but it was worth it. Mageia 5 <a href=\"%s\">supports UEFI</a>, which means it’s now even easier to install it on recent hardware."
-msgstr ""
+msgstr "Det finns en funktion som är värt att nämna här. Det har tagit en hel del arbete och tid men det har varit värt det. Mageia 5 <a href=\"%s\">stöder UEFI</a> vilket betyder att det är nu ännu lättare att installera på nyare hårdvara."
#: "/web/en/5/index.php +54"
-#, fuzzy
msgid "https://blog.mageia.org/en/2015/05/30/waiting-for-mageia-5-spotlight-on-uefi-support/"
-msgstr "http://blog.mageia.org/en/2014/06/20/pulling-mageia-4-1-out-of-the-hat/"
+msgstr "http://blog.mageia.org/sv/index.php/2015/05/30/medans-vi-vantar-pa-mageia-5-uefi-stod-i-rampljuset/"
#: "/web/en/5/index.php +56"
-#, fuzzy
msgid "To help users configure and use Mageia, and to provide some information about the community and the project, there's a program called <a href=\"%s\">MageiaWelcome</a>. It starts automatically when a session opens for the first time in any of the graphical environments."
-msgstr "För att hjälpa användare att konfigurera och använda Mageia, samt att tillhandahålla information om gruppen och projektet så har vi lagt till nya <a href=\"%s\">Välkommen till Mageia</a>. Den startar automatiskt när en session öppnas för första gången i någon av de grafiska miljöerna."
+msgstr "Det finns ett program som heter MageiaWelcome som är till för att hjälpa användare att konfigurera och Mageia och ge lite information om projektet. Det startar automatiskt när en session öppnas för första gången i någon av de grafiska miljöerna."
#: "/web/en/5/index.php +56"
msgid "https://wiki.mageia.org/en/Feature:MageiaWelcome"
@@ -522,9 +521,8 @@ msgid "Mageia in context"
msgstr "Översikt av Mageia"
#: "/web/en/5/index.php +87"
-#, fuzzy
msgid "Mageia is both a Community and a Linux Distribution, with Mageia 5 being our fifth release."
-msgstr "Mageia är både en gemenskap och en Linuxdistribution där Mageia 5 är vår fjärde version."
+msgstr "Mageia är både en gemenskap och en Linux distribution där Mageia 5 är vår femte utgåva."
#: "/web/en/5/index.php +89"
msgid "Mageia 5 is supported by the <a href=\"%s\">Mageia.org nonprofit organisation</a>, which is governed by a body of recognized and elected contributors."
@@ -542,137 +540,6 @@ msgstr "Vårt arbete bidrar till det redan förträffliga jobb som den bredare L
msgid "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>."
msgstr "Vi välkomnar nya medarbetare till alla våra olika grupper som bildar Mageia-samfundet, och vi uppmuntrar dig att <a href=\"%s\">göra oss sällskap</a>."
-#~ 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 "Dessa ISO-filer ändras frekvent och eftersom de representerar Cauldrons verkliga tillstånd så kanske de funkar eller så gör de det inte. Om så är fallet, använd ovanstående."
-
-#~ msgid "Be careful! This is an alpha, unstable release."
-#~ msgstr "Var försiktig. Det här är en alpha - En ostabil utgåva."
-
-#~ msgid "Be careful! This is a beta, unstable release."
-#~ msgstr "Var försiktig! Detta är är en instabil beta-utgåva."
-
-#~ msgid "It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>"
-#~ msgstr "Den är endast avsedd för användning av utvecklare. <strong>ANVÄND INTE DENNA FÖR PRODUKTION ELLER OFFICIELLA RECENSIONER.</strong>"
-
-#~ msgid "This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s."
-#~ msgstr "Det här är en utvecklingsversion (även kallad Release Candidate) vilket innebär att mjukvaran har passerat beta-stadiet och bör vara en färdig produkt som passar för avancerade användare och recensenter. Nybörjare och de som använder kritiska applikationer bör vänta på den slutliga utgåvan som är planerad för %s."
-
-#~ msgid "May 2015"
-#~ msgstr "maj 2015"
-
-#~ msgid "Release Candidate is intended to identify any remaining bugs or missing packages."
-#~ msgstr " En Release Candidate är ämnad för att identifiera de återstående felen och saknade paket."
-
-#~ msgid "Looking for a stable release?"
-#~ msgstr "Letar du efter en stabil utgåva?"
-
-#~ msgid "Development roadmap"
-#~ msgstr "Utvecklingsplanering"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_5_Development#Development_Planning"
-
-#~ msgid "Features review"
-#~ msgstr "Funktioner"
-
-#~ msgid "https://wiki.mageia.org/en/FeatureMageia5_Review"
-#~ msgstr "https://wiki.mageia.org/en/FeatureMageia5_Review"
-
-#~ msgid "32bit"
-#~ msgstr "32-bitars"
-
-#~ msgid "64bit"
-#~ msgstr "64-bitars"
-
-#~ msgid "dualarch"
-#~ msgstr "32/64-bitars arkitektur"
-
-#~ msgid "Download Mageia 5 DVD, CD, LiveCD, network install ISO images."
-#~ msgstr "Ladda ner Mageia 5 DVD, CD, LiveCD och ISO-filer för installation via nätverk."
-
-#~ msgid "mageia, mageia 4, linux, free, download, iso, torrent, vm, http, ftp, rsync, bittorrent"
-#~ msgstr "mageia, mageia 4, linux, fri, nerladdning, iso, torrent, vm, http, ftp, rsync, bittorrent"
-
-#~ msgid "If you want to put the ISO on USB key, <span class=\"warn\">please DO NOT use Unetbootin</span>. Have a look <a href=\"%s\">here</a> for the alternative."
-#~ msgstr "Om du vill skriva ISO-filen till ett USB-minne, <span class=\"warn\">använd INTE Unetbootin</span>. Ta istället en titt <a href=\"%s\">här</a> för alternativ."
-
-#~ msgid "Mageia 5.1 is a <a href=\"%s\">maintenance</a> release for Mageia 5 with the current packages from update medias. It also has a fix for a syslinux bug which prevented some people installing from a burned cd/dvd."
-#~ msgstr "Mageia 5.1 än en <a href=\"%s\">underhållsversion</a> för Mageia 5 med aktuella programuppdateringar från uppdateringsmedier. Den har även en rättelse gällande ett programfel i syslinux som förhindrade vissa användare från att installera från en bränd CD/DVD."
-
-#~ msgid "size"
-#~ msgstr "Storlek"
-
-#~ msgid "Notes:"
-#~ msgstr "Noteringar:"
-
-#~ msgid "https://wiki.mageia.org/en/Available_locales"
-#~ msgstr "https://wiki.mageia.org/en/Available_locales"
-
-#~ msgid "These DVD and CD ISOs contains Free Software and some proprietary drivers."
-#~ msgstr "De här ISO-filerna för CD/DVD innehåller fri mjukvara och några patentskyddade drivrutiner."
-
-#~ msgid "The dualarch DVD contains only a minimal list of packages."
-#~ msgstr "DVD:n med stöd för båda arkitekturerna innehåller endast en minimal samling av program."
-
-#~ msgid "DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!"
-#~ msgstr "Använd INTE de här för att uppgradera från Mageia 3!"
-
-#~ msgid "Use above DVD or CD and see <a href=\"%s\" hreflang=\"en\">upgrade guide</a>."
-#~ msgstr "Använd istället ovannämnda DVD eller CD och läs <a href=\"%s\" hreflang=\"en\">uppgraderingsguiden</a>."
-
-#~ msgid "All languages"
-#~ msgstr "Alla språk"
-
-#~ msgid "English only"
-#~ msgstr "Endast engelska"
-
-#~ msgid "needed for some disc controllers, some network cards, etc."
-#~ msgstr "behövs för några skivstyrsenheter, nätverkskort osv."
-
-#~ msgid "February 1<sup>st</sup> 2014"
-#~ msgstr "1:a februari, 2014"
-
-#~ msgid "<a href=\"%s\">Release notes</a>"
-#~ msgstr "<a href=\"%s\">Versionsnyheter</a>"
-
-#~ msgid "<a href=\"%s\">Errata</a>"
-#~ msgstr "<a href=\"%s\">Errata</a>"
-
-#~ msgid "<a href=\"%s\">Get ISO on USB flash stick</a>"
-#~ msgstr "<a href=\"%s\">Skriv ISO-filen till ett USB-minne</a>"
-
-#~ msgid "Upgrading<br>from Mageia 3?"
-#~ msgstr "Uppgraderar du<br>från Mageia 3?"
-
-#~ msgid "Looking for Mageia 3?"
-#~ msgstr "Letar du efter Mageia 3?"
-
-#~ msgid "It is <a href=\"%s\">here now</a>."
-#~ msgstr "Den finns <a href=\"%s\">här nu</a>."
-
-#~ msgid "https://blog.mageia.org/en/2014/11/26/lets-say-goodbye-to-mageia-3/"
-#~ msgstr "https://blog.mageia.org/en/2014/11/26/lets-say-goodbye-to-mageia-3/"
-
-#~ msgid "You can <a href=\"%s\">help</a> us <a href=\"%s\">on Mageia 5</a>."
-#~ msgstr "<a href=\"%s\">Hjälp</a> oss med <a href=\"%s\">Mageia 5</a>."
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Release_Notes"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Release_Notes"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Errata"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Errata"
-
-#~ msgid "https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3"
-#~ msgstr "https://wiki.mageia.org/en/Mageia_4_Release_Notes#Att uppgradera_från_Mageia_3"
-
-#~ msgid "Mageia&nbsp;4"
-#~ msgstr "Mageia&nbsp;4"
-
-#~ msgid "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>."
-#~ msgstr "Vi har lagt till två nya grafiska miljöer: Mate och Cinnamon. Båda är tillgängliga i den klassiska DVD/ISO-installationen, och för att göra det mer användarvänligt har vi omstrukturerat <a href=\"%s\">valet för anpassad skrivbordsmiljö</a>."
-
-#~ msgid "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."
-#~ msgstr "Det har lagts ner en hel del arbete på Mageias programvara. Många paket har omarbetats från Gtk2 till Gtk3 för att använda mer moderna komponenter. Vi har också gjort om alla verktyg från det föråldrade \"usermode\" till \"poolkit\" när undantag behövs."
-
-#~ msgid "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."
-#~ msgstr "TexLive behövde runt 1GB data för installation. Nu är det uppdelat i tre paket vilket vanligtvis innebär en mycket mindre storlek."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
diff --git a/langs/tr/5.po b/langs/tr/5.po
index d38f9880a..998a3e3d1 100644
--- a/langs/tr/5.po
+++ b/langs/tr/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:12+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/mageia/language/tr/)\n"
@@ -380,7 +380,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">USB belleğe ISO yazdırma</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr "https://wiki.mageia.org/en/Kurulum_Ortam%C4%B1#Bir_USB_bellek_.C3.BCzerine_Mageia_ISO_atmak"
#: "/web/en/5/download_index.php +495"
@@ -543,6 +543,10 @@ msgstr "Çalışmalarımız, linux ve özgür yazılım topluluğunun mükemmel
msgid "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>."
msgstr "Mageia topluluğu oluşturan çok farklı takımların herhangi birine yeni katılanlara hoşgeldin diyoruz ve <a href=\"%s\">bize katılmanız</a> için sizi yüreklendiriyoruz."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Kurulum_Ortam%C4%B1#Bir_USB_bellek_.C3.BCzerine_Mageia_ISO_atmak"
+
#~ 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."
diff --git a/langs/uk/5.po b/langs/uk/5.po
index 06b56b344..728051ed0 100644
--- a/langs/uk/5.po
+++ b/langs/uk/5.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-18 07:26+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -380,8 +380,8 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">Отримати ISO на флеш-носії USB</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
-msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
#: "/web/en/5/download_index.php +495"
msgid "Newcomer? <a href=\"%s\">Here's a wiki page for you.</a>"
@@ -539,6 +539,10 @@ msgstr "Нашу роботу засновано на роботі ширшої
msgid "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>."
msgstr "Ми будемо раді будь-якому новому учаснику команд, які роблять Mageia спільнотою</a>. Нам буде дуже приємно, якщо ви до нас <a href=\"%s\">долучитеся</a>."
+#, fuzzy
+#~ msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+#~ msgstr "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
+
#~ 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, вони можуть бути непрацездатними. Якщо це саме так, скористайтеся образами, вказаними вище."
diff --git a/langs/ur/5.po b/langs/ur/5.po
index ac532fbe6..18ab35567 100644
--- a/langs/ur/5.po
+++ b/langs/ur/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 18:53+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/mageia/language/ur/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr ""
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/zh-cn/5.po b/langs/zh-cn/5.po
index 8279c65c0..ada708ddf 100644
--- a/langs/zh-cn/5.po
+++ b/langs/zh-cn/5.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-05-26 19:02+0000\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
@@ -378,7 +378,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">转储 ISO 到 U盘</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/langs/zh-tw/5.po b/langs/zh-tw/5.po
index 8cacee921..02d56b64a 100644
--- a/langs/zh-tw/5.po
+++ b/langs/zh-tw/5.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: mageia-i18n@mageia.org\n"
-"POT-Creation-Date: 2015-06-18 21:05:51+0000\n"
+"POT-Creation-Date: 2015-06-19 20:22:45+0000\n"
"PO-Revision-Date: 2015-06-18 02:28+0000\n"
"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/language/zh_TW/)\n"
@@ -380,7 +380,7 @@ msgid "<a href=\"%s\">Get ISO on USB flash drive</a>"
msgstr "<a href=\"%s\">將 ISO 裝到 USB 隨身碟上</a>"
#: "/web/en/5/download_index.php +494"
-msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive.3F"
+msgid "https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_drive"
msgstr ""
#: "/web/en/5/download_index.php +495"
diff --git a/lv/5_preview b/lv/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/lv/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/nb/5_preview b/nb/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/nb/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/nl/5_preview b/nl/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/nl/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/pl/5_preview b/pl/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/pl/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/pt-br/5_preview b/pt-br/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/pt-br/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/pt/5_preview b/pt/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/pt/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/ro/5_preview b/ro/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/ro/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/ru/5_preview b/ru/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/ru/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/sco/5_preview b/sco/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/sco/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/sl/5_preview b/sl/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/sl/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/sq/5_preview b/sq/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/sq/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/sv/5_preview b/sv/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/sv/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/tr/5_preview b/tr/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/tr/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/uk/5_preview b/uk/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/uk/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/ur/5_preview b/ur/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/ur/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/zh-cn/5_preview b/zh-cn/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/zh-cn/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file
diff --git a/zh-tw/5_preview b/zh-tw/5_preview
deleted file mode 120000
index 41ca34563..000000000
--- a/zh-tw/5_preview
+++ /dev/null
@@ -1 +0,0 @@
-../en/5_preview/ \ No newline at end of file