Scott Ritchie : Update Ubuntu download page

[Jeremy Newman]

Module: website
Branch: master
Commit: 552cb6f5dfe5debda894af2d4b0bc9ba628d0f3f
URL:    http://source.winehq.org/git/website.git/?a=commit;h=552cb6f5dfe5debda894af2...

Author: Scott Ritchie 
Date:   Thu May 17 23:16:08 2012 -0700

Update Ubuntu download page

Should have done this months ago...
> From 75c21d0e23bede6855e2215cc9c700453fa5f5ff Mon Sep 17 00:00:00 2001

From: Scott Ritchie 
Date: Fri, 18 May 2012 08:47:05 -0700
Subject: [website] Update Ubuntu download page (translation changes are
 find/replace so the links work, do not include text changes)

---

templates/de/download/ubuntu.template |   14 +++++++-------
 templates/en/download.template        |    2 +-
 templates/en/download/ubuntu.template |   24 ++++++++++++------------
 templates/fr/download/ubuntu.template |   14 +++++++-------
 templates/pl/download/ubuntu.template |   10 +++++-----
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/templates/de/download/ubuntu.template b/templates/de/download/ubuntu.template
index 0afd7ce..de480f9 100644
--- a/templates/de/download/ubuntu.template
+++ b/templates/de/download/ubuntu.template
@@ -26,20 +26,20 @@ Wähle dann den <b>Software von Drittanbietern</b>-Reiter und klicke auf <b>Hinz

<h2>Warnung: Betapakete</h2>

-<p><i>Die 1.3 Pakete hier sind Betapakete. Das bedeutet, dass sie
+<p><i>Die 1.5 Pakete hier sind Betapakete. Das bedeutet, dass sie
 in regelmäßigen Abständen
 <a href="http://wiki.winehq.org/Regression">Regressionen</a> erleiden, wodurch
 eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die stabile Version
-Wine 1.2 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen.</i></p>
+Wine 1.4 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen.</i></p>

<h2>Installieren von Wine:</h2>

<p>Sobald du das WineHQ PPA Repository hinzugefügt hast, kannst du es installieren.</p>

-<p><i>Für die aktuellste Wine 1.3 Beta,
-<a href="apt://wine1.3">klicke diesen Link um das wine1.3 Paket zu installieren</a>.</i></p>
-<p><i>Für die ältere, stabile Wine 1.2 Version,
-<a href="apt://wine1.3">klicke diesen Link um das wine1.2 Paket zu installieren</a>.</i></p>
+<p><i>Für die aktuellste Wine 1.5 Beta,
+<a href="apt://wine1.5">klicke diesen Link um das wine1.5 Paket zu installieren</a>.</i></p>
+<p><i>Für die ältere, stabile Wine 1.4 Version,
+<a href="apt://wine1.5">klicke diesen Link um das wine1.4 Paket zu installieren</a>.</i></p>

<h2>Aktualisierung auf eine neue Ubuntuversion</h2>

@@ -58,6 +58,6 @@ Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal).</

<p>Aktualisiere dann die APT-Paketinformationen durch Ausführen von '<b>sudo apt-get
 update</b>'. Du kannst nun Wine durch Ausführen von '<b>sudo apt-get
-install wine1.3</b>' im Terminal installieren.</p>
+install wine1.5</b>' im Terminal installieren.</p>

<p>Wenn du das PPA durchsuchen willst, kannst du es <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">bei Launchpad anschauen</a>.</p>
diff --git a/templates/en/download.template b/templates/en/download.template
index 9bf08d3..5b90bf3 100644
--- a/templates/en/download.template
+++ b/templates/en/download.template
@@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site.</p>
       <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a>
     </td>
     <td> <b><a href="{$root}/download/ubuntu">Download Ubuntu packages</a></b> 
-     - binary and source .debs for Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), and Natty (11.04)
+     - binary and source .debs for Ubuntu Oneiric (11.10), and Precise (12.04)
     <td><a href="mailto:[e-mail]">Scott Ritchie</a></td>
   </tr>

diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template
index 862f2c0..2a02c90 100644
--- a/templates/en/download/ubuntu.template
+++ b/templates/en/download/ubuntu.template
@@ -13,11 +13,11 @@ latest Wine package you can use WineHQ's by following these instructions.

<h2>Adding the WineHQ PPA Repository:</h2>

-<p>Open the Software Sources menu by going to <b>Applications->Ubuntu Software 
-Center</b>, then selecting <b>Edit->Software Sources</b>. Choose the <b>Other 
+<p>Open the Software Sources menu by launching the <b>Ubuntu Software 
+Center</b> and selecting <b>Edit->Software Sources</b>. Choose the <b>Other 
 Software</b> tab and click <b>Add</b>.</p>

-<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Other Software" border="0">
+<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Software Center->Edit->Software Sources->Other Software" border="0">

<p>Then, <b>copy and paste the line below</b>.</p>

@@ -25,25 +25,25 @@ Software</b> tab and click <b>Add</b>.</p>

<h2>Warning: Beta packages</h2>

-<p><i>The 1.3 packages here are beta packages.  This means they will 
+<p><i>The 1.5 packages here are beta packages.  This means they will 
 periodically suffer from 
 <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an 
-update may break functionality in Wine. If the stable 1.2 Wine version works 
+update may break functionality in Wine. If the stable 1.4 Wine version works 
 for you, then you may not want to use these beta packages.</i></p>

<h2>Installing Wine:</h2>

<p>Once you have added the WineHQ PPA Repository, you are ready to install.</p>

-<p><i>To get the most recent Wine 1.3 beta, 
-<a href="apt://wine1.3">click this link to install the wine1.3 package</a>.</i></p>
-<p><i>To install the older, stable Wine 1.2 version, 
-<a href="apt://wine1.2">click this link to install the wine1.2 package</a>.</i></p>
+<p><i>To get the most recent Wine 1.5 beta, 
+<a href="apt://wine1.5">click this link to install the wine1.5 package</a>.</i></p>
+<p><i>To install the older, stable Wine 1.4 version, 
+<a href="apt://wine1.4">click this link to install the wine1.4 package</a>.</i></p>

<h2>Upgrading to a new version of Ubuntu</h2>

-<p>If you are upgrading the entire system, such as going from Ubuntu 10.04 to 
-10.10, you will need to come back to this page and add the repository again. 
+<p>If you are upgrading the entire system, such as going from Ubuntu 11.10 to 
+12.04, you will need to come back to this page and add the repository again. 
 The built in update manager will not switch the Wine repository automatically.
 </p>

@@ -56,6 +56,6 @@ may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives.</p>

<p>Then update APT package information by running '<b>sudo apt-get 
 update</b>'. You can now install Wine by typing '<b>sudo apt-get 
-install wine1.3</b>'.</p>
+install wine1.5</b>'.</p>

<p>If you'd like to browse the PPA manually, you can <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visit its Launchpad page</a>.</p>
diff --git a/templates/fr/download/ubuntu.template b/templates/fr/download/ubuntu.template
index 7b1fb2e..cc20744 100644
--- a/templates/fr/download/ubuntu.template
+++ b/templates/fr/download/ubuntu.template
@@ -27,10 +27,10 @@ alt="Système->Administration->Sources de logiciels->Autres logiciels" border="0

<h2>Avertissement : paquets bêta</h2>

-<p><i>Les paquets 1.3 sont des paquets bêta, c.-à-d. qu'ils
+<p><i>Les paquets 1.5 sont des paquets bêta, c.-à-d. qu'ils
 peuvent à l'occasion souffrir de
 <a href="http://wiki.winehq.org/Regression">régressions</a>. Par conséquent, une
-mise à jour peut casser une fonctionnalité dans Wine. Si la version stable 1.2
+mise à jour peut casser une fonctionnalité dans Wine. Si la version stable 1.4
 de Wine fonctionne dans votre cas, vous ne devriez pas utiliser de paquets bêta.</i></p>

@@ -39,10 +39,10 @@ de Wine fonctionne dans votre cas, vous ne devriez pas utiliser de paquets bêta
 <p>Une fois le dépôt PPA de WineHQ ajouté, l'installation peut se
 poursuivre.</p>

-<p><i>Pour la version bêta 1.3 la plus récente,
-<a href="apt://wine1.3">utilisez ce lien pour installer le paquet wine1.3</a>.</i></p>
-<p><i>Pour la version stable 1.2 (plus ancienne)
-<a href="apt://wine1.2">utilisez ce lien pour installer le paquet wine1.2</a>.</i></p>
+<p><i>Pour la version bêta 1.5 la plus récente,
+<a href="apt://wine1.5">utilisez ce lien pour installer le paquet wine1.5</a>.</i></p>
+<p><i>Pour la version stable 1.4 (plus ancienne)
+<a href="apt://wine1.4">utilisez ce lien pour installer le paquet wine1.4</a>.</i></p>

<h2>Mise à niveau vers une nouvelle version d'Ubuntu</h2>

@@ -62,6 +62,6 @@ Kubuntu, Xubuntu ou d'autres distributions dérivées.</p>

<p>Mettez ensuite à jour les informations sur les paquets d'APT en exécutant
  « <b>sudo apt-get update</b> ». Vous pouvez dès lors installer Wine en tapant
- « <b>sudo apt-get install wine1.3</b> ».</p>
+ « <b>sudo apt-get install wine1.5</b> ».</p>

<p>Si vous voulez parcourir manuellement le PPA, vous pouvez <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visiter sa page Launchpad</a>.</p>
diff --git a/templates/pl/download/ubuntu.template b/templates/pl/download/ubuntu.template
index be7d33c..2ebe476 100644
--- a/templates/pl/download/ubuntu.template
+++ b/templates/pl/download/ubuntu.template
@@ -35,10 +35,10 @@ to instalowanie tych paczek może nie być konieczne.</i></p>

<p>Skoro już dodałeś/aś repozytorium WineHQ PPA to jesteś gotowy/a do instalacji.</p>

-<p><i>Aby używać najnowszego Wine 1.3 beta, 
-<a href="apt://wine1.3">kliknij na ten link, aby zainstalować paczkę wine1.3</a>.</i></p>
-<p><i>Aby używać ostatniej stabilnej wersji Wine 1.2, 
-<a href="apt://wine1.2">kliknij na ten link, aby zainstalować paczkę wine1.2</a>.</i></p>
+<p><i>Aby używać najnowszego Wine 1.5 beta, 
+<a href="apt://wine1.5">kliknij na ten link, aby zainstalować paczkę wine1.5</a>.</i></p>
+<p><i>Aby używać ostatniej stabilnej wersji Wine 1.4, 
+<a href="apt://wine1.4">kliknij na ten link, aby zainstalować paczkę wine1.4</a>.</i></p>

<h2>Aktualizacja do nowej wersji Ubuntu</h2>

@@ -57,6 +57,6 @@ Jest to użyteczne w przypadku Kubuntu, Xubuntu, i innych pochodnych Ubuntu.</p>

<p>Następnie zaktualizuj informacje o paczkach APT wpisując '<b>sudo apt-get 
 update</b>'. Teraz możesz zainstalować Wine wpisując w terminalu '<b>sudo apt-get 
-install wine1.3</b>'.</p>
+install wine1.5</b>'.</p>

<p>Jeżeli chciałbyś ręcznie przeglądać PPA, możesz odwiedzić <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">jego stronę na Launchpad</a>.</p>