March 2012 - Wine-commits - list.winehq.org

André Hentschel : winedev: Update gcov section.
by Alexandre Julliard 05 Mar '12

05 Mar '12

Module: docs Branch: master Commit: e471106bc5cff329ac058c2fe71a084876e9e460 URL: http://source.winehq.org/git/docs.git/?a=commit;h=e471106bc5cff329ac058c2fe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 5 19:25:53 2012 +0100 winedev: Update gcov section. --- en/winedev-otherdebug.sgml | 170 ++++++++++++++++---------------------------- 1 files changed, 62 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=e471106bc5cff329ac058…

1 0

Jeremy Newman : update address for wine development fund, change pay pal form, add google checkout as payment option
by Jeremy Newman 05 Mar '12

05 Mar '12

Module: website Branch: master Commit: 8ee2466d9e254fce62d3736f1be695156dbdd7a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=8ee2466d9e254fce62d373… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Mar 5 11:46:31 2012 -0600 update address for wine development fund, change pay pal form, add google checkout as payment option --- templates/en/contributing.template | 62 ++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 13 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index 027712a..5325db3 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -317,19 +317,55 @@ of further assistance please visit the SFC site.</p> <p>The Software Freedom Conservancy is a 501(c)(3) organization, and donations made through it are fully tax-deductible to the extent permitted by law.</p> + <p><strong>Ways to contribute:</strong></p> -<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> -<div> - <input type="hidden" name="cmd" value="_xclick"> - <input type="hidden" name="business" value="donate(a)winehq.org"> - <input type="hidden" name="item_name" value="Wine donation"> - <input type="image" src="{$root}/images/ppdonate.png" name="submit" - align="absmiddle" alt="Donate to Wine with PayPal!"> Our PayPal Account -</div> -</form> + +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> +<tr bgcolor="#ffffff"> + <td align="center"> + <script type="text/javascript"> + function validateAmount(amount){ + if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ + return true; + }else{ + alert('You must enter a valid donation.'); + amount.focus(); + return false; + } + } + </script> + <form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top"> + <input name="item_name_1" type="hidden" value="Directed Donation to the Wine Project via Software Freedom Conservancy"/> + <input name="item_description_1" type="hidden" value="A directed donation for the Wine project via the Software Freedom Conservancy"/> + <input name="item_quantity_1" type="hidden" value="1"/> + <input name="item_currency_1" type="hidden" value="USD"/> + <input name="item_is_modifiable_1" type="hidden" value="true"/> + <input name="item_min_price_1" type="hidden" value="10.0"/> + <input name="item_max_price_1" type="hidden" value="25000.0"/> + <input name="_charset_" type="hidden" value="utf-8"/> + $ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/><br /> + <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> + </form> + </td> + <td>via Google Checkout</td> +</tr> +<tr bgcolor="#ffffff"> + <td align="center"> + <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="PPdonateForm"> + <input type="hidden" name="cmd" value="_s-xclick"> + <input type="hidden" name="hosted_button_id" value="G9BDG2ABR7PYA"> + <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> + <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1"> + </form> + </td> + <td>via PayPal</td> +</tr> +</table> <p>You can also send cash, cheque or international money order in US funds to:</p> -<address>Wine Project -Software Freedom Conservancy -1995 Broadway FL 17 -New York, NY 10023-5882</address> + +<address>Wine Project<br> +Software Freedom Conservancy, Inc.<br> +137 MONTAGUE ST STE 380<br> +Brooklyn, NY 11201-3548<br> +USA</address>

1 0

Jeremy Newman : change paypal form, add google checkout to english version
by Jeremy Newman 05 Mar '12

05 Mar '12

Module: website Branch: master Commit: 17cde310a8e8fdd2be8fe74c93effb3b22807348 URL: http://source.winehq.org/git/website.git/?a=commit;h=17cde310a8e8fdd2be8fe7… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Mar 5 11:47:20 2012 -0600 change paypal form, add google checkout to english version --- templates/de/donate.template | 20 +++++++++--------- templates/en/donate.template | 44 +++++++++++++++++++++++++++++++++++------ templates/fr/donate.template | 19 ++++++++--------- templates/pl/donate.template | 15 ++++++------- 4 files changed, 63 insertions(+), 35 deletions(-) diff --git a/templates/de/donate.template b/templates/de/donate.template index 4524217..e071004 100644 --- a/templates/de/donate.template +++ b/templates/de/donate.template @@ -12,20 +12,12 @@ <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">Über diese Spendemöglichkeit</b></td> </tr> - <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donate(a)winehq.org"> - <input type="hidden" name="item_name" value="Wine donation"> - <input type="hidden" name="lc" value="DE"> - <input type="hidden" name="currency_code" value="EUR"> - </form> - <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="javascript:document.donateForm.submit();">Paypal</a> + <a href="javascript:document.PPdonateForm.submit();">Paypal</a> </td> <td valign="top"> - Mit <a href="javascript:document.donateForm.submit();">Paypal</a> kannst du per Kreditkarte oder Paypalkonto spenden. + Mit <a href="javascript:document.PPdonateForm.submit();">Paypal</a> kannst du per Kreditkarte oder Paypalkonto spenden. </td> </tr> @@ -50,3 +42,11 @@ </tr> </table> + +<form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="PPdonateForm" style="margin: 0; padding: 0;"> + <input type="hidden" name="cmd" value="_s-xclick"> + <input type="hidden" name="hosted_button_id" value="G9BDG2ABR7PYA"> + <input type="hidden" name="lc" value="DE"> + <input type="hidden" name="currency_code" value="EUR"> +</form> + diff --git a/templates/en/donate.template b/templates/en/donate.template index 7cce937..f17d447 100644 --- a/templates/en/donate.template +++ b/templates/en/donate.template @@ -12,18 +12,43 @@ <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">About this donation Option</b></td> </tr> - <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donate(a)winehq.org"> - <input type="hidden" name="item_name" value="Wine donation"> - </form> + <tr bgcolor="#ffffff"> + <td align="center"> + <script type="text/javascript"> + function validateAmount(amount){ + if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ + return true; + }else{ + alert('You must enter a valid donation.'); + amount.focus(); + return false; + } + } + </script> + <form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top" style="margin:0;padding:0;"> + <input name="item_name_1" type="hidden" value="Directed Donation to the Wine Project via Software Freedom Conservancy"/> + <input name="item_description_1" type="hidden" value="A directed donation for the Wine project via the Software Freedom Conservancy"/> + <input name="item_quantity_1" type="hidden" value="1"/> + <input name="item_currency_1" type="hidden" value="USD"/> + <input name="item_is_modifiable_1" type="hidden" value="true"/> + <input name="item_min_price_1" type="hidden" value="10.0"/> + <input name="item_max_price_1" type="hidden" value="25000.0"/> + <input name="_charset_" type="hidden" value="utf-8"/> + $ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/><br /> + <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> + </form> + </td> + <td valign="top"> + With Google Checkout you can donate per Credit Card. + </td> + </tr> <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="javascript:document.donateForm.submit();">PayPal</a> + <a href="javascript:document.PPdonateForm.submit();">PayPal</a> </td> <td valign="top"> - With <a href="javascript:document.donateForm.submit();">PayPal</a> you can donate per Credit Card or PayPal account. + With <a href="javascript:document.PPdonateForm.submit();">PayPal</a> you can donate per Credit Card or PayPal account. </td> </tr> @@ -48,3 +73,8 @@ </tr> </table> + +<form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="PPdonateForm" style="margin: 0; padding: 0;"> + <input type="hidden" name="cmd" value="_s-xclick"> + <input type="hidden" name="hosted_button_id" value="G9BDG2ABR7PYA"> +</form> diff --git a/templates/fr/donate.template b/templates/fr/donate.template index bf8e4a6..6290cd6 100644 --- a/templates/fr/donate.template +++ b/templates/fr/donate.template @@ -12,20 +12,12 @@ <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">À propos de cette alternative</b></td> </tr> - <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donate(a)winehq.org"> - <input type="hidden" name="item_name" value="Don au projet Wine"> - <input type="hidden" name="lc" value="FR"> - <input type="hidden" name="currency_code" value="EUR"> - </form> - <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="javascript:document.donateForm.submit();">Paypal</a> + <a href="javascript:document.PPdonateForm.submit();">Paypal</a> </td> <td valign="top"> - Avec <a href="javascript:document.donateForm.submit();">Paypal</a>, vous + Avec <a href="javascript:document.PPdonateForm.submit();">Paypal</a>, vous pouvez effectuer un don par carte de crédit ou via votre compte Paypal. </td> </tr> @@ -54,3 +46,10 @@ plus d'informations. </tr> </table> + +<form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="PPdonateForm" style="margin: 0; padding: 0;"> + <input type="hidden" name="cmd" value="_s-xclick"> + <input type="hidden" name="hosted_button_id" value="G9BDG2ABR7PYA"> + <input type="hidden" name="lc" value="FR"> + <input type="hidden" name="currency_code" value="EUR"> +</form> diff --git a/templates/pl/donate.template b/templates/pl/donate.template index fc22d1d..3b9335a 100644 --- a/templates/pl/donate.template +++ b/templates/pl/donate.template @@ -12,18 +12,12 @@ <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">O tej opcji darowizny</b></td> </tr> - <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> - <input type="hidden" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donate(a)winehq.org"> - <input type="hidden" name="item_name" value="Wine donation"> - </form> - <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="javascript:document.donateForm.submit();">Paypal</a> + <a href="javascript:document.PPdonateForm.submit();">Paypal</a> </td> <td valign="top"> - Z <a href="javascript:document.donateForm.submit();">Paypalem</a> możesz przekazać datki przez kartę kredytową lub przez konto Paypal. + Z <a href="javascript:document.PPdonateForm.submit();">Paypalem</a> możesz przekazać datki przez kartę kredytową lub przez konto Paypal. </td> </tr> @@ -48,3 +42,8 @@ </tr> </table> + +<form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="PPdonateForm" style="margin: 0; padding: 0;"> + <input type="hidden" name="cmd" value="_s-xclick"> + <input type="hidden" name="hosted_button_id" value="G9BDG2ABR7PYA"> +</form>

1 0

Andrew Eikum : Update English Software Freedom Conservancy URL
by Jeremy Newman 05 Mar '12

05 Mar '12

Module: website Branch: master Commit: 58b3d08278bf9ca044df56f23117bac5a2d61438 URL: http://source.winehq.org/git/website.git/?a=commit;h=58b3d08278bf9ca044df56… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 5 09:48:53 2012 -0600 Update English Software Freedom Conservancy URL --- templates/en/contributing.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index 7767a95..027712a 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -310,7 +310,7 @@ developers by collecting funds for developer meetings, such as Wine Conferences, or in some cases to purchase documentation.</p> <p>The organization that currently manages our donations is the -<a href="http://conservancy.softwarefreedom.org/">Software Freedom +<a href="http://www.sfconservancy.org/">Software Freedom Conservancy</a>. If you have any questions or are otherwise in need of further assistance please visit the SFC site.</p>

1 0

André Hentschel : Update Debian download info
by Jeremy Newman 05 Mar '12

05 Mar '12

Module: website Branch: master Commit: 92cec36f1853e40f7c7132861c7713571af65c34 URL: http://source.winehq.org/git/website.git/?a=commit;h=92cec36f1853e40f7c7132… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 3 14:07:59 2012 +0100 Update Debian download info for http://bugs.winehq.org/show_bug.cgi?id=29259 this is excluding hebrew... --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/fr/download.template | 2 +- templates/pl/download.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 6c76e9d..5db4166 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -71,7 +71,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/download/debian">Debian</a></b> - binär .debs für Debian Lenny, Squeeze und Sid</td> + binär .debs für Debian Sid</td> <td><a href="mailto:curan(a)debian.org">Kai Wasserbäch</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 70a1739..9797b1b 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -70,7 +70,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/download/debian">Download Debian packages</a></b> - - binary .debs for Debian Lenny, Squeeze and Sid</td> + - binary .debs for Debian Sid</td> <td><a href="mailto:curan(a)debian.org">Kai Wasserbäch</a></td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 7d1f609..48d54a3 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -75,7 +75,7 @@ center;"><b>Voyez la <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/download/debian">Paquets Debian</a></b> - - .deb binaires pour Debian Lenny, Squeeze et Sid</td> + - .deb binaires pour Debian Sid</td> <td><a href="mailto:curan(a)debian.org">Kai Wasserbäch</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 82e01de..5136b95 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -69,7 +69,7 @@ <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/download/deblenny">Pobierz paczki dla Debian</a></b> - - binarne paczki .deb dla Debian Lenny, Squeeze i Sid</td> + - binarne paczki .deb dla Debian Sid</td> <td><a href="mailto:curan(a)debian.org">Kai Wasserbäch</a></td> </tr>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.4-rc6
by Jeremy Newman 05 Mar '12

05 Mar '12

Module: website Branch: master Commit: 7f0f9929e7a8652e037608e578c061ed04dad78d URL: http://source.winehq.org/git/website.git/?a=commit;h=7f0f9929e7a8652e037608… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Mar 3 09:07:00 2012 +0100 Polish translation for release 1.4-rc6 --- news/pl/2012030201.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012030201.xml b/news/pl/2012030201.xml new file mode 100644 index 0000000..7691b04 --- /dev/null +++ b/news/pl/2012030201.xml @@ -0,0 +1,12 @@ +<news> +<date>Marzec 2, 2012</date> +<title>Wydano Wine 1.4-rc6</title> +<body> +<p> Wydanie rozwojowe Wine 1.4-rc6 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.4-rc6">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc6.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

André Hentschel : Update german download page
by Jeremy Newman 05 Mar '12

05 Mar '12

Module: website Branch: master Commit: aeac46724f2dd16eafb5ca1d3c1fa4f9afa4c7e1 URL: http://source.winehq.org/git/website.git/?a=commit;h=aeac46724f2dd16eafb5ca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 4 17:58:15 2012 +0100 Update german download page --- templates/de/download.template | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 5db4166..18fd2ef 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -105,10 +105,10 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> - <td> <b><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Mandriva</a></b> - binär .rpms für Mandriva Linux 2008, 2009 und 2010. Lade das 20010.2 Package herunter, falls Du eine - 2010.2 Version von Mandriva nutzt, z.B. 20010 Spring. Lade das 20010.0 Package herunter, falls Du die erste - Mandriva Version aus 20010 nutzt.</td> + <td> <b><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Mandriva</a></b> + binär .rpms für Mandriva Linux 2008, 2009 und 2010. Lade das 2010.2 Package herunter, falls Du eine + 2010.2 Version von Mandriva nutzt, z.B. 2010 Spring. Lade das 2010.0 Package herunter, falls Du die erste + Mandriva Version aus 2010 nutzt.</td> <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> </tr> @@ -125,7 +125,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <td align="center"><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> + <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> Quellcode für FreeBSD 5.3 und spätere Versionen</td> <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> </tr> @@ -134,37 +134,39 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <td align="center"><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search"> <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> </td> - <td> <b><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">PC-BSD</a></b> + <td> <b><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">PC-BSD</a></b> binär .pbi für PC-BSD (FreeBSD-basiertes Betriebssystem)</td> <td><a href="mailto:kris(a)pcbsd.com">Kris Moore</a></td> </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0"> + <td align="center"><a href="http://www.sunfreepacks.com/"> <img src="{$root}/images/distro/solaris.png" width="50" height="50" alt="Solaris 10" border="0"></a> </td> - <td> <b><a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0">Solaris 10, SXCE</a></b> + <td> <b><a href="http://www.sunfreepacks.com/">Solaris 10, SXCE</a></b> ASwine, ASwine-SXCE binär .pkg für Solaris 10 und SXCE x86</td> <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml"> + <td align="center"><a href="http://hub.opensolaris.org/bin/view/Community+Group+desktop/wine"> <img src="{$root}/images/distro/opensolaris.png" width="50" height="50" alt="OpenSolaris" border="0"></a> </td> - <td> <b><a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml">OpenSolaris</a></b> + <td> <b><a href="http://hub.opensolaris.org/bin/view/Community+Group+desktop/wine">OpenSolaris</a></b> binär .pkg für OpenSolaris x86</td> <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…"> - <img src="{$root}/images/distro/windows.png" width="50" height="54" alt="Windows" border="0"></a> + <td align="center"><a href="http://maemo.org/packages/view/wine/"> + <img src="{$root}/images/distro/maemo.png" width="50" height="50" alt="Maemo" border="0"></a> </td> - <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…">Windows</a></b> binär .zips</td> - <td><a href="mailto:ivanleo(a)gmail.com">Ivan Leo Puoti</a></td> + <td> <b><a href="http://maemo.org/packages/view/wine/">Maemo</a></b> + binär .deb für Maemo x86 und Maemo ARM</td> + <td><a href="http://maemo.org/profile/view/onion/">Kaj-Michael Lang</a></td> </tr> - + + </table>

1 0

André Hentschel : Update download page
by Jeremy Newman 05 Mar '12

05 Mar '12

Module: website Branch: master Commit: 90a8f645a788d9fc1b7c3a9e0185bcbeecc591f2 URL: http://source.winehq.org/git/website.git/?a=commit;h=90a8f645a788d9fc1b7c3a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 4 17:56:03 2012 +0100 Update download page --- images/distro/maemo.png | Bin 0 -> 1519 bytes templates/en/download.template | 23 ++++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/images/distro/maemo.png b/images/distro/maemo.png new file mode 100644 index 0000000..72cbdb9 Binary files /dev/null and b/images/distro/maemo.png differ diff --git a/templates/en/download.template b/templates/en/download.template index 9797b1b..2d92f82 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -103,7 +103,7 @@ requested in exchange for hosting the Wine web site.</p> <td align="center"><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> - <td> <b><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Download Mandriva packages</a></b> + <td> <b><a href="http://sourceforge.net/projects/wine/files/Mandriva%20Packages/">Download Mandriva packages</a></b> - binary .rpms for Mandriva Linux 2008, 2009, and 2010. Download the 2010.2 package if your Mandriva is a 2010.2 release, eg. 2010 Spring. Download the 2010.0 package if your Mandriva is the first 2010 release.</td> <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> @@ -122,7 +122,7 @@ requested in exchange for hosting the Wine web site.</p> <td align="center"><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">Download FreeBSD packages</a></b> + <td> <b><a href="http://www.freshports.org/emulators/wine/">Download FreeBSD packages</a></b> - source for FreeBSD 5.3 or later</td> <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> </tr> @@ -131,29 +131,38 @@ requested in exchange for hosting the Wine web site.</p> <td align="center"><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search"> <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> </td> - <td> <b><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">Download PC-BSD packages</a></b> + <td> <b><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">Download PC-BSD packages</a></b> - binary packages .pbi for PC-BSD (FreeBSD based OS)</td> <td><a href="mailto:kris(a)pcbsd.com">Kris Moore</a></td> </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0"> + <td align="center"><a href="http://www.sunfreepacks.com/"> <img src="{$root}/images/distro/solaris.png" width="50" height="50" alt="Solaris 10" border="0"></a> </td> - <td> <b><a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0">Download Solaris 10, SXCE packages</a></b> + <td> <b><a href="http://www.sunfreepacks.com/">Download Solaris 10, SXCE packages</a></b> - ASwine, ASwine-SXCE binary package .pkg for Solaris 10 and SXCE x86</td> <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml"> + <td align="center"><a href="http://hub.opensolaris.org/bin/view/Community+Group+desktop/wine"> <img src="{$root}/images/distro/opensolaris.png" width="50" height="50" alt="OpenSolaris" border="0"></a> </td> - <td> <b><a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml">Download OpenSolaris packages</a></b> + <td> <b><a href="http://hub.opensolaris.org/bin/view/Community+Group+desktop/wine">Download OpenSolaris packages</a></b> - binary package .pkg for OpenSolaris x86</td> <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr> + <tr bgcolor="#ffffff"> + <td align="center"><a href="http://maemo.org/packages/view/wine/"> + <img src="{$root}/images/distro/maemo.png" width="50" height="50" alt="Maemo" border="0"></a> + </td> + <td> <b><a href="http://maemo.org/packages/view/wine/">Download Maemo packages</a></b> + - binary package .deb for Maemo x86 and Maemo ARM</td> + <td><a href="http://maemo.org/profile/view/onion/">Kaj-Michael Lang</a></td> + </tr> + </table>

1 0

Francois Gouget : po: A few typography fixes for the Chinese (Taiwan) translation.
by Alexandre Julliard 05 Mar '12

05 Mar '12

Module: wine Branch: master Commit: 121a1a03153f9834e6756cc6fe1308f842cac2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=121a1a03153f9834e6756cc6f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 5 11:14:25 2012 +0100 po: A few typography fixes for the Chinese (Taiwan) translation. --- po/zh_TW.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 58e195b..584d341 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2033,7 +2033,7 @@ msgstr "" #: cryptui.rc:188 msgid "&Install Certificate..." -msgstr "安裝憑證(&I)" +msgstr "安裝憑證(&I)..." #: cryptui.rc:189 msgid "Issuer &Statement" @@ -2065,7 +2065,7 @@ msgstr "檢視憑證(&V)" #: cryptui.rc:215 msgid "Certificate &status:" -msgstr "憑證狀態(&S)" +msgstr "憑證狀態(&S)：" #: cryptui.rc:221 msgid "Disclaimer" @@ -3183,7 +3183,7 @@ msgstr "開始下載 %s" #: ieframe.rc:80 msgid "Downloading %s" -msgstr "正在下載 %s ..." +msgstr "正在下載 %s" #: ieframe.rc:81 msgid "Asking for %s" @@ -7558,7 +7558,7 @@ msgstr "結束(&X)" #: shell32.rc:127 msgid "&About Control Panel" -msgstr "關於控制台(&A)..." +msgstr "關於控制台(&A)" #: shell32.rc:270 shell32.rc:285 msgid "Browse for Folder" @@ -8933,7 +8933,7 @@ msgstr "總是在最上面(&A)" #: clock.rc:42 msgid "&About Clock" -msgstr "關於時鐘(&A)..." +msgstr "關於時鐘(&A)" #: clock.rc:48 msgid "Clock" @@ -9773,7 +9773,7 @@ msgstr "頁尾(&F):" #: notepad.rc:104 msgid "Margins (millimeters)" -msgstr "邊界 (公釐):" +msgstr "邊界 (公釐)" #: notepad.rc:105 msgid "&Left:" @@ -10267,7 +10267,7 @@ msgstr "複製(&C)...\tF8" #: progman.rc:35 msgid "&Properties\tAlt+Enter" -msgstr "屬性(&P)...\tAlt+Enter" +msgstr "屬性(&P)\tAlt+Enter" #: progman.rc:37 msgid "&Execute..." @@ -11926,7 +11926,7 @@ msgstr "顯示進階選項(&A)" #: winecfg.rc:240 msgid "De&vice:" -msgstr "裝置(&V)" +msgstr "裝置(&V)：" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12585,7 +12585,7 @@ msgstr "重新命名(&N)..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "屬性(&I)...\tAlt+Enter" +msgstr "屬性(&I)\tAlt+Enter" #: winefile.rc:33 msgid "&Run..."

1 0

Francois Gouget : po: Fix some space issue s in the Norwegian Bokmål translation.
by Alexandre Julliard 05 Mar '12

05 Mar '12

Module: wine Branch: master Commit: 3d6f9eac8930786b903267b04c52f083e73a9fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6f9eac8930786b903267b04… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 5 11:14:39 2012 +0100 po: Fix some space issues in the Norwegian Bokmål translation. --- po/nb_NO.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 2b1762f..4a0edee 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7377,7 +7377,7 @@ msgid "" "File does not appear to be a valid OLE module. Unable to register OLE " "control." msgstr "" -"Filen ser ikke ut til å være en gyldig OLE-modul. Kunne ikke registrere OLE-" +"Filen ser ikke ut til å være en gyldig OLE-modul. Kunne ikke registrere OLE-" "kontroller." #: oledlg.rc:29 @@ -9673,7 +9673,7 @@ msgstr "" "IF [NOT] ERRORLEVEL nummer kommando\n" "\n" "I kommandoform nummer to må streng1 og streng2 omsluttes av doble\n" -" anførselstegn. Det skiller ikke mellom store og små bokstaver.\n" +"anførselstegn. Det skiller ikke mellom store og små bokstaver.\n" #: cmd.rc:100 msgid "" @@ -9748,7 +9748,7 @@ msgid "" "of a previous command before it scrolls off the screen.\n" msgstr "" "PAUSE viser meldingen 'Trykk Enter for å fortsette', og venter på at\n" -" brukeren trykker Enter. Dette er hovedsakelig nyttig i satsvise filer,\n" +"brukeren trykker Enter. Dette er hovedsakelig nyttig i satsvise filer,\n" "for å la brukeren lese utdata fra en tidligere kommando før den ruller\n" "vekk fra skjermen.\n" @@ -9858,7 +9858,7 @@ msgstr "" "mellomrom.\n" "\n" "I Wine er miljøvariablene i det underliggende operativsystemet\n" -" inkludert i Win32-miljøet, og det er derfor vanligvis mange flere\n" +"inkludert i Win32-miljøet, og det er derfor vanligvis mange flere\n" "verdier enn i et vanlig Win32-miljø. Vær oppmerksom på at det ikke går\n" "an å endre mijøet i det underliggende operativsystemet fra CMD.\n" @@ -9939,7 +9939,7 @@ msgid "" "The verify flag has no function in Wine.\n" msgstr "" "VERIFY brukes til å aktivere, deaktivere eller teste «verify»-flagget.\n" -" Gyldige måter er:\n" +"Gyldige måter er:\n" "\n" "VERIFY ON\tAktiverer flagget.\n" "VERIFY OFF\tDeaktiverer flagget.\n" @@ -10690,7 +10690,7 @@ msgid "" msgstr "" "Filen «%s» finnes ikke.\n" "\n" -" Opprette en ny fil?" +"Opprette en ny fil?" #: notepad.rc:79 msgid "" @@ -10700,7 +10700,7 @@ msgid "" msgstr "" "Filen «%s» er endret.\n" "\n" -" Lagre endringene?" +"Lagre endringene?" #: notepad.rc:80 msgid "'%s' could not be found."

1 0