February 2012 - Wine-Commits

Eduardo García : po: Update Spanish translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: bc24831f38977a43030ad9648a69753b701f347b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc24831f38977a43030ad9648… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Fri Feb 24 18:48:32 2012 +0100 po: Update Spanish translation. --- po/es.po | 629 +++++++++++++++++++++++++------------------------------------- 1 files changed, 253 insertions(+), 376 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc24831f38977a43030ad…

1 0

Zoltan Nagy : po: Update Hungarian translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: c1fa97389fd66655e4f4f294f8dfbde7478f1dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fa97389fd66655e4f4f294f… Author: Zoltan Nagy <e-sw(a)freemail.hu> Date: Fri Feb 24 20:11:20 2012 +0100 po: Update Hungarian translation. --- po/hu.po | 428 +++++++++++++++++++++++++------------------------------------- 1 files changed, 173 insertions(+), 255 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1fa97389fd66655e4f4f…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: fa7f50eac6420c6a6e8045e3cad706cacda297f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7f50eac6420c6a6e8045e3c… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Feb 24 16:28:16 2012 +0100 po: Update German translation. --- po/de.po | 213 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 108 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa7f50eac6420c6a6e804…

1 0

Francois Gouget : po: The Thai 'Time/Date' translation is incomplete so mark it as fuzzy.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 1d600b1f18c3dde2cbb714b00f18ed1e31cf0564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d600b1f18c3dde2cbb714b00… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:31:04 2012 +0100 po: The Thai 'Time/Date' translation is incomplete so mark it as fuzzy. --- po/th.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/th.po b/po/th.po index 64b2ac0..73b84a3 100644 --- a/po/th.po +++ b/po/th.po @@ -9917,6 +9917,7 @@ msgid "Select &all\tCtrl+A" msgstr "เลือกทั้งหมด\tCtrl+A" #: notepad.rc:47 +#, fuzzy msgid "&Time/Date\tF5" msgstr "วันที่/\tF5"

1 0

Francois Gouget : po: Fix some typography issues in the Norwegian Bokmål translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 2fa09b1b1048397ecbf7e64310979c6a6a419ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa09b1b1048397ecbf7e6431… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:43:35 2012 +0100 po: Fix some typography issues in the Norwegian Bokmål translation. --- po/nb_NO.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 11a4ac9..6b9d794 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -6952,7 +6952,7 @@ msgstr "Egenskapens nettverksstasjon mangler" #: msi.rc:60 msgid "feature from:" -msgstr "Egenskap fra::" +msgstr "Egenskap fra:" #: msi.rc:61 msgid "choose which folder contains %s" @@ -8011,7 +8011,7 @@ msgstr "Kjører på %s" #: shell32.rc:326 msgid "Wine was brought to you by:" -msgstr "Wine er laget av" +msgstr "Wine er laget av:" #: shell32.rc:334 msgid "" @@ -8634,7 +8634,7 @@ msgstr "Det oppgitte enhetshåndtaket er ugyldig." #: winmm.rc:34 #, fuzzy msgid "There is no driver installed on your system!" -msgstr "Det er ingen driver installert på systemet.\n" +msgstr "Det er ingen driver installert på systemet!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -9747,7 +9747,7 @@ msgstr "" "PAUSE viser meldingen 'Trykk Enter for å fortsette', og venter på at\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" +"vekk fra skjermen.\n" #: cmd.rc:149 #, fuzzy @@ -13186,7 +13186,7 @@ msgstr "" "Vil du virkelig fjerne stasjon C?\n" "\n" "De fleste Windows-programmer forventer at C finnes, og lager bråk hvis den " -"ikke er der. Husk å lage den på nytt hvis du fortsetter." +"ikke er der. Husk å lage den på nytt hvis du fortsetter!" #: winecfg.rc:74 #, fuzzy @@ -13204,9 +13204,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"Du har ikke en C-stasjon. Det er ikke så bra..\n" +"Du har ikke en C-stasjon. Det er ikke så bra.\n" "\n" -"Husk å trykke «Legg til» i stasjonsfanen for å lage en.\n" +"Husk å trykke «Legg til» i stasjonsfanen for å lage en!\n" #: winecfg.rc:90 msgid "Controls Background" @@ -14396,12 +14396,12 @@ msgstr "" #: wordpad.rc:187 #, fuzzy msgid "Invalid number format." -msgstr "Ugyldig tallformat" +msgstr "Ugyldig tallformat." #: wordpad.rc:188 #, fuzzy msgid "OLE storage documents are not supported." -msgstr "OLE storage-dokumenter støttes ikke" +msgstr "OLE storage-dokumenter støttes ikke." #: wordpad.rc:189 msgid "Could not save the file."

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 86ebf23b66c083987f057b027b882feca36ac6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ebf23b66c083987f057b027… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Feb 24 09:31:58 2012 +0100 po: Update Italian translation. --- po/it.po | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/po/it.po b/po/it.po index a51f06b..99e2df1 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-23 09:53+0100\n" +"PO-Revision-Date: 2012-02-24 09:28+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -1339,7 +1339,7 @@ msgstr "URL Revoca Netscape" #: crypt32.rc:63 msgid "Netscape CA Revocation URL" -msgstr "URL Revoca CA Netscape" +msgstr "URL Revoca AC Netscape" #: crypt32.rc:64 msgid "Netscape Cert Renewal URL" @@ -3019,7 +3019,7 @@ msgstr "Vietnamita" #: gdi32.rc:34 msgid "Thai" -msgstr "Thai" +msgstr "Tailandese" #: gdi32.rc:35 msgid "Japanese" @@ -4330,11 +4330,11 @@ msgstr "Operazione di I/O interrotta.\n" #: winerror.mc:1001 msgid "Overlapped I/O incomplete.\n" -msgstr "Overlapped I/O incompleto.\n" +msgstr "I/O sovrapposto incompleto.\n" #: winerror.mc:1006 msgid "Overlapped I/O pending.\n" -msgstr "Overlapped I/O in attesa.\n" +msgstr "I/O sovrapposto in attesa.\n" #: winerror.mc:1011 msgid "No access to memory location.\n" @@ -9225,7 +9225,7 @@ msgstr "" "\n" "Sintassi:\n" "ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [unità:][percorso]" -"[nomefile]\n" +"[nome_file]\n" " [/S [/D]]\n" "\n" "Dove:\n" @@ -9236,7 +9236,7 @@ msgstr "" " A File di archivio.\n" " S File di sistema.\n" " H File nascosto.\n" -" [unità:][percorso][nomefile]\n" +" [unità:][percorso][nome_file]\n" " Specifica uno o più file da elaborare con attrib.\n" " /S Elabora i file corrispondenti nella cartella attuale e in tutte le " "sottocartelle.\n" @@ -9288,7 +9288,7 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <nomefilebatch> si usa all'interno di un file batch per eseguire\n" +"CALL <nome_file_batch> si usa all'interno di un file batch per eseguire\n" "comandi da un altro file batch. Quando il file batch esiste, il controllo\n" "torna al file che l'ha chiamato. Il comando CALL può passare parametri alla\n" "procedura chiamata.\n" @@ -9314,7 +9314,7 @@ msgstr "CLS pulisce la schermata della console.\n" #: cmd.rc:45 msgid "COPY <filename> copies a file.\n" -msgstr "COPY <nomefile> copia un file.\n" +msgstr "COPY <nome_file> copia un file.\n" #: cmd.rc:46 msgid "CTTY changes the input/output device.\n" @@ -9326,7 +9326,7 @@ msgstr "DATE mostra o cambia l'orario di sistema.\n" #: cmd.rc:48 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <nomefile> cancella un file o un insieme di file.\n" +msgstr "DEL <nome_file> cancella un file o un insieme di file.\n" #: cmd.rc:49 msgid "DIR lists the contents of a directory.\n" @@ -9354,7 +9354,7 @@ msgstr "" #: cmd.rc:61 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE <nomefile> cancella un file o un insieme di file.\n" +msgstr "ERASE <nome_file> cancella un file o un insieme di file.\n" #: cmd.rc:69 msgid "" @@ -9420,7 +9420,7 @@ msgid "" msgstr "" "IF è usato per eseguire condizionatamente un comando.\n" "\n" -"Sintassi: IF [NOT] EXIST nomefile comando\n" +"Sintassi: IF [NOT] EXIST nome_file comando\n" " IF [NOT] stringa1==stringa2 comando\n" " IF [NOT] ERRORLEVEL numero comando\n" "\n" @@ -9562,11 +9562,11 @@ msgstr "" #: cmd.rc:156 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" -msgstr "REN <nomefile> è la versione ridotta di RENAME. Rinomina un file.\n" +msgstr "REN <nome_file> è la versione ridotta di RENAME. Rinomina un file.\n" #: cmd.rc:157 msgid "RENAME <filename> renames a file.\n" -msgstr "RENAME <nomefile> rinomina un file.\n" +msgstr "RENAME <nome_file> rinomina un file.\n" #: cmd.rc:159 msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" @@ -10051,7 +10051,7 @@ msgstr "Strumento di Diagnostica DirectX" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "Uso: dxdiag [/whql:off | /whql:on] [/t nomefile | /x nomefile]" +msgstr "Uso: dxdiag [/whql:off | /whql:on] [/t nome_file | /x nome_file]" #: explorer.rc:28 msgid "Wine Explorer" @@ -10795,7 +10795,7 @@ msgstr "ID Applicazione" #: oleview.rc:134 msgid "Type Libraries" -msgstr "TypeLibrary" +msgstr "Librerie di tipi" #: oleview.rc:135 msgid "ver."

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 214859f754fb77f54a496217a3a26c9cbb4944c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=214859f754fb77f54a496217a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Feb 24 20:29:59 2012 +0200 po: Update Finnish translation. --- po/fi.po | 753 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 409 insertions(+), 344 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=214859f754fb77f54a496…

1 0

Fernando Martins : po: Update Portuguese translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 644ea68b41952b34c54c9cc4116891870d3eddf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644ea68b41952b34c54c9cc41… Author: Fernando Martins <fernando(a)cmartins.nl> Date: Sat Feb 25 09:27:14 2012 +0100 po: Update Portuguese translation. --- po/pt_PT.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index dd8f854..f363d45 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -117,7 +117,6 @@ msgid "Wine Gecko Installer" msgstr "Instalador Wine Gecko" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -131,8 +130,9 @@ msgstr "" "aplicações com HTML embutido funcionarem corretamente. O Wine pode " "automaticamente efetuar o download e instalá-lo por si.\n" "\n" -"Nota: é recomendável usar os pacotes da sua distribuição em vez disso.\n" -"Veja http://wiki.winehq.org/Gecko para mais detalhes." +"Nota: é recomendável usar os pacotes da sua distribuição em vez disso. Veja " +"<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " +"para mais detalhes." #: appwiz.rc:106 msgid "&Install"

1 0

Francois Gouget : po: Wrap the 'Caps Lock' Catalan warning tooltip like the English one.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: d6160b142b72cf91d0967f38959db17782792cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6160b142b72cf91d0967f389… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:46:01 2012 +0100 po: Wrap the 'Caps Lock' Catalan warning tooltip like the English one. --- po/ca.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ca.po b/po/ca.po index f176631..90f4b99 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1184,7 +1184,7 @@ msgstr "" "Tenir el bloqueig de majúscules activat pot causar que introduïu la\n" "contrasenya de forma incorrecta.\n" "\n" -"Premeu la tecla Bloc Maj en el vostre teclat per desactivar el bloqueig de " +"Premeu la tecla Bloc Maj en el vostre teclat per desactivar el bloqueig de\n" "majúscules abans d'introduir la vostre contrasenya." #: credui.rc:31

1 0

Francois Gouget : po: Remove some invalid Norwegian Bokmål shell folder name translations.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 5e0029ef8d55d725f778466ca3f7dc556c6cbbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0029ef8d55d725f778466ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:44:01 2012 +0100 po: Remove some invalid Norwegian Bokmål shell folder name translations. --- po/nb_NO.po | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 6b9d794..e0a2e8d 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8174,19 +8174,22 @@ msgstr "Dokumenter" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start-meny\\Programmer\\Administrative verktøy" +msgstr "Administrative verktøy" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Dokumenter\\Min musikk" +msgstr "Min musikk" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Dokumenter\\Mine bilder" +msgstr "Mine bilder" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Dokumenter\\Mine videoklipp" +msgstr "Mine videoklipp" #: shell32.rc:213 #, fuzzy

1 0

Francois Gouget : po: Tweak the wrapping o f the cmd MOVE Norwegian Bokmål usage message translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 216359c6fb4754b47bdf28ff6fcecb39b7c0c9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=216359c6fb4754b47bdf28ff6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:42:45 2012 +0100 po: Tweak the wrapping of the cmd MOVE Norwegian Bokmål usage message translation. --- po/nb_NO.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index abd3a87..11a4ac9 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -9706,8 +9706,7 @@ msgid "" "\n" "MOVE fails if the old and new locations are on different DOS drive letters.\n" msgstr "" -"MOVE flytter en fil eller katalog til et nytt sted innenfor\n" -"filsystemet.\n" +"MOVE flytter en fil eller katalog til et nytt sted innenfor filsystemet.\n" "\n" "Hvis elementet som flyttes er en katalog, flyttes også filene og\n" "underkatalogene i den.\n"

1 0

Francois Gouget : po: Remove a duplicate space after a comma in the German translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 3a696054583e42e492e6e333e4a9b7817c49b269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a696054583e42e492e6e333e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:32:36 2012 +0100 po: Remove a duplicate space after a comma in the German translation. --- po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index ad79df5..7eebab5 100644 --- a/po/de.po +++ b/po/de.po @@ -8646,7 +8646,7 @@ msgid "" "The specified command requires an alias, file, driver, or device name. " "Please supply one." msgstr "" -"Der angegebene Befehl erfordert einen Alias-, Datei-, Treiber- oder " +"Der angegebene Befehl erfordert einen Alias-, Datei-, Treiber- oder " "Gerätenamen. Bitte geben Sie einen an." #: winmm.rc:88

1 0

Francois Gouget : po: Remove or mark as fuzzy the invalid Danish shell folder names.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 77e7c01ea3bf3914597f2ca00b4dfa54028a0e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e7c01ea3bf3914597f2ca00… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:31:57 2012 +0100 po: Remove or mark as fuzzy the invalid Danish shell folder names. --- po/da.po | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/po/da.po b/po/da.po index b3ff75e..3d8d591 100644 --- a/po/da.po +++ b/po/da.po @@ -8053,7 +8053,7 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 msgid "My Music" @@ -8071,7 +8071,7 @@ msgstr "Skrivebord" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" @@ -8079,15 +8079,15 @@ msgstr "Skabeloner" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "History" +msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 msgid "My Pictures" @@ -8105,24 +8105,26 @@ msgstr "Documenter" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start MenuProgrammerAdministrative Værktøjer" +msgstr "Administrative Værktøjer" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Dokumenter\\Min Musik" +msgstr "Min Musik" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Dokumenter\\Mine Billeder" +msgstr "Mine Billeder" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Dokumenter\\Mine Film" +msgstr "Mine Film" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy

1 0

Francois Gouget : po: Fix the trailing ellipses in the Japanese translation .
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 85b58b7eba6165ca6a3549bc727bbc9c8af25c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b58b7eba6165ca6a3549bc7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 26 17:33:31 2012 +0100 po: Fix the trailing ellipses in the Japanese translation. --- po/ja.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index fa128ec..43ea2a5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6735,7 +6735,7 @@ msgstr "設定(&F)..." #: msvfw32.rc:40 msgid "&About" -msgstr "情報(&A)..." +msgstr "情報(&A)" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7682,7 +7682,7 @@ msgstr "終了(&X)" #: shell32.rc:127 msgid "&About Control Panel" -msgstr "バージョン情報(&A)..." +msgstr "バージョン情報(&A)" #: shell32.rc:270 shell32.rc:285 msgid "Browse for Folder" @@ -12510,7 +12510,7 @@ msgstr "既存のオーバーライド(&O):" #: winecfg.rc:190 msgid "&Edit..." -msgstr "編集(&E)" +msgstr "編集(&E)..." #: winecfg.rc:196 msgid "Edit Override" @@ -13498,7 +13498,7 @@ msgstr "上級(&E)" #: winemine.rc:42 msgid "&Custom..." -msgstr "盤面の変更(&C)" +msgstr "盤面の変更(&C)..." #: winemine.rc:44 msgid "&Fastest Times"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 3a7c9ad92e1bad6c1d986384f465e32211153aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7c9ad92e1bad6c1d986384f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Feb 27 13:18:05 2012 +0200 po: Update Swedish translation. --- po/sv.po | 755 +++++++++++++++++++++++--------------------------------------- 1 files changed, 278 insertions(+), 477 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a7c9ad92e1bad6c1d986…

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: cdac8cb17664947153f05093c0980a39bb75a45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdac8cb17664947153f05093c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 25 13:37:10 2012 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw1.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9f2b394..02c3b4d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -160,15 +160,15 @@ static void emit_tquad(void **ptr, WORD base_idx) inst->bSize = sizeof(*tri); inst->wCount = 2; - tri->v1 = base_idx; - tri->v2 = base_idx + 1; - tri->v3 = base_idx + 2; + U1(*tri).v1 = base_idx; + U2(*tri).v2 = base_idx + 1; + U3(*tri).v3 = base_idx + 2; tri->wFlags = D3DTRIFLAG_START; ++tri; - tri->v1 = base_idx + 2; - tri->v2 = base_idx + 1; - tri->v3 = base_idx + 3; + U1(*tri).v1 = base_idx + 2; + U2(*tri).v2 = base_idx + 1; + U3(*tri).v3 = base_idx + 3; tri->wFlags = D3DTRIFLAG_ODD; ++tri;

1 0

Alexander Morozov : msvcr90: realloc can move memory block.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 35a4b7dc0e78c8447ef1b0f28f8f3006bc49fd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a4b7dc0e78c8447ef1b0f28… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Feb 27 15:39:11 2012 +0400 msvcr90: realloc can move memory block. --- dlls/msvcr90/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 6b97e2f..663dd37 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -192,7 +192,7 @@ void* CDECL _recalloc(void* mem, size_t num, size_t size) } if(size>old_size) - memset((BYTE*)mem+old_size, 0, size-old_size); + memset((BYTE*)ret+old_size, 0, size-old_size); return ret; }

1 0

Stefan Dösinger : ddraw/tests: LONG/ ULONG and error checking fixes.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: f8d6d0300b026d39ac1ad82e3e8a2ed1fd1f5616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d6d0300b026d39ac1ad82e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 27 12:11:15 2012 +0100 ddraw/tests: LONG/ULONG and error checking fixes. --- dlls/ddraw/tests/ddraw1.c | 26 ++++++++++++++------------ dlls/ddraw/tests/ddraw2.c | 22 +++++++++++----------- dlls/ddraw/tests/ddraw4.c | 22 +++++++++++----------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 02c3b4d..3d173d9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -884,7 +884,7 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -895,7 +895,7 @@ static void test_viewport_interfaces(void) IDirectDraw *ddraw; IDirect3D *d3d; HRESULT hr; - LONG ref; + ULONG ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -921,9 +921,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D_CreateViewport(d3d, &viewport, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport); - ok(ref == 1, "Initial IDirect3DViewport refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == 2, "IDirect3D refcount is %d\n", ref); + ok(ref == 2, "IDirect3D refcount is %u\n", ref); /* E_FAIL return values are returned by Winetestbot Windows NT machines. While not supporting * newer interfaces is legitimate for old ddraw versions, E_FAIL violates Microsoft's rules @@ -936,25 +936,27 @@ static void test_viewport_interfaces(void) /* NULL iid: Segfaults */ hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport2, (void **)&viewport2); - ok(SUCCEEDED(hr) || broken(hr == E_FAIL), "Failed to QI IDirect3DViewport2, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE || broken(hr == E_FAIL), + "Failed to QI IDirect3DViewport2, hr %#x.\n", hr); if (viewport2) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); IDirect3DViewport2_Release(viewport2); viewport2 = NULL; } hr = IDirect3DViewport_QueryInterface(viewport, &IID_IDirect3DViewport3, (void **)&viewport3); - ok(SUCCEEDED(hr) || broken(hr == E_FAIL), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE || broken(hr == E_FAIL), + "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); if (viewport3) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport3); } @@ -963,9 +965,9 @@ static void test_viewport_interfaces(void) if (unknown) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 35c3a7b..ba8d3b6 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1179,7 +1179,7 @@ done: if (ddraw) IDirectDraw2_Release(ddraw); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -1190,7 +1190,7 @@ static void test_viewport_interfaces(void) IDirectDraw2 *ddraw; IDirect3D2 *d3d; HRESULT hr; - LONG ref, old_d3d_ref; + ULONG ref, old_d3d_ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -1216,9 +1216,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D2_CreateViewport(d3d, &viewport2, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 1, "Initial IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == old_d3d_ref, "IDirect3D2 refcount is %d\n", ref); + ok(ref == old_d3d_ref, "IDirect3D2 refcount is %u\n", ref); gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirectDrawGammaControl, (void **)&gamma); @@ -1232,21 +1232,21 @@ static void test_viewport_interfaces(void) if (viewport) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); IDirect3DViewport_Release(viewport); viewport = NULL; } hr = IDirect3DViewport2_QueryInterface(viewport2, &IID_IDirect3DViewport3, (void **)&viewport3); - ok(SUCCEEDED(hr), "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to QI IDirect3DViewport3, hr %#x.\n", hr); if (viewport3) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport3); } @@ -1255,9 +1255,9 @@ static void test_viewport_interfaces(void) if (unknown) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 89d5799..d9ed90d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1310,7 +1310,7 @@ static void test_texture_load_ckey(void) IDirectDraw4_Release(ddraw); } -static LONG get_refcount(IUnknown *test_iface) +static ULONG get_refcount(IUnknown *test_iface) { IUnknown_AddRef(test_iface); return IUnknown_Release(test_iface); @@ -1321,7 +1321,7 @@ static void test_viewport_interfaces(void) IDirectDraw4 *ddraw; IDirect3D3 *d3d; HRESULT hr, old_d3d_ref; - LONG ref; + ULONG ref; IDirect3DViewport *viewport; IDirect3DViewport2 *viewport2; IDirect3DViewport3 *viewport3; @@ -1346,9 +1346,9 @@ static void test_viewport_interfaces(void) hr = IDirect3D3_CreateViewport(d3d, &viewport3, NULL); ok(SUCCEEDED(hr), "Failed to create viewport, hr %#x.\n", hr); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 1, "Initial IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 1, "Initial IDirect3DViewport3 refcount is %u\n", ref); ref = get_refcount((IUnknown *)d3d); - ok(ref == old_d3d_ref, "IDirect3D3 refcount is %d\n", ref); + ok(ref == old_d3d_ref, "IDirect3D3 refcount is %u\n", ref); gamma = (IDirectDrawGammaControl *)0xdeadbeef; hr = IDirect3DViewport2_QueryInterface(viewport3, &IID_IDirectDrawGammaControl, (void **)&gamma); @@ -1362,9 +1362,9 @@ static void test_viewport_interfaces(void) if (viewport) { ref = get_refcount((IUnknown *)viewport); - ok(ref == 2, "IDirect3DViewport refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport_Release(viewport); viewport = NULL; } @@ -1374,20 +1374,20 @@ static void test_viewport_interfaces(void) if (viewport2) { ref = get_refcount((IUnknown *)viewport2); - ok(ref == 2, "IDirect3DViewport2 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport2 refcount is %u\n", ref); ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); IDirect3DViewport3_Release(viewport2); } - hr = IDirect3DViewport3_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown); + hr = IDirect3DViewport3_QueryInterface(viewport3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Failed to QI IUnknown, hr %#x.\n", hr); if (unknown) { ref = get_refcount((IUnknown *)viewport3); - ok(ref == 2, "IDirect3DViewport3 refcount is %d\n", ref); + ok(ref == 2, "IDirect3DViewport3 refcount is %u\n", ref); ref = get_refcount(unknown); - ok(ref == 2, "IUnknown refcount is %d\n", ref); + ok(ref == 2, "IUnknown refcount is %u\n", ref); IUnknown_Release(unknown); }

1 0

Christian Costa : d3dxof: Empty arrays can have the semicolon at the end or not so handle both cases and add tests for them .
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 6ee15adf4d607558827e467e4da37fb111fe783c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee15adf4d607558827e467e4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Feb 25 12:36:51 2012 +0100 d3dxof: Empty arrays can have the semicolon at the end or not so handle both cases and add tests for them. This fixes a regression introduced by commit 07931f73f0544e067c5a86b4ac92723c11600dd3. --- dlls/d3dxof/parsing.c | 6 +++++- dlls/d3dxof/tests/d3dxof.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index b2f51bb..f40c202 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1315,7 +1315,11 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) + /* Empty arrays can have the semicolon at the end or not so remove it if any and skip next check */ + if (!nb_elems && (check_TOKEN(buf) == TOKEN_SEMICOLON)) + get_TOKEN(buf); + + if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index c166054..0c3a295 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -101,7 +101,7 @@ static char template_syntax_empty_array[] = "DWORD dummy;\n" "}\n"; -static char object_syntax_empty_array[] = +static char object_syntax_empty_array_semicolon[] = "xof 0302txt 0064\n" "Buffer\n" "{\n" @@ -110,6 +110,15 @@ static char object_syntax_empty_array[] = "1234;\n" "}\n"; +static char object_syntax_empty_array_nosemicolon[] = +"xof 0302txt 0064\n" +"Buffer\n" +"{\n" +"0;\n" +"1234;\n" +"}\n"; + + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -502,8 +511,23 @@ static void test_syntax(void) hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_empty_array, sizeof(template_syntax_empty_array) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); - dxflm.lpMemory = &object_syntax_empty_array; - dxflm.dSize = sizeof(object_syntax_empty_array) - 1; + dxflm.lpMemory = &object_syntax_empty_array_semicolon; + dxflm.dSize = sizeof(object_syntax_empty_array_semicolon) - 1; + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + + ref = IDirectXFileEnumObject_Release(lpdxfeo); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + if (hr == DXFILE_OK) + { + ref = IDirectXFileData_Release(lpdxfd); + ok(ref == 0, "Got refcount %d, expected 0\n", ref); + } + + dxflm.lpMemory = &object_syntax_empty_array_nosemicolon; + dxflm.dSize = sizeof(object_syntax_empty_array_nosemicolon) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); @@ -516,6 +540,7 @@ static void test_syntax(void) ref = IDirectXFileData_Release(lpdxfd); ok(ref == 0, "Got refcount %d, expected 0\n", ref); } + ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 0, "Got refcount %d, expected 0\n", ref); }

1 0

Ruei-Yuan Lu : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 177cb59538f14cffb7a4ac53ac05d24f8dc849a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177cb59538f14cffb7a4ac53a… Author: Ruei-Yuan Lu <rueiyuan.lu(a)gmail.com> Date: Mon Feb 27 12:16:15 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 83 ++++++++++++++++++++++++++++------------------------------ 1 files changed, 40 insertions(+), 43 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index e87e058..0a04c2c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2125,11 +2125,11 @@ msgstr "" #: cryptui.rc:277 cryptui.rc:288 cryptui.rc:305 cryptui.rc:319 cryptui.rc:68 msgid "Certificate Import Wizard" -msgstr "" +msgstr "憑證匯入精靈" #: cryptui.rc:280 msgid "Welcome to the Certificate Import Wizard" -msgstr "" +msgstr "歡迎使用憑證匯入精靈" #: cryptui.rc:283 msgid "" @@ -2186,11 +2186,11 @@ msgstr "" #: cryptui.rc:322 msgid "Completing the Certificate Import Wizard" -msgstr "" +msgstr "正在完成憑證匯入精靈" #: cryptui.rc:324 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "" +msgstr "您已經成功地完成憑證匯入精靈。" #: cryptui.rc:326 cryptui.rc:440 msgid "You have specified the following settings:" @@ -2246,11 +2246,11 @@ msgstr "" #: cryptui.rc:367 cryptui.rc:378 cryptui.rc:391 cryptui.rc:401 cryptui.rc:424 #: cryptui.rc:433 cryptui.rc:147 msgid "Certificate Export Wizard" -msgstr "" +msgstr "憑證匯出精靈" #: cryptui.rc:370 msgid "Welcome to the Certificate Export Wizard" -msgstr "" +msgstr "歡迎使用憑證匯出精靈" #: cryptui.rc:373 msgid "" @@ -2289,7 +2289,7 @@ msgstr "確認密碼(&C)：" #: cryptui.rc:404 msgid "Select the format you want to use:" -msgstr "" +msgstr "請選擇您要使用的格式：" #: cryptui.rc:405 msgid "&DER-encoded X.509 (.cer)" @@ -2325,11 +2325,11 @@ msgstr "" #: cryptui.rc:436 msgid "Completing the Certificate Export Wizard" -msgstr "" +msgstr "正在完成憑證匯出精靈" #: cryptui.rc:438 msgid "You have successfully completed the Certificate Export Wizard." -msgstr "" +msgstr "您已經成功地完成憑證匯出精靈" #: cryptui.rc:27 cryptui.rc:90 msgid "Certificate" @@ -2433,7 +2433,7 @@ msgstr "" #: cryptui.rc:52 msgid "Serial number" -msgstr "" +msgstr "序號" #: cryptui.rc:53 msgid "Issuer" @@ -2457,7 +2457,7 @@ msgstr "" #: cryptui.rc:58 msgid "%1 (%2!d! bits)" -msgstr "" +msgstr "%1 (%2!d! 位元)" #: cryptui.rc:59 msgid "SHA1 hash" @@ -2565,7 +2565,7 @@ msgstr "" #: cryptui.rc:87 msgid "Automatically determined by the program" -msgstr "" +msgstr "由程式自動決定" #: cryptui.rc:88 shell32.rc:134 msgid "File" @@ -2787,7 +2787,7 @@ msgstr "" #: cryptui.rc:162 msgid "Export keys" -msgstr "" +msgstr "匯出密鑰" #: cryptui.rc:165 msgid "The export was successful." @@ -3331,7 +3331,7 @@ msgstr "" #: jscript.rc:28 msgid "Object required" -msgstr "" +msgstr "需要物件" #: jscript.rc:29 msgid "Automation server can't create object" @@ -3343,7 +3343,7 @@ msgstr "" #: jscript.rc:31 msgid "Object doesn't support this action" -msgstr "" +msgstr "物件不支援此動作" #: jscript.rc:32 msgid "Argument not optional" @@ -3379,7 +3379,7 @@ msgstr "" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "標籤重複定義" #: jscript.rc:41 msgid "Label not found" @@ -3387,7 +3387,7 @@ msgstr "找不到標籤" #: jscript.rc:42 msgid "Conditional compilation is turned off" -msgstr "" +msgstr "條件編譯已被關閉" #: jscript.rc:45 msgid "Number expected" @@ -3451,7 +3451,7 @@ msgstr "" #: winerror.mc:26 msgid "Success.\n" -msgstr "" +msgstr "成功。\n" #: winerror.mc:31 msgid "Invalid function.\n" @@ -3499,7 +3499,7 @@ msgstr "" #: winerror.mc:86 msgid "Invalid access.\n" -msgstr "" +msgstr "無效的存取。\n" #: winerror.mc:91 msgid "Invalid data.\n" @@ -3699,11 +3699,11 @@ msgstr "檔案已存在。\n" #: winerror.mc:336 msgid "Cannot create.\n" -msgstr "" +msgstr "無法建立。\n" #: winerror.mc:341 msgid "Int24 failure.\n" -msgstr "" +msgstr "中斷 24H 失敗。\n" #: winerror.mc:346 msgid "Out of structures.\n" @@ -3711,11 +3711,11 @@ msgstr "" #: winerror.mc:351 msgid "Already assigned.\n" -msgstr "" +msgstr "已經指定。\n" #: winerror.mc:356 winerror.mc:1711 msgid "Invalid password.\n" -msgstr "" +msgstr "無效的密碼。\n" #: winerror.mc:361 msgid "Invalid parameter.\n" @@ -3763,7 +3763,7 @@ msgstr "" #: winerror.mc:416 msgid "Drive locked.\n" -msgstr "" +msgstr "已鎖定儲存裝置。\n" #: winerror.mc:421 msgid "Broken pipe.\n" @@ -3907,7 +3907,7 @@ msgstr "" #: winerror.mc:606 msgid "Path is busy.\n" -msgstr "" +msgstr "該路徑忙碌中。\n" #: winerror.mc:611 msgid "Already a SUBST target.\n" @@ -3971,7 +3971,7 @@ msgstr "" #: winerror.mc:686 msgid "Lock failed.\n" -msgstr "" +msgstr "鎖定失敗。\n" #: winerror.mc:691 msgid "Resource in use.\n" @@ -4075,7 +4075,7 @@ msgstr "" #: winerror.mc:816 msgid "File name is too long.\n" -msgstr "" +msgstr "檔案名稱過長。\n" #: winerror.mc:821 msgid "Ring 2 stack in use.\n" @@ -11810,10 +11810,8 @@ msgid "" "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" -"這個程式是自由軟體﹐您可以遵照\n" -"自由軟體基金會出版的 GNU LGPL 2.1\n" -"版或新版的許可條款來修改和重新\n" -"散佈這個程式。" +"這個程式是自由軟體；您可以遵照自由軟體基金會所制定的 GNU LGPL 2.1 版或者更新" +"版本的許可條款來修改和重新散佈這個程式。" #: winecfg.rc:134 msgid "Windows registration information" @@ -11837,9 +11835,8 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change systemwide " "or per-application settings in those tabs as well." msgstr "" -"Wine 可以對不同程式偽裝成不同版本的 Windows。\n" -"「函式庫」與「顯示」分頁將連結到這個分頁，除了調整預設設定，\n" -"也能調整個別程式的設定。" +"Wine 可以對不同程式偽裝成不同版本的 Windows。「函式庫」與「顯示」分頁將連結到" +"這個分頁，除了調整預設設定，也能調整個別程式的設定。" #: winecfg.rc:150 msgid "&Add application..." @@ -12066,7 +12063,7 @@ msgstr "隱藏進階選項(&A)" #: winecfg.rc:36 msgid "(No Theme)" -msgstr "（無佈景主題）" +msgstr "(無佈景主題)" #: winecfg.rc:37 msgid "Graphics" @@ -12765,7 +12762,7 @@ msgstr "隱藏(&I)" #: winefile.rc:177 msgid "&Archive" -msgstr "" +msgstr "保存(&A)" #: winefile.rc:178 msgid "&System" @@ -12794,7 +12791,7 @@ msgstr "" #: winefile.rc:95 msgid "Wine File Manager" -msgstr "" +msgstr "Wine 檔案管理員" #: winefile.rc:97 msgid "root fs" @@ -13272,7 +13269,7 @@ msgstr "統一碼文字文件" #: wordpad.rc:143 msgid "Printer files (*.prn)" -msgstr "列印檔案 (*.prn)" +msgstr "印表機檔案 (*.prn)" #: wordpad.rc:150 msgid "Center" @@ -13385,7 +13382,7 @@ msgstr "您沒有開啟檔案的權限。" #: wordpad.rc:193 msgid "Printing not implemented." -msgstr "" +msgstr "列印功能尚未實作。" #: wordpad.rc:194 msgid "Cannot add more than 32 tab stops." @@ -13405,7 +13402,7 @@ msgstr "" #: xcopy.rc:29 msgid "Press <Enter> to begin copying\n" -msgstr "" +msgstr "請按 <Enter> 鍵開始複製\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n" @@ -13413,7 +13410,7 @@ msgstr "" #: xcopy.rc:31 msgid "%1!d! file(s) copied\n" -msgstr "" +msgstr "已複製 %1!d! 個檔案\n" #: xcopy.rc:34 msgid "" @@ -13424,11 +13421,11 @@ msgstr "" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "" +msgstr "%1？ (是｜否)\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "" +msgstr "是否覆蓋 %1？ (是｜否｜全部皆是)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n"

1 0

Ilia Mirkin : po: Fix ENTER -> Enter, CMD help text, remove fuzzy annotations.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: ca78ece0cbe0c9bd0a61169865777c1fba786bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca78ece0cbe0c9bd0a6116986… Author: Ilia Mirkin <imirkin(a)alum.mit.edu> Date: Sun Feb 26 13:47:56 2012 -0500 po: Fix ENTER -> Enter, CMD help text, remove fuzzy annotations. --- po/ru.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 7a802f7..2c4c1b7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9767,7 +9767,6 @@ msgstr "" "в операционную систему или оболочку из которой был запущен cmd.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9813,6 +9812,7 @@ msgstr "" "ATTRIB\t\tПоказывает или изменяет DOS-атрибуты файла\n" "CALL\t\tВызывает один bat-файл из другого\n" "CD (CHDIR)\tИзменяет текущий каталог\n" +"CHOICE\t\tЖдёт выбора из списка\n" "CLS\t\tОчищает экран консоли\n" "COPY\t\tКопирует файл(ы)\n" "CTTY\t\tИзменяет устройство ввода/вывода\n" @@ -9827,14 +9827,16 @@ msgstr "" "MORE\t\tВыводит данные по страницам\n" "MOVE\t\tПеремещает файл, несколько файлов или дерево каталогов\n" "PATH\t\tПоказывает или изменяет путь поиска программ\n" +"PAUSE\t\tОстанавливает исполнение bat-файлa\n" "POPD\t\tВосстанавливает предыдущий текущий каталог, сохранённый с помощью " -"PUSHD\n" "PROMPT\t\tИзменяет приглашение командной строки\n" "PUSHD\t\tСохраняет текущий каталог и переходит в другой\n" "REN (RENAME)\tПереименовывает файл\n" "RD (RMDIR)\tУдаляет каталог\n" "SET\t\tПоказывает или изменяет переменные окружения\n" "SETLOCAL\tНачинает действие локальных изменений окружения\n" +"START\t\tЗапускает программу, или открывает файл в соответствующей " +"программе\n" "TIME\t\tПоказывает или изменяет текущее системное время\n" "TITLE\t\tУстанавливает заголовок окна cmd для текущей сессии\n" "TYPE\t\tВыводит содержимое текстового файла\n" @@ -9958,9 +9960,8 @@ msgstr "" "\n" #: cmd.rc:335 -#, fuzzy msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "Метка диска (11 символов, ENTER для ввода пустой метки)?" +msgstr "Метка диска (11 символов, <Enter> для ввода пустой метки)?" #: cmd.rc:336 msgid "PATH not found\n" @@ -14054,7 +14055,6 @@ msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "Неверный параметр '%1' - воспользуйтесь 'xcopy /?'\n" #: xcopy.rc:29 -#, fuzzy msgid "Press <Enter> to begin copying\n" msgstr "Нажмите клавишу <Enter>, чтобы начать копирование\n"

1 0

Ilia Mirkin : po: Fix typo in Russian translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 7cddfd99c46449cef25114074304b24437a0e48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cddfd99c46449cef25114074… Author: Ilia Mirkin <imirkin(a)alum.mit.edu> Date: Sun Feb 26 13:47:55 2012 -0500 po: Fix typo in Russian translation. --- po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ru.po b/po/ru.po index dbf2c44..7a802f7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10030,7 +10030,7 @@ msgstr "Ошибка: неверная опция '%c'.\n" msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "Ошибка: с помощью hostname невозможно измененить имя машины.\n" +msgstr "Ошибка: с помощью hostname невозможно изменить имя машины.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n"

1 0

Ivan Vojtko : po: Update Slovak translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 13ba170da09117667bc7ed721118d55686d3b855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ba170da09117667bc7ed721… Author: Ivan Vojtko <ivan.vojtko(a)gmail.com> Date: Sat Feb 25 11:59:14 2012 +0100 po: Update Slovak translation. --- po/sk.po | 364 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 186 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13ba170da09117667bc7e…

1 0

Milan Ševčík : po: Updating Czech translation.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 518d243ca0b9586a29280804909afc2d22356395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518d243ca0b9586a292808049… Author: Milan Ševčík <sevcik.milan(a)linuxclan.org> Date: Sun Feb 26 09:40:06 2012 +0100 po: Updating Czech translation. --- po/cs.po | 179 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 74 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=518d243ca0b9586a29280…

1 0

Nikolay Sivov : msxml3: Properly escape character data in text nodes.
by Alexandre Julliard Feb. 27, 2012

Feb. 27, 2012

Module: wine Branch: master Commit: 5016f7ba4a36265bd1bff3e5abe81213ed5c6ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5016f7ba4a36265bd1bff3e5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 23:20:48 2012 +0300 msxml3: Properly escape character data in text nodes. --- dlls/msxml3/mxwriter.c | 41 ++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 70 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index cb1a67f..72db31d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -68,6 +68,12 @@ typedef enum MXWriter_LastProp } mxwriter_prop; +typedef enum +{ + EscapeValue, + EscapeText +} escape_mode; + typedef struct { char *data; @@ -94,6 +100,7 @@ typedef struct VARIANT_BOOL props[MXWriter_LastProp]; BOOL prop_changed; + BOOL cdata; BSTR version; @@ -275,7 +282,7 @@ static void close_output_buffer(mxwriter *This) '"' -> """ '>' -> ">" */ -static WCHAR *get_escaped_string(const WCHAR *str, int *len) +static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) { static const WCHAR ltW[] = {'&','l','t',';'}; static const WCHAR ampW[] = {'&','a','m','p',';'}; @@ -311,14 +318,18 @@ static WCHAR *get_escaped_string(const WCHAR *str, int *len) memcpy(ptr, ampW, sizeof(ampW)); ptr += sizeof(ampW)/sizeof(WCHAR); break; - case '"': - memcpy(ptr, equotW, sizeof(equotW)); - ptr += sizeof(equotW)/sizeof(WCHAR); - break; case '>': memcpy(ptr, gtW, sizeof(gtW)); ptr += sizeof(gtW)/sizeof(WCHAR); break; + case '"': + if (mode == EscapeValue) + { + memcpy(ptr, equotW, sizeof(equotW)); + ptr += sizeof(equotW)/sizeof(WCHAR); + break; + } + /* fallthrough for text mode */ default: *ptr++ = *str; break; @@ -429,6 +440,7 @@ static inline HRESULT flush_output_buffer(mxwriter *This) { close_element_starttag(This); set_element_name(This, NULL, 0); + This->cdata = FALSE; return write_data_to_stream(This); } @@ -978,7 +990,7 @@ static HRESULT WINAPI SAXContentHandler_startElement( hr = ISAXAttributes_getValue(attr, i, &str, &len); if (FAILED(hr)) return hr; - escaped = get_escaped_string(str, &len); + escaped = get_escaped_string(str, EscapeValue, &len); write_output_buffer_quoted(This->buffer, escaped, len); heap_free(escaped); } @@ -1040,7 +1052,19 @@ static HRESULT WINAPI SAXContentHandler_characters( set_element_name(This, NULL, 0); if (nchars) - write_output_buffer(This->buffer, chars, nchars); + { + if (This->cdata) + write_output_buffer(This->buffer, chars, nchars); + else + { + int len = nchars; + WCHAR *escaped; + + escaped = get_escaped_string(chars, EscapeText, &len); + write_output_buffer(This->buffer, escaped, len); + heap_free(escaped); + } + } return S_OK; } @@ -1203,6 +1227,7 @@ static HRESULT WINAPI SAXLexicalHandler_startCDATA(ISAXLexicalHandler *iface) TRACE("(%p)\n", This); write_output_buffer(This->buffer, scdataW, sizeof(scdataW)/sizeof(WCHAR)); + This->cdata = TRUE; return S_OK; } @@ -1215,6 +1240,7 @@ static HRESULT WINAPI SAXLexicalHandler_endCDATA(ISAXLexicalHandler *iface) TRACE("(%p)\n", This); write_output_buffer(This->buffer, ecdataW, sizeof(ecdataW)/sizeof(WCHAR)); + This->cdata = FALSE; return S_OK; } @@ -1296,6 +1322,7 @@ HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) This->xml_enc = XmlEncoding_UTF16; This->element = NULL; + This->cdata = FALSE; This->dest = NULL; This->dest_written = 0; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cfead73..74afc67 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2439,13 +2439,29 @@ static void test_mxwriter_startendelement(void) free_bstrs(); } +struct writer_characters_t { + const GUID *clsid; + const char *data; + const char *output; +}; + +static const struct writer_characters_t writer_characters[] = { + { &CLSID_MXXMLWriter, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter30, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter40, "< > & \"", "< > & \"" }, + { &CLSID_MXXMLWriter60, "< > & \"", "< > & \"" }, + { NULL } +}; + static void test_mxwriter_characters(void) { static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; + const struct writer_characters_t *table = writer_characters; ISAXContentHandler *content; IMXWriter *writer; VARIANT dest; HRESULT hr; + int i = 0; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2515,6 +2531,54 @@ static void test_mxwriter_characters(void) ISAXContentHandler_Release(content); IMXWriter_Release(writer); + /* batch tests */ + while (table->clsid) + { + ISAXContentHandler *content; + IMXWriter *writer; + HRESULT hr; + + if (!is_clsid_supported(table->clsid, mxwriter_support_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_characters(content, _bstr_(table->data), strlen(table->data)); + EXPECT_HR(hr, S_OK); + + /* test output */ + if (hr == S_OK) + { + VARIANT dest; + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_(table->output), V_BSTR(&dest)), + "test %d: got wrong content %s, expected %s\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + VariantClear(&dest); + } + + table++; + i++; + } + free_bstrs(); } @@ -2975,6 +3039,10 @@ static void test_mxwriter_cdata(void) hr = ISAXLexicalHandler_startCDATA(lexical); EXPECT_HR(hr, S_OK); + /* all these are escaped for text nodes */ + hr = ISAXContentHandler_characters(content, _bstr_("< > & \""), 7); + EXPECT_HR(hr, S_OK); + hr = ISAXLexicalHandler_endCDATA(lexical); EXPECT_HR(hr, S_OK); @@ -2982,7 +3050,7 @@ static void test_mxwriter_cdata(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("<![CDATA[<![CDATA[]]>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("<![CDATA[<![CDATA[< > & \"]]>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); ISAXContentHandler_Release(content);

1 0