]> git.ipfire.org Git - ipfire.org.git/commitdiff
Some text updates.
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 9 Sep 2012 13:40:29 +0000 (15:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 9 Sep 2012 13:40:29 +0000 (15:40 +0200)
www/templates/index.html
www/templates/static/development.html
www/templates/static/donation.html
www/templates/static/features/vpn/openvpn.html

index 18fc1373a6233f0c76957ef34f189596a8ad0dde..fc8fec2b1efc9ee77e241e994875c9c13dcb8802 100644 (file)
@@ -47,6 +47,7 @@
                                                </p>
                                                <p>
                                                        IPFire ist einfach, schnell und <a href="/features/itsfree">kostet nichts</a>.
+                                                       Das Projekt finanziert sich allein durch <a href="/donate">Spenden</a>.
                                                </p>
                                        {% else %}
                                                <p>
@@ -63,6 +64,7 @@
                                                </p>
                                                <p>
                                                        IPFire is easily deployed, fast and <a href="/features/itsfree">costs nothing</a>.
+                                                       The project is entirely funded by <a href="/donate">donations</a>.
                                                </p>
                                        {% end %}
                                        <hr>
index ebe9d3db150be9998ee41eb23e0f5659a8ab8889..5974ba69db2dcc082b2b19e1f5a3812eac6c7cbf 100644 (file)
@@ -46,7 +46,7 @@
                        {% if lang == "de" %}
                                <p>
                                        Der Bugtracker ist ein Tool, welches helfen soll bei
-                                       der Fehlerbehebung nicht den Pfaden zu verlieren.
+                                       der Fehlerbehebung nicht den Faden zu verlieren.
                                        Jeder Schritt, der unternommen wird, kann hier nachverfolgt
                                        werden.
                                </p>
                        <h3>{{ _("How to submit patches?") }}</h3>
                        {% if lang == "de" %}
                                <p>
-                                       Die IPFire Entwickler freuen sich jeden Beitrag zur Software.
+                                       Die IPFire Entwickler freuen sich über jeden Beitrag zur Software.
                                        Patches, welche Fehler beheben, Verbesserungen implementieren
                                        oder neue Funktionen hinzufügen sind willkommen.
                                </p>
                                <p>
                                        Um den Integrationsprozess in die Distribution verfolgen
                                        zu können, bitten wir einen <a href="http://bugtracker.ipfire.org/">Bugreport</a>
-                                       zu eröffnen, an welchen der Patch angehangen ist, sowie alle
+                                       zu eröffnen, an welchen der Patch angehangen worden ist, sowie alle
                                        anderen benötigten Daten.
                                </p>
                        {% else %}
                        {% if lang == "de" %}
                                <h4>IPFire 2.x</h4>
                                <p>
-                                       Im der <a href="http://wiki.ipfire.org/{{ lang }}/development/language">Übersetzungsanleitung</a>
+                                       In der <a href="http://wiki.ipfire.org/{{ lang }}/development/language">Übersetzungsanleitung</a>
                                        finden sich Informationen darüber, wie man das Webinterface von IPFire 2
                                        übersetzt.
                                </p>
index 9db4d76e083b660032deaac67907163351363869..8b785bc48ac897ccb11db0795fafa4639615c87c 100644 (file)
@@ -8,7 +8,7 @@
        </div>
 
        <div class="row">
-               <div class="span7 offset1">
+               <div class="span10 offset1">
                        {% if lang == "de" %}
                                <p>
                                        IPFire ist kostenlos und das Projekt hat keine direkten
                                </p>
                        {% end %}
                </div>
+       </div>
 
-               <div class="span3">
-                       <br><br><br><br>
+       <hr>
+
+       <div class="row">
+               <div class="span5 offset1">
                        {% if lang == "de" %}
+                               <h2>Über Paypal spenden</h2>
+                               <br><br>
+
                                <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
                                        <input type="hidden" name="cmd" value="_s-xclick">
                                        <input type="hidden" name="hosted_button_id" value="Z44GQ52ZHKVFW">
                                        <input type="image" src="https://www.paypalobjects.com/de_DE/DE/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="Jetzt einfach, schnell und sicher online bezahlen – mit PayPal.">
                                        <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
                                </form>
+
+                               <p>
+                                       <em>
+                                               Falls du keinen PayPal-Account hast,
+                                               kann mit PayPal auch über Kreditkarte gespendet
+                                               werden. Dafür einfach auf den Button klicken.
+                                       </em>
+                               </p>
                        {% else %}
+                               <h2>Donate with PayPal</h2>
+                               <br><br>
+
                                <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
                                        <input type="hidden" name="cmd" value="_s-xclick">
                                        <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
                                        <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
                                        <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
                                </form>
+
+                               <p>
+                                       <em>
+                                               If don't have or want a PayPal account,
+                                               you can also donate with your credit card.
+                                               Just click on the button.
+                                       </em>
+                               </p>
                        {% end %}
                </div>
-       </div>
-
-       <hr>
 
-       <div class="row">
-               <div class="span10 offset1">
+               <div class="span5">
                        {% if lang == "de" %}
+                               <h2>Überweisung</h2>
                                <p>
-                                       <em>
-                                               Falls du keinen PayPal-Account hast oder haben
-                                               möchtest, so kann auch mit Kreditkarte gespendet
-                                               werden. Dafür einfach auf den Button klicken.
-                                       </em>
+                                       Ebenso ist eine Spende auf ein Bankkonto möglich.
                                </p>
+
+                               <h4>Euro-Überweisung/SEPA</h4>
+                               <blockquote>
+                                       IBAN: DE86 4265 0150 1020 0768 89<br>
+                                       BIC-/SWIFT-Code: WELADED1REK
+                               </blockquote>
+
+                               <h4>Überweisung innerhalb Deutschland</h4>
+                               <blockquote>
+                                       Kontoinhaber: Michael Tremer<br>
+                                       Kontonummer: 1020076889<br>
+                                       Bankleitzahl: 426 501 50
+                               </blockquote>
                        {% else %}
+                               <h2>Bank Transfer</h2>
                                <p>
-                                       <em>
-                                               If don't have or want a PayPal account,
-                                               you can also donate with your credit card.
-                                               Just click on the button.
-                                       </em>
+                                       It is also possible to transfer donations into
+                                       our bank account.
                                </p>
+
+                               <h4>euro bank transfer</h4>
+                               <blockquote>
+                                       IBAN: DE86 4265 0150 1020 0768 89<br>
+                                       BIC-/SWIFT-Code: WELADED1REK
+                               </blockquote>
+
+                               <h4>bank transfer within Germany</h4>
+                               <blockquote>
+                                       Bank account owner: Michael Tremer<br>
+                                       Bank account number: 1020076889<br>
+                                       Bank code: 426 501 50
+                               </blockquote>
                        {% end %}
                </div>
        </div>
index d31affae2a79315a48169432aca358b5f82b3dea..c4cad025fa2d0e24eb12b0e6a15c91fa583dc14f 100644 (file)
@@ -11,7 +11,7 @@
                <div class="span9">
                        {% if lang == "de" %}
                                <p>
-                                       Unter den OpenSoure-SSL-VPNs ist OpenVPN ein häufig angetroffener und
+                                       Unter den Open Source SSL-VPNs ist OpenVPN ein häufig angetroffener und
                                        beliebter Vertreter, dessen einfache Konfiguration über das IPFire-
                                        Webinterface noch einmal erleichtert wird. Die Firewall-Einstellungen
                                        werden von IPFire automatisch geregelt, ebenso werden die benötigten
                                        Client-Paket heruntergeladen, verteilt und mit einem weiteren Klick
                                        ausgeführt werden.
                                </p>
-
                                <p>
-                                       Durch die hohe Kompatibilität der Software zu anderen Betriebssystemen
-                                       eignet sich OpenVPN zur Anbindung sogenannter Roadwarrior-Clients und
-                                       Ad-Hoc-Verbindungen sehr gut. Eine leicht zu konfigurierende, auf
-                                       Zertifikaten basierende, verschlüsselte Anbindung aus dem Internet
-                                       auf die Firmendaten oder das Zuhause liegende Netzwerk kann nicht
+                                       Durch die hohe Kompatibilität zu anderen Betriebssystemen
+                                       (Microsoft Windows, Mac OSX, Linux, Android, uvam.)
+                                       eignet sich OpenVPN bestens zur Anbindung sogenannter Roadwarrior-Clients.
+                                       Eine leicht zu konfigurierende, durch Zertifikate gesicherte,
+                                       verschlüsselte Anbindung aus dem Internet
+                                       auf Firmendaten oder das Zuhause liegende Netzwerk kann nicht
                                        nur über Notebooks, sondern unter anderem auch über PDAs, Smartphones
                                        oder Tablets hergestellt werden.
                                </p>
-
                                <p>
-                                       Sicherheit und eine geeignete Verschlüsselung ist auch im lokalen
-                                       Netzwerk ein wichtiges Thema. IPFire bietet über sein Webinterface
-                                       die Möglichkeit an, WLAN-Verbindungen über Zertifikate zu schützen,
-                                       was einen klaren Vorteil gegenüber den gängigen Router-Verschlüsselungen
-                                       wie WEP, WPA oder sogar WPA2 bedeutet, da Zertifikate gegenüber den
-                                       PSKs (Private Shared Keys) einen Bruteforce-Angriff quasi unmöglich
-                                       machen.
+                                       Doch neben der Anbindung von Laptops und anderen Handgeräten, kann
+                                       mit OpenVPN auch eine transparente Verbindung zu Filialen, Partnern
+                                       und für jeden beliebigen anderen Einsatz erstellt werden.
+                                       Das ermöglicht sicheren Zugriff auf ein gesamtes Netzwerk ohne
+                                       aufwändige Konfiguration.
                                </p>
                        {% else %}
                                <p>
-                                       Under the OpenSoure-SSL-VPNs, OpenVPN is a frequently-encountered and perhaps, the most 
-                                       popular representative. The relative ease of configuration has again, been made easier
+                                       OpenVPN is a frequently-encountered and most popular representative
+                                       of the class of Open Source SSL VPNs.
+                                       Its relative ease of configuration has again, been made easier
                                        by the IPFire web interface. The firewall settings are controlled
                                        by IPFire automatically, as well as the required certificates will be
                                        generated with a few mouse clicks and can be downloaded and distributed
-                                       as a very compact client package. Clients can be anything, such as other routers, laptops/desktops, PDAs, smartphones or tablets.
+                                       as a very compact client package.
+                               </p>
+                               <p>
+                                       Due to its high compatibility to all sorts of operating systems,
+                                       such as Microsoft Windows, Mac OSX, Linux, Android and many more,
+                                       it is perfectly useful for roadwarrior connections.
+                                       With those, it is easy to connect your laptop, phone, tablet or
+                                       other devices to your company network, which makes it easy to
+                                       work from anywhere in the world.
+                               </p>
+                               <p>
+                                       But besides connecting portable devices, OpenVPN can also be used
+                                       to securely connect branches to the headquater.
+                                       This makes it easy to access resources on other networks
+                                       remotely without any complicated configuration on each client
+                                       on your local network.
                                </p>
                        {% end %}
                </div>