propagate from branch 'i2p.www' (head d53e5172a3a72c5817753b20c95afa1841124686)

to branch 'i2p.www.revamp' (head 69c08c82c7e3e80e4646a41d2cdfa6d07cef3427)
2013-01-02 21:55:24 +00:00
parent c36290c5c1 849283f3a2
commit 0be11b7669
9 changed files with 66 additions and 93 deletions
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@ -32,30 +32,27 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <div class="package">
  <h1>Mac OS X</h1>
  <div class="file">
-    <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.3.jar') }}">i2pinstall_0.9.3.jar</a>
+    <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.4-1_osx.jar') }}">i2pinstall_0.9.4-1_osx.jar</a>
    <div class="sig">
-      (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-      <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.3.jar.sig') }}">sig</a>)
+    (SHA256
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+      <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.4-1_osx.jar.sig') }}">sig</a>)
    </div>
  </div>
  <div class="details">
    Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> in a terminal to run the
    installer.
    You may be able to right-click and select
    &quot;Open with Java&quot;.
    <div class="warning">
      Due to <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-      will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-      automatically update to 0.9.4.
-      See <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/ticket/826">the ticket</a> for additional information,
-      links, and workarounds.
+      will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer above.
    </div>

    <h2>Command line (headless) install:</h2>
-    Download the 0.9.3 graphical installer file above and
-    run <code>java -jar i2pinstall_0.9.3.jar -console</code> from the command line.
+    Download the 0.9.4-1 OSX graphical installer file above and
+    run <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> from the command line.
  </div>
 </div>

--- a/www.i2p2/pages/translations/download_ar.html
+++ b/www.i2p2/pages/translations/download_ar.html
@ -43,28 +43,25 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>

 <li><b>OS X Graphical installer:</b><br />
-    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-    automatically update to 0.9.4.
-    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
-    links, and workarounds.
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer above
+    will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer below.
    <br>
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar">i2pinstall_0.9.4-1_osx.jar</a>
    (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar.sig">sig</a>)<br />
    Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> in a terminal to run the
    installer.
    You may be able to right-click and select
    &quot;Open with Java&quot;
  حمل الملف و نفّذه ،و اذا كان نظام التشغيل لديك غير ويندوز نفّذ الأمر التالي 
-     <code>java -jar i2pinstall_0.9.3.jar</code></li>.
+     <code>java -jar i2pinstall_0.9.4-1_osx.jar</code></li>.
 </li>

 <li><b>OS X</b> التثبيت عن طريق سطر الأوامر :<br />
    حمل ملف التثبيت عن طريق الواجهة الرسومية المذكور مسبقاً ثمّ نفذ الأمر
-    <code>java -jar i2pinstall_0.9.3.jar -console</code> في سطر الأوامر لديك
+    <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> في سطر الأوامر لديك
    هذا ينطبق على أنظمة ويندوز و لينكس و ما كنتوش (نعم ،حقاً !) 
 </li>

--- a/www.i2p2/pages/translations/download_cs.html
+++ b/www.i2p2/pages/translations/download_cs.html
@ -35,25 +35,22 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>

 <li><b>OS X Graphical installer:</b><br />
-    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-    automatically update to 0.9.4.
-    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
-    links, and workarounds.
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer above
+    will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer below.
    <br>
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar">i2pinstall_0.9.4-1_osx.jar</a>
    (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar.sig">sig</a>)<br />
    Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> in a terminal to run the
    installer.
    You may be able to right-click and select
    &quot;Open with Java&quot;.
 </li>

 <li><b>OS X Instalace z příkazové řádky:</b><br />
-    Stáhněte si grafický instalační program (viz výše) a spusťte ho příkazem <code>java -jar i2pinstall_0.9.3.jar -console</code>
+    Stáhněte si grafický instalační program (viz výše) a spusťte ho příkazem <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code>
 </li>

 <li><b>Instalace ze zdrojového kódu:</b><br />
--- a/www.i2p2/pages/translations/download_de.html
+++ b/www.i2p2/pages/translations/download_de.html
@ -39,18 +39,15 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <li><a href="/debian.html">Pakete f&uuml;r Debian &amp; Ubuntu</a></li>

 <li><b>OS X Graphical installer:</b><br />
-    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-    automatically update to 0.9.4.
-    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
-    links, and workarounds.
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer above
+    will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer below.
    <br>
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar">i2pinstall_0.9.4-1_osx.jar</a>
    (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar.sig">sig</a>)<br />
    Hole die Datei und f&uuml;hre sie mit Doppelklick aus (falls es funktioniert)
-    oder gebe <code>java -jar i2pinstall_0.9.3.jar</code> in einm Terminal ein um
+    oder gebe <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> in einm Terminal ein um
    die Installation zu starten.
    Auf einigen Plattformen muss die Datei gegebenfall mit Rechts-Klick und der 
    Option "&Ouml;ffne mit Java" ge&ouml;ffnet werden.
@ -58,7 +55,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995

 <li><b>OS X Kommandozeilen (Headless) Installation:</b><br />
    Downloade die normale Installationsdatei von oben und rufe
-    <code>java -jar i2pinstall_0.9.3.jar -console</code> in der Kommandozeile auf.
+    <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> in der Kommandozeile auf.
 </li>

 <li><b>Quelltext Installation:</b><br />
--- a/www.i2p2/pages/translations/download_el.html
+++ b/www.i2p2/pages/translations/download_el.html
@ -40,18 +40,15 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <li><a href="/debian.html">Πακέτα για Debian &amp; Ubuntu</a></li>

 <li><b>OS X Graphical installer:</b><br />
-    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-    automatically update to 0.9.4.
-    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
-    links, and workarounds.
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer above
+    will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer below.
    <br>
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar">i2pinstall_0.9.4-1_osx.jar</a>
    (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar.sig">sig</a>)<br />
    Κατεβάστε αυτό το αρχείο και κάντε διπλό "κλικ" (εάν δουλεύει) ή
-    πληκτρολογήστε <code>java -jar i2pinstall_0.9.3.jar</code> στη γραμμή εντολών
+    πληκτρολογήστε <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> στη γραμμή εντολών
    για να τρέξετε την εγκατάσταση.
    Σε μερικές πλατφόρμες μπορείτε να κάνετε δεξιό "κλικ" και να επιλέξετε
    &quot;Open with Java&quot;.
@ -59,7 +56,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995

 <li><b>Εγκατάσταση από γραμμή εντολών (headless) για OS X:</b><br />
    Κατεβάστε την εγκατάσταση με γραφικό περιβάλλον από παραπάνω και εκτελέστε
-    <code>java -jar i2pinstall_0.9.3.jar -console</code> στη γραμμή εντολών.
+    <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> στη γραμμή εντολών.
 </li>

 <li><b>Εγκατάσταση από πηγαίο κώδικα:</b><br />
--- a/www.i2p2/pages/translations/download_es.html
+++ b/www.i2p2/pages/translations/download_es.html
@ -39,18 +39,15 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>

 <li><b>OS X Graphical installer:</b><br />
-    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-    automatically update to 0.9.4.
-    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
-    links, and workarounds.
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer above
+    will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer below.
    <br>
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar">i2pinstall_0.9.4-1_osx.jar</a>
    (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar.sig">sig</a>)<br />
    Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> in a terminal to run the
    installer.
    You may be able to right-click and select
    &quot;Open with Java&quot;.
@ -58,7 +55,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995

 <li><b>OS X Instalación desde la línea de comandos (headless):</b><br />
    Descarga el archivo del instalador gráfico  y
-    arranca <code>java -jar i2pinstall_0.9.3.jar -console</code> desde la línea de comandos.
+    arranca <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> desde la línea de comandos.
 </li>

 <li><b>Instalación desde el código fuente:</b><br />
--- a/www.i2p2/pages/translations/download_fr.html
+++ b/www.i2p2/pages/translations/download_fr.html
@ -39,24 +39,21 @@ ou tapez <tt>java -version</tt> à l'invite de commande.
 <li><a href="/debian_fr.html">Packages for Debian &amp; Ubuntu</a></li>

 <li><b>OS X Graphical installer:</b><br />
-    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-    automatically update to 0.9.4.
-    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
-    links, and workarounds.
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer above
+    will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer below.
    <br>
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar">i2pinstall_0.9.4-1_osx.jar</a>
    (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar.sig">sig</a>)<br />
    Téléchargez ce fichier et exécutez-le.  
    Vous pouvez 
-    taper <code>java -jar i2pinstall_0.9.3.jar</code>
+    taper <code>java -jar i2pinstall_0.9.4-1_osx.jar</code>
 </li>

 <li><b>OS X Installation en ligne de commande (facile):</b><br />
    Téléchargez le fichier de l'installeur graphique ci-dessus et
-    exécutez <code>java -jar i2pinstall_0.9.3.jar -console</code> sur la ligne de commande.
+    exécutez <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> sur la ligne de commande.
 </li>

 <li><b>À partir des sources:</b><br />
--- a/www.i2p2/pages/translations/download_ru.html
+++ b/www.i2p2/pages/translations/download_ru.html
@ -41,25 +41,22 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>

 <li><b>OS X Graphical installer:</b><br />
-    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-    automatically update to 0.9.4.
-    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
-    links, and workarounds.
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer above
+    will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer below.
    <br>
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar">i2pinstall_0.9.4-1_osx.jar</a>
    (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar.sig">sig</a>)<br />
    Скачайте этот файл и запустите двойным кликом, или выполните в консоли
-    команду <code>java -jar i2pinstall_0.9.3.jar</code> для запуска инсталлятора.
+    команду <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> для запуска инсталлятора.
    На некоторых платформах вы можете вызвать контекстное меню и выбрать
    &quot;Open with Java&quot;.
 </li>

 <li><b>Установка из командной строки в OS X:</b><br /> 

-Скачайте графический инсталлятор по ссылке выше и запустите из командной строки <code>java -jar i2pinstall_0.9.3.jar -console</code> <br /> 
+Скачайте графический инсталлятор по ссылке выше и запустите из командной строки <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code> <br /> 
 </li>

 <li><b>Установка из исходного кода:</b><br />
--- a/www.i2p2/pages/translations/download_zh.html
+++ b/www.i2p2/pages/translations/download_zh.html
@ -37,26 +37,23 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>

 <li><b>OS X Graphical installer:</b><br />
-    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
-    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
-    automatically update to 0.9.4.
-    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
-    links, and workarounds.
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer above
+    will <b>NOT</b> work on OS X. Use the fixed 0.9.4-1 OSX installer below.
    <br>
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar">i2pinstall_0.9.4-1_osx.jar</a>
    (SHA256
-4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
-    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+9b652bfccae644a4f3aaa7917b656a914ba120b0f6e114f1d2d5520d0b0c01ff
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4-1_osx.jar.sig">sig</a>)<br />
    Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_0.9.4-1_osx.jar</code> in a terminal to run the
    installer.
    On some platforms you may be able to right-click and select
    &quot;Open with Java&quot;.
-   <br />下载以上文件并运行如果你不是 windows 用户，可以输入 <code>java -jar i2pinstall_0.9.3.jar</code>
+   <br />下载以上文件并运行如果你不是 windows 用户，可以输入 <code>java -jar i2pinstall_0.9.4-1_osx.jar</code>
 </li>

 <li><b>OS X</b> 命令行安装(即无头安装):<br />
-   下载上面的图形安装程序并在命令行状态下运行 <code>java -jar i2pinstall_0.9.3.jar -console</code>。
+   下载上面的图形安装程序并在命令行状态下运行 <code>java -jar i2pinstall_0.9.4-1_osx.jar -console</code>。
 </li>

 <li>用源码安装:<br />