February 2012 - Wine-Commits

Christian Costa : d3dxof: Fix leaking of IDirectXFileObject object in tests .
by Alexandre Julliard Feb. 21, 2012

Feb. 21, 2012

Module: wine Branch: master Commit: 36d4e1ea59c90beaf65bc5d0d03d5846b5907976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d4e1ea59c90beaf65bc5d0d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Feb 20 23:42:32 2012 +0100 d3dxof: Fix leaking of IDirectXFileObject object in tests. --- dlls/d3dxof/tests/d3dxof.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 95dcd66..c166054 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -611,6 +611,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) printf("Found Binary (%d)\n", j); IDirectXFileBinary_Release(p3); } + IDirectXFileObject_Release(pChildObj); } (*plevel)--; ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr);

1 0

Kusanagi Kouichi : gdi32: Initialize font signature of "System" font link.
by Alexandre Julliard Feb. 21, 2012

Feb. 21, 2012

Module: wine Branch: master Commit: 4dc04ae867155ba734c2a8edbe816c31e09703a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc04ae867155ba734c2a8edb… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Feb 21 20:14:18 2012 +0900 gdi32: Initialize font signature of "System" font link. --- dlls/gdi32/freetype.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ea0da85..8a0c096 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2212,6 +2212,7 @@ skip_internal: system_font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*system_font_link)); system_font_link->font_name = strdupW(System); list_init(&system_font_link->links); + memset(&fs, 0, sizeof(fs)); face = find_face_from_filename(tahoma_ttf, Tahoma); if(face) @@ -2219,6 +2220,8 @@ skip_internal: child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); child_font->face = face; child_font->font = NULL; + fs.fsCsb[0] |= face->fs.fsCsb[0]; + fs.fsCsb[1] |= face->fs.fsCsb[1]; TRACE("Found Tahoma in %s index %ld\n", child_font->face->file, child_font->face->face_index); list_add_tail(&system_font_link->links, &child_font->entry); } @@ -2233,11 +2236,21 @@ skip_internal: new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); new_child->face = font_link_entry->face; new_child->font = NULL; + fs.fsCsb[0] |= font_link_entry->face->fs.fsCsb[0]; + fs.fsCsb[1] |= font_link_entry->face->fs.fsCsb[1]; list_add_tail(&system_font_link->links, &new_child->entry); } break; } } + family = find_family_from_name(system_font_link->font_name); + if(family) + { + LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + { + face->fs_links = fs; + } + } list_add_tail(&system_links, &system_font_link->entry); return ret; }

1 0

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

Feb. 21, 2012

Module: wine Branch: master Commit: 7249cd4a90e7c248758e7a3e2e33924adeb642e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7249cd4a90e7c248758e7a3e2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Feb 20 21:43:29 2012 +0200 po: Update Finnish translation. --- po/fi.po | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4463123..f8f01d6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6254,7 +6254,7 @@ msgstr "" #: winerror.mc:3526 msgid "Not an RPC error.\n" -msgstr "Ei RCP-virhe.\n" +msgstr "Ei RPC-virhe.\n" #: winerror.mc:3531 msgid "UUID is local only.\n" @@ -8065,7 +8065,7 @@ msgstr "" "lisätietoja.\n" "\n" "Winen mukana pitäisi tulla kopio GNU Lesser General Public Licensesta; jos " -"ei, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin Street, " +"ei, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, " "Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:253 @@ -9619,7 +9619,7 @@ msgstr "" "Syntaksi: ASSOC [.pääte[=[tyyppi]]]\n" "\n" "ASSOC ilman parametreja näyttää nykyiset tiedostokytkennät.\n" -"Pelkän tiedostopäätteen kanssa ASSOC näyttää kyseisen päätteen kytekennän.\n" +"Pelkän tiedostopäätteen kanssa ASSOC näyttää kyseisen päätteen kytkennän.\n" "Jos annetaan yhtäsuuruusmerkki mutta ei tyyppiä, ASSOC poistaa " "tiedostopäätteen nykyisen kytkennän.\n" @@ -9670,7 +9670,6 @@ msgstr "" "komentoriville, jolta kutsuit cmd:tä.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9739,6 +9738,7 @@ msgstr "" "RD (RMDIR)\tPoista alihakemisto\n" "SET\t\tAseta tai näytä ympäristömuuttujia\n" "SETLOCAL\tAloita ympäristömuutosten paikallisuus komentojonotiedostossa\n" +"START\t\tKäynnistä ohjelma tai avaa dokumentti siihen kytketyllä ohjelmalla\n" "TIME\t\tAseta tai näytä järjestelmän nykyinen aika\n" "TITLE\t\tAseta ikkunan otsikko CMD-istunnolle\n" "TYPE\t\tKirjoita tekstitiedoston sisältö\n" @@ -9765,11 +9765,11 @@ msgstr "E" #: cmd.rc:310 msgid "File association missing for extension %1\n" -msgstr "Päätteellä %1 ei ole tiedostokytkentää.\n" +msgstr "Päätteellä %1 ei ole tiedostokytkentää\n" #: cmd.rc:311 msgid "No open command associated with file type '%1'\n" -msgstr "Tiedostotyyppiin '%1' ei ole liitetty avauskomentoa.\n" +msgstr "Tiedostotyyppiin '%1' ei ole liitetty avauskomentoa\n" #: cmd.rc:312 msgid "Overwrite %1?" @@ -11392,8 +11392,7 @@ msgstr "" "\n" "Ohjelman mukana pitäisi tulla kopio GNU Lesser General Public Licensesta; " "jos\n" -"ei, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin " -"Street,\n" +"ei, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St,\n" "Fifth Floor, Boston, MA 02110-1301, USA.\n" "\n" "Tiedostossa COPYING.LIB on lisenssitietoa.\n"

1 0

Christian Costa : d3dxof: Make sure the returned object pointer is null when there is no more object .
by Alexandre Julliard Feb. 21, 2012

Feb. 21, 2012

Module: wine Branch: master Commit: 40b15a380d4bd4e7c771aad83e91a0a07f8d59dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b15a380d4bd4e7c771aad83… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Feb 20 23:42:49 2012 +0100 d3dxof: Make sure the returned object pointer is null when there is no more object. --- dlls/d3dxof/d3dxof.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 3294f92..2b0770f 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -988,17 +988,22 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (This->nb_xobjects >= MAX_OBJECTS) { ERR("Too many objects\n"); + *ppDataObj = NULL; return DXFILEERR_NOMOREOBJECTS; } /* Check if there are templates defined before the object */ - if (!parse_templates(&This->buf)) { + if (!parse_templates(&This->buf)) + { hr = DXFILEERR_BADVALUE; goto error; } if (!This->buf.rem_bytes) + { + *ppDataObj = NULL; return DXFILEERR_NOMOREOBJECTS; + } hr = IDirectXFileDataImpl_Create(&object); if (FAILED(hr))

1 0

Huw Davies : ole32: Trace the drop effect in hex.
by Alexandre Julliard Feb. 21, 2012

Feb. 21, 2012

Module: wine Branch: master Commit: 903803b5525a62d2579c0340d2ac275d7178e215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903803b5525a62d2579c0340d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 21 14:19:44 2012 +0000 ole32: Trace the drop effect in hex. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index cb667c9..9e9ca65 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -773,7 +773,7 @@ HRESULT WINAPI DoDragDrop ( HWND hwndTrackWindow; MSG msg; - TRACE("(%p, %p, %d, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); + TRACE("(%p, %p, %08x, %p)\n", pDataObject, pDropSource, dwOKEffect, pdwEffect); if (!pDataObject || !pDropSource || !pdwEffect) return E_INVALIDARG;

1 0

Henri Verbeet : wined3d: Don' t take the wined3d mutex during WM_DISPLAYCHANGE either.
by Alexandre Julliard Feb. 21, 2012

Feb. 21, 2012

Module: wine Branch: master Commit: ed47f259bdb664b508301480c5018b5f60f84f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed47f259bdb664b508301480c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 10:02:13 2012 +0100 wined3d: Don't take the wined3d mutex during WM_DISPLAYCHANGE either. --- dlls/ddraw/ddraw.c | 2 ++ dlls/wined3d/device.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 99c0a69..25519d2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5359,6 +5359,8 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par TRACE("device_parent %p, device %p.\n", device_parent, device); } +/* This is run from device_process_message() in wined3d, we can't take the + * wined3d mutex. */ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) { struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0768aa..17560c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5912,9 +5912,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL } else if (message == WM_DISPLAYCHANGE) { - wined3d_mutex_lock(); device->device_parent->ops->mode_changed(device->device_parent); - wined3d_mutex_unlock(); } if (unicode)

1 0

André Hentschel : Wine 1.4-rc4 freigegeben
by Jeremy Newman Feb. 21, 2012

Feb. 21, 2012

Module: website Branch: master Commit: 2d246aad0515c6e9a33788600520efafb8e65c25 URL: http://source.winehq.org/git/website.git/?a=commit;h=2d246aad0515c6e9a33788… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 20 17:43:34 2012 +0100 Wine 1.4-rc4 freigegeben --- news/de/2012021701.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/de/2012021701.xml b/news/de/2012021701.xml new file mode 100644 index 0000000..2e4ef37 --- /dev/null +++ b/news/de/2012021701.xml @@ -0,0 +1,12 @@ +<news> +<date>17. Februar 2012</date> +<title>Wine 1.4-rc4 freigegeben</title> +<body> + Die Entwicklungsversion 1.4-rc4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.4-rc4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerbehebungen, da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc4.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : contributing: Update the localization section.
by Jeremy Newman Feb. 21, 2012

Feb. 21, 2012

Module: website Branch: master Commit: 1e1adc493ec2003932fa46a2ed30851efecee6fb URL: http://source.winehq.org/git/website.git/?a=commit;h=1e1adc493ec2003932fa46… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 20 12:25:06 2012 +0100 contributing: Update the localization section. --- templates/en/contributing.template | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index d77819a..7767a95 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -254,16 +254,24 @@ <h3 id="localized">Localization work</h3> -Also, we need to have localized versions of the Wine Guides and man +We need help translating Wine's resources into foreign languages. What this + covers is common dialogs such as the 'File Open' or 'Print' dialogs, + informational messages such as the crash dialog, some standard error + messages, but also the builtin tools such as Wine's notepad. When not + translated these can really impair Wine's usability for non-English + speakers. +Luckily these are now all translated through standard PO files which makes + this task relatively easy. For detailed instructions on how to help, see our + <a href="http://wiki.winehq.org/Translating">Translating</a> guide. + +We also need to have localized versions of the Wine Guides, README and man pages. For this to work, we'll need many people willing to translate changes to the main English documentation into foreign languages. If you're willing to register for work on a certain language, then please sign up with us! -At this time we are looking for people who can translate. -<ul> - <li>The README and maintain the translation.</li> - <li>The Wine resources and messages it issues (but not the debug messages of course). You can check the <a href="http://source.winehq.org/transl/">Wine translation statistics</a> for your language to see how much there is to do.</li> -</ul> +While being a relatively small part of the documentation, the README and + man pages are probably its most important components. So if you can help + with these we would really be grateful. We also need a 'QuickStart/Howto' document that would describe the basic instructions for installing and configuring Wine in a bit more details than the README while being much smaller than the Wine User Guide (it could actually be a chapter of that guide). Then that

1 0

Frédéric Delanoy : French translation for release 1.4-rc4
by Jeremy Newman Feb. 21, 2012

Feb. 21, 2012

Module: website Branch: master Commit: 7fcf2115f245013910d5b72b53f63af57678a8ff URL: http://source.winehq.org/git/website.git/?a=commit;h=7fcf2115f245013910d5b7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 17 23:07:58 2012 +0100 French translation for release 1.4-rc4 --- news/fr/2012021701.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012021701.xml b/news/fr/2012021701.xml new file mode 100644 index 0000000..4020e4b --- /dev/null +++ b/news/fr/2012021701.xml @@ -0,0 +1,15 @@ +<news> +<date>17 février 2012</date> +<title>Sortie de Wine 1.4-rc4</title> +<body> + La version de développement 1.4-rc4 de Wine est disponible. + <a href="{$root}/announce/1.4-rc4">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bogues uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc4.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Francois Gouget : Assorted spelling and case fixes.
by Jeremy Newman Feb. 21, 2012

Feb. 21, 2012

Module: website Branch: master Commit: 46f51384f026e26e90fc796ac8f1f987ef658fae URL: http://source.winehq.org/git/website.git/?a=commit;h=46f51384f026e26e90fc79… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 20 12:01:58 2012 +0100 Assorted spelling and case fixes. --- jquery.pngfix.js | 2 +- news/en/2008092301.xml | 2 +- templates/en/about.template | 2 +- templates/en/donate.template | 4 ++-- templates/en/download.template | 2 +- templates/en/lang.template | 2 +- wwn/en/wn20080224_341.xml | 6 +++--- wwn/en/wn20080331_344.xml | 6 +++--- wwn/en/wn20080527_347.xml | 2 +- wwn/en/wn20080714_349.xml | 2 +- wwn/en/wn20080922_352.xml | 8 ++++---- wwn/en/wn20081007_353.xml | 22 +++++++++++----------- wwn/en/wn20090109_355.xml | 2 +- wwn/en/wn20090204_356.xml | 2 +- wwn/en/wn20090527_357.xml | 4 ++-- wwn/en/wn20100513_362.xml | 2 +- 16 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=46f51384f026e26e90…

1 0

Francois Gouget : news: Put out a call for translators.
by Jeremy Newman Feb. 21, 2012

Feb. 21, 2012

Module: website Branch: master Commit: dda668daa1a94a2f276806eaa626d388dcf43ebc URL: http://source.winehq.org/git/website.git/?a=commit;h=dda668daa1a94a2f276806… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 20 12:01:51 2012 +0100 news: Put out a call for translators. --- news/en/2012022001.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2012022001.xml b/news/en/2012022001.xml new file mode 100644 index 0000000..046e787 --- /dev/null +++ b/news/en/2012022001.xml @@ -0,0 +1,12 @@ +<news> +<date>February 20, 2012</date> +<title>Translators wanted!</title> +<body> +Wine's translation <a href="http://fgouget.free.fr/wine-po/">status +page</a> shows only 12 complete translations. We'd like to do better +for 1.4. +Luckily, starting with 1.4 Wine uses PO files, thus making +translations easier than ever before. So check out how to +<a href="http://wiki.winehq.org/Translating">get started</a> and help us +make Wine usable in your country. +</body></news>

1 0

Francois Gouget : po: Don' t translate the name or options of command line tools.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: d5bf25f517e7b6e8f155fb84edea7d635c20bf2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bf25f517e7b6e8f155fb84e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 20 03:01:17 2012 +0100 po: Don't translate the name or options of command line tools. --- po/cs.po | 22 ++++++++++++---------- po/fi.po | 2 +- po/nl.po | 2 +- po/pl.po | 14 +++++++------- po/pt_BR.po | 2 +- po/ro.po | 14 +++++++------- po/sl.po | 6 +++--- po/sr_RS(a)cyrillic.po | 4 ++-- po/sr_RS(a)latin.po | 4 ++-- po/uk.po | 2 +- 10 files changed, 37 insertions(+), 35 deletions(-) diff --git a/po/cs.po b/po/cs.po index f240e00..452c4c6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9800,12 +9800,13 @@ msgstr "" "start [volby] jméno_dokumentu\n" "\n" "Volby:\n" -"/M[inimalizovaně] Spustí program minimalizovaně.\n" -"/MAX[imalizovaně] Spustí program maximalizovaně.\n" -"/R Spustí program normálně (ani minimalizovaný ani maximalizovaný).\n" -"/W Čeká na dokončení spuštěného programu, vrací návratový kód.\n" +"/M[inimized] Spustí program minimalizovaně.\n" +"/MAX[imized] Spustí program maximalizovaně.\n" +"/R[estored] Spustí program normálně (ani minimalizovaný ani " +"maximalizovaný).\n" +"/W[ait] Čeká na dokončení spuštěného programu, vrací návratový kód.\n" "/ProgIDOpen Open a document using the following progID.\n" -"/L Zobrazí licenci.\n" +"/L Zobrazí licenci.\n" "\n" "start.exe verze 0.2 Copyright (C) 2003, Dan Kegel\n" "Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option.\n" @@ -11652,12 +11653,13 @@ msgstr "" "start [volby] jméno_dokumentu\n" "\n" "Volby:\n" -"/M[inimalizovaně] Spustí program minimalizovaně.\n" -"/MAX[imalizovaně] Spustí program maximalizovaně.\n" -"/R Spustí program normálně (ani minimalizovaný ani maximalizovaný).\n" -"/W Čeká na dokončení spuštěného programu, vrací návratový kód.\n" +"/M[inimized] Spustí program minimalizovaně.\n" +"/MAX[imized] Spustí program maximalizovaně.\n" +"/R[estored] Spustí program normálně (ani minimalizovaný ani " +"maximalizovaný).\n" +"/W[ait] Čeká na dokončení spuštěného programu, vrací návratový kód.\n" "/ProgIDOpen Open a document using the following progID.\n" -"/L Zobrazí licenci.\n" +"/L Zobrazí licenci.\n" "\n" "start.exe verze 0.2 Copyright (C) 2003, Dan Kegel\n" "Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option.\n" diff --git a/po/fi.po b/po/fi.po index 5bdc65b..4463123 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9922,7 +9922,7 @@ msgstr "Sijainti:" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "Käyttö: isäntänimi\n" +msgstr "Käyttö: hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" diff --git a/po/nl.po b/po/nl.po index 12f0073..63c754e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10134,7 +10134,7 @@ msgstr "Locatie:" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "Gebruik: hostnaam\n" +msgstr "Gebruik: hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" diff --git a/po/pl.po b/po/pl.po index d8abe88..9e7d70a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9641,8 +9641,8 @@ msgstr "" "start [opcje] nazwa_dokumentu\n" "\n" "Opcje:\n" -"/M[inimalizowany] Uruchamia program zminimalizowany.\n" -"/MAX[ymalizowany] Uruchamia program zmaksymalizowany.\n" +"/M[inimized] Uruchamia program zminimalizowany.\n" +"/MAX[imized] Uruchamia program zmaksymalizowany.\n" "/R[estored] Uruchamia program normalnie (bez minimalizacji ani " "maksymalizacji).\n" "/W[ait] Zaczekaj aż program zakończy działanie (i zakończ\n" @@ -11482,8 +11482,8 @@ msgstr "" "start [opcje] nazwa_dokumentu\n" "\n" "Opcje:\n" -"/M[inimalizowany] Uruchamia program zminimalizowany.\n" -"/MAX[ymalizowany] Uruchamia program zmaksymalizowany.\n" +"/M[inimized] Uruchamia program zminimalizowany.\n" +"/MAX[imized] Uruchamia program zmaksymalizowany.\n" "/R[estored] Uruchamia program normalnie (bez minimalizacji ani " "maksymalizacji).\n" "/W[ait] Zaczekaj aż program zakończy działanie (i zakończkodem wyjścia " @@ -13234,13 +13234,13 @@ msgid "" " try to setup the current terminal as a Wine " "console.\n" msgstr "" -" --backend={użytkownik|curses} Wybór użytkownika uruchomi nowe okno, " -"curses spróbuje\n" +" --backend={user|curses} Wybór użytkownika uruchomi nowe okno, curses " +"spróbuje\n" " ustawić obecny terminal jako konsola Wine.\n" #: wineconsole.rc:50 msgid " <command> The Wine program to launch in the console.\n" -msgstr " <polecenie> Program Wine do uruchomienia w konsoli.\n" +msgstr " <polecenie> Program Wine do uruchomienia w konsoli.\n" #: wineconsole.rc:51 msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 490620e..a802ec3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6688,7 +6688,7 @@ msgstr "" "\n" "Instalar um produto:\n" "\t/i {pacote|códigodoproduto} [propriedade]\n" -"\t/pacote {pacote|códigodoproduto} [propriedade]\n" +"\t/package {pacote|códigodoproduto} [propriedade]\n" "\t/a pacote [propriedade]\n" "Reparar uma instalação:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {pacote|códigodoproduto}\n" diff --git a/po/ro.po b/po/ro.po index 42ac763..ea716a9 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9863,9 +9863,9 @@ msgstr "" "\n" "Opțiuni:\n" "/M[inimizat] Pornește programul minimizat.\n" -"/MAX[imizat] Pornește programul maximizat.\n" -"/R[estaurat] Pornește programul normal (nici minimizat, nici maximizat).\n" -"/W Așteaptă ca programul pornit să termine, apoi ieși din el\n" +"/MAX[imized] Pornește programul maximizat.\n" +"/R[estored] Pornește programul normal (nici minimizat, nici maximizat).\n" +"/W[ait] Așteaptă ca programul pornit să termine, apoi ieși din el\n" " cu codul său de ieșire.\n" "/Unix Utilizează un nume de fișier Unix și pornește fișierul ca\n" " windows explorer.\n" @@ -11658,10 +11658,10 @@ msgstr "" "start [opțiuni] cale_document\n" "\n" "Opțiuni:\n" -"/M[inimizat] Pornește programul minimizat.\n" -"/MAX[imizat] Pornește programul maximizat.\n" -"/R[estaurat] Pornește programul normal (nici minimizat, nici maximizat).\n" -"/W Așteaptă ca programul pornit să termine, apoi ieși din el\n" +"/M[inimized] Pornește programul minimizat.\n" +"/MAX[imized] Pornește programul maximizat.\n" +"/R[estored] Pornește programul normal (nici minimizat, nici maximizat).\n" +"/W[ait] Așteaptă ca programul pornit să termine, apoi ieși din el\n" " cu codul său de ieșire.\n" "/Unix Utilizează un nume de fișier Unix și pornește fișierul ca\n" " windows explorer.\n" diff --git a/po/sl.po b/po/sl.po index 448bfe8..657b7c0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6677,12 +6677,12 @@ msgstr "" "\n" "Namesti izdelek:\n" "\t/i {paket|koda_izdelka} [lastnost]\n" -"\t/paket {paket|koda_izdelka} [lastnost]\n" +"\t/package {paket|koda_izdelka} [lastnost]\n" "\t/a paket [lastnost]\n" "Popravi namestitev:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {paket|koda_izdelka}\n" "Odstrani produkt:\n" -"\t/odstrani {paket|koda_izdelka} [lastnost]\n" +"\t/uninstall {paket|koda_izdelka} [lastnost]\n" "\t/x {paket|koda_izdelka} [lastnost]\n" "Oglašuj produkt:\n" "\t/j[u|m] paket [/t preoblikovanje] [/g id_jezika]\n" @@ -10006,7 +10006,7 @@ msgstr "Mesto:" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "Uporaba: ime gostitelja\n" +msgstr "Uporaba: hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index 1cbd75b..2478001 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -6945,7 +6945,7 @@ msgstr "" "Поправка инсталације:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {пакет|кôд}\n" "Уклањање производа:\n" -"\t/деинсталација {пакет|кôд} [својина]\n" +"\t/uninstall {пакет|кôд} [својина]\n" "\t/x {пакет|кôд} [својина]\n" "Реклама производа:\n" "\t/j[u|m] пакет [/t претвори] [/g ID језика]\n" @@ -6960,7 +6960,7 @@ msgstr "" "Одјава MSI услуге:\n" "\t/z\n" "Прикажи помоћ:\n" -"\t/помоћ\n" +"\t/help\n" "\t/?\n" #: msi.rc:57 diff --git a/po/sr_RS(a)latin.po b/po/sr_RS(a)latin.po index c3f220f..c8235bf 100644 --- a/po/sr_RS(a)latin.po +++ b/po/sr_RS(a)latin.po @@ -7039,7 +7039,7 @@ msgstr "" "Popravka instalacije:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {paket|kôd}\n" "Uklanjanje proizvoda:\n" -"\t/deinstalacija {paket|kôd} [svojina]\n" +"\t/uninstall {paket|kôd} [svojina]\n" "\t/x {paket|kôd} [svojina]\n" "Reklama proizvoda:\n" "\t/j[u|m] paket [/t pretvori] [/g ID jezika]\n" @@ -7054,7 +7054,7 @@ msgstr "" "Odjava MSI usluge:\n" "\t/z\n" "Prikaži pomoć:\n" -"\t/pomoć\n" +"\t/help\n" "\t/?\n" #: msi.rc:57 diff --git a/po/uk.po b/po/uk.po index 7ebee73..477b80e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -10045,7 +10045,7 @@ msgstr "Розміщення" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "Використання: ім'я_хосту\n" +msgstr "Використання: hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n"

1 0

Detlef Riekenberg : commdlg: Fix GlobalReAlloc16 parameter order.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: f43f37d3613db57c732196f88e1225191cd62c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43f37d3613db57c732196f88… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 20 14:08:18 2012 +0100 commdlg: Fix GlobalReAlloc16 parameter order. --- dlls/commdlg.dll16/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index ab6be7c..59239dd 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -51,7 +51,7 @@ static void global_handle_to_16( HGLOBAL16 *h16, HGLOBAL handle ) if (!handle) return; size = GlobalSize( handle ); - if (*h16) ret = GlobalReAlloc16( GMEM_MOVEABLE, *h16, size ); + if (*h16) ret = GlobalReAlloc16( *h16, size, GMEM_MOVEABLE ); else ret = GlobalAlloc16( GMEM_MOVEABLE, size ); if (ret) {

1 0

Francois Gouget : po: The msiexec usage should be translated to Hebrew.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: b972026e2bd27c1e2f687e645d31c6c73350727b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b972026e2bd27c1e2f687e645… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 20 02:55:27 2012 +0100 po: The msiexec usage should be translated to Hebrew. --- po/he.po | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/po/he.po b/po/he.po index bf14669..498decf 100644 --- a/po/he.po +++ b/po/he.po @@ -6883,7 +6883,6 @@ msgid "insert disk %s" msgstr "נא להכניס את הדיסק %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -6915,35 +6914,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parameter]\n" -"\n" -"Install a product:\n" -"\t/i {package|product_code} [property]\n" -"\t/package {package|product_code} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -"Uninstall a product:\n" -"\t/uninstall {package|product_code} [property]\n" -"\t/x {package|product_code} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patch_package [property]\n" -"\t/p patch_package /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s"

1 0

Francois Gouget : winex11: The x11drv debug channel is unused in pen. c so remove it.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: e603301862f52a1e5e1eff291b5e3e5caf13d0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e603301862f52a1e5e1eff291… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:31:41 2012 +0100 winex11: The x11drv debug channel is unused in pen.c so remove it. --- dlls/winex11.drv/pen.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index 1fb2d42..c6a15da 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -21,9 +21,6 @@ #include "config.h" #include "x11drv.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(x11drv); static DWORD get_user_dashes( char *res, const DWORD *style, DWORD len )

1 0

Jan-Peter Nilsson : winhttp: Set the context on the request handle earlier.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 3de7348f72e28b2744032b6eb83795163ee386ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de7348f72e28b2744032b6eb… Author: Jan-Peter Nilsson <peppe(a)bsnet.se> Date: Sat Feb 18 10:23:47 2012 +0100 winhttp: Set the context on the request handle earlier. --- dlls/winhttp/request.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a3a92ab..040f79b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1085,6 +1085,8 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len return FALSE; } + if (context) request->hdr.context = context; + if (!(ret = open_connection( request ))) goto end; if (!(req = build_request_string( request ))) goto end; @@ -1092,7 +1094,6 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len TRACE("full request: %s\n", debugstr_a(req_ascii)); len = strlen(req_ascii); - if (context) request->hdr.context = context; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, NULL, 0 ); ret = netconn_send( &request->netconn, req_ascii, len, 0, &bytes_sent );

1 0

Francois Gouget : po: Fix some typography issues in the Chinese (Taiwan) translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 5f3f6117599d346bc5d24da4b0772d4842723661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3f6117599d346bc5d24da4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:46:09 2012 +0100 po: Fix some typography issues in the Chinese (Taiwan) translation. --- po/zh_TW.po | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index c3a78c6..c53e881 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -774,7 +774,7 @@ msgstr "列印" #: comdlg32.rc:456 msgid "Look &in:" -msgstr "搜尋位置(&I)" +msgstr "搜尋位置(&I):" #: comdlg32.rc:462 msgid "File &name:" @@ -958,7 +958,7 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "這個值不在頁數範圍。\n" -" 請輸入一個 %d 和 %d 之間的數。" +"請輸入一個 %d 和 %d 之間的數。" #: comdlg32.rc:56 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -983,7 +983,7 @@ msgid "" "Please enter a value between 1 and %d." msgstr "" "你的印表機不支持這麼大的份數。\n" -" 請輸入一個 1 和 %d 之間的數。" +"請輸入一個 1 和 %d 之間的數。" #: comdlg32.rc:63 msgid "A printer error occurred." @@ -2210,7 +2210,7 @@ msgstr "檔案名(&F):" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "瀏覽(&r)" +msgstr "瀏覽(&r)..." #: cryptui.rc:294 msgid "" @@ -6952,7 +6952,7 @@ msgstr "配置(&F)..." #: msvfw32.rc:40 msgid "&About" -msgstr "關於(&A)..." +msgstr "關於(&A)" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7559,7 +7559,7 @@ msgstr "創建捷徑(&T)" #: shdoclc.rc:50 shdoclc.rc:81 shdoclc.rc:134 shdoclc.rc:161 shdoclc.rc:185 msgid "Add to &Favorites..." -msgstr "添加到我的最愛(&F)" +msgstr "添加到我的最愛(&F)..." #: shdoclc.rc:51 msgid "&View Source" @@ -7583,7 +7583,7 @@ msgstr "在新視窗開啟鏈接(&N)" #: shdoclc.rc:65 shdoclc.rc:126 shdoclc.rc:148 shdoclc.rc:172 msgid "Save Target &As..." -msgstr "將目標存為(&A)" +msgstr "將目標存為(&A)..." #: shdoclc.rc:66 shdoclc.rc:127 shdoclc.rc:149 shdoclc.rc:173 msgid "&Print Target" @@ -7595,11 +7595,11 @@ msgstr "顯示圖片(&S)" #: shdoclc.rc:69 shdoclc.rc:176 msgid "&Save Picture As..." -msgstr "將圖片存為(&A)" +msgstr "將圖片存為(&A)..." #: shdoclc.rc:70 msgid "&E-mail Picture..." -msgstr "電郵圖片(&E)" +msgstr "電郵圖片(&E)..." #: shdoclc.rc:71 msgid "Pr&int Picture..." @@ -9379,7 +9379,7 @@ msgstr "數字時鐘(&T)" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "字型(&F)" +msgstr "字型(&F)..." #: clock.rc:34 msgid "&Without Titlebar" @@ -10363,8 +10363,7 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"檔案 '%s'\n" -"不存在\n" +"檔案 '%s' 不存在\n" "\n" "您想新建一個檔案嗎？" @@ -10374,8 +10373,7 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"檔案 '%s'\n" -"正文已更改\n" +"檔案 '%s' 正文已更改\n" "\n" "是否儲存更改？" @@ -10581,7 +10579,7 @@ msgstr "OleView - OLE/COM 對象查看器" #: oleview.rc:97 msgid "version 1.0" -msgstr "版本 1.0 " +msgstr "版本 1.0" #: oleview.rc:100 #, fuzzy @@ -10928,11 +10926,11 @@ msgstr "" #: progman.rc:65 msgid "Delete group `%s'?" -msgstr "是否刪除程式組 `%s' ？" +msgstr "是否刪除程式組 `%s'？" #: progman.rc:66 msgid "Delete program `%s'?" -msgstr "是否刪除程式組 `%s' ?" +msgstr "是否刪除程式組 `%s'?" #: progman.rc:67 #, fuzzy @@ -12472,7 +12470,7 @@ msgstr "已有的函式庫頂替(&o)：" #: winecfg.rc:190 msgid "&Edit..." -msgstr "編輯(&E)" +msgstr "編輯(&E)..." #: winecfg.rc:196 msgid "Edit Override" @@ -12521,11 +12519,11 @@ msgstr "" #: winecfg.rc:227 msgid "&Add..." -msgstr "加入(&A)" +msgstr "加入(&A)..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "自動偵測(&d)..." +msgstr "自動偵測(&d)" #: winecfg.rc:232 msgid "&Path:" @@ -13507,7 +13505,7 @@ msgstr "專家(&E)" #: winemine.rc:42 msgid "&Custom..." -msgstr "自定義(&C)" +msgstr "自定義(&C)..." #: winemine.rc:44 #, fuzzy @@ -13911,7 +13909,7 @@ msgstr "RTF豐富格式檔案" #: wordpad.rc:141 msgid "Text document" -msgstr "文本檔案 " +msgstr "文本檔案" #: wordpad.rc:142 msgid "Unicode text document"

1 0

Francois Gouget : po: Fix some typography issues in the Chinese (PRC) translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 39425cc9ac6788b0d1cbf8823a2cb74d1b48e0cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=39425cc9ac6788b0d1cbf8823… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:45:36 2012 +0100 po: Fix some typography issues in the Chinese (PRC) translation. --- po/zh_CN.po | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index b731d4f..1ef712c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -451,7 +451,7 @@ msgstr "打印质量(&Q):" #: comdlg32.rc:211 msgid "Print to Fi&le" -msgstr "打印到文件(&L):" +msgstr "打印到文件(&L)" #: comdlg32.rc:212 msgid "Condensed" @@ -752,7 +752,7 @@ msgstr "打印机(&P)..." #: comdlg32.rc:456 msgid "Look &in:" -msgstr "浏览(&I)" +msgstr "浏览(&I):" #: comdlg32.rc:462 msgid "File &name:" @@ -760,7 +760,7 @@ msgstr "文件名(&N):" #: comdlg32.rc:465 msgid "Files of &type:" -msgstr "文件类型(&T)" +msgstr "文件类型(&T):" #: comdlg32.rc:468 msgid "Open as &read-only" @@ -935,7 +935,7 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "这个值不在页数范围内。\n" -" 请输入一个 %d 和 %d 之间的数。" +"请输入一个 %d 和 %d 之间的数。" #: comdlg32.rc:56 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -960,7 +960,7 @@ msgid "" "Please enter a value between 1 and %d." msgstr "" "你的打印机不支持这么大的份数。\n" -" 请输入一个 1 和 %d 之间的数。" +"请输入一个 1 和 %d 之间的数。" #: comdlg32.rc:63 msgid "A printer error occurred." @@ -2183,7 +2183,7 @@ msgstr "文件名(&F):" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "浏览(&R)" +msgstr "浏览(&R)..." #: cryptui.rc:294 msgid "" @@ -6937,7 +6937,7 @@ msgstr "配置(&F)..." #: msvfw32.rc:40 msgid "&About" -msgstr "关于(&A)..." +msgstr "关于(&A)" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7539,7 +7539,7 @@ msgstr "创建捷径(&T)" #: shdoclc.rc:50 shdoclc.rc:81 shdoclc.rc:134 shdoclc.rc:161 shdoclc.rc:185 msgid "Add to &Favorites..." -msgstr "添加到我的最爱(&F)" +msgstr "添加到我的最爱(&F)..." #: shdoclc.rc:51 msgid "&View Source" @@ -7563,7 +7563,7 @@ msgstr "在新视窗打开链接(&N)" #: shdoclc.rc:65 shdoclc.rc:126 shdoclc.rc:148 shdoclc.rc:172 msgid "Save Target &As..." -msgstr "将目标存为(&A)" +msgstr "将目标存为(&A)..." #: shdoclc.rc:66 shdoclc.rc:127 shdoclc.rc:149 shdoclc.rc:173 msgid "&Print Target" @@ -7575,11 +7575,11 @@ msgstr "显示图片(&S)" #: shdoclc.rc:69 shdoclc.rc:176 msgid "&Save Picture As..." -msgstr "将图片存为(&A)" +msgstr "将图片存为(&A)..." #: shdoclc.rc:70 msgid "&E-mail Picture..." -msgstr "电邮图片(&E)" +msgstr "电邮图片(&E)..." #: shdoclc.rc:71 msgid "Pr&int Picture..." @@ -9316,7 +9316,7 @@ msgstr "数字时钟(&T)" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "字体(&F)" +msgstr "字体(&F)..." #: clock.rc:34 msgid "&Without Titlebar" @@ -10864,11 +10864,11 @@ msgstr "信息" #: progman.rc:65 msgid "Delete group `%s'?" -msgstr "是否删除程序组 `%s' ？" +msgstr "是否删除程序组 `%s'？" #: progman.rc:66 msgid "Delete program `%s'?" -msgstr "是否删除程序组 `%s' ?" +msgstr "是否删除程序组 `%s'?" #: progman.rc:67 #, fuzzy @@ -12404,7 +12404,7 @@ msgstr "已有的函数库顶替(&O):" #: winecfg.rc:190 msgid "&Edit..." -msgstr "编辑(&E)" +msgstr "编辑(&E)..." #: winecfg.rc:196 msgid "Edit Override" @@ -12452,7 +12452,7 @@ msgstr "无法连接到挂载管理器。不能修改驱动器配置。" #: winecfg.rc:227 msgid "&Add..." -msgstr "添加(&A)" +msgstr "添加(&A)..." #: winecfg.rc:229 msgid "Auto&detect" @@ -13434,7 +13434,7 @@ msgstr "专家(&E)" #: winemine.rc:42 msgid "&Custom..." -msgstr "自定义(&C)" +msgstr "自定义(&C)..." #: winemine.rc:44 #, fuzzy @@ -13547,7 +13547,7 @@ msgstr "总是在最前面(&T)" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "关于 Wine 帮助(&I)..." +msgstr "关于 Wine 帮助(&I)" #: winhlp32.rc:64 msgid "Annotation..." @@ -13595,7 +13595,7 @@ msgstr "找不到 richedit 的实现……终止" #: winhlp32.rc:91 msgid "Help topics: " -msgstr "帮助主题：" +msgstr "帮助主题： " #: wordpad.rc:28 msgid "&New...\tCtrl+N" @@ -13832,7 +13832,7 @@ msgstr "RTF 富文本" #: wordpad.rc:141 msgid "Text document" -msgstr "文本文件 " +msgstr "文本文件" #: wordpad.rc:142 msgid "Unicode text document"

1 0

Francois Gouget : po: Use full width full stops in the Chinese (Taiwan) translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: dd1adf56487c67a874ccdd3bdbf95c119e491c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1adf56487c67a874ccdd3bd… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:39:33 2012 +0100 po: Use full width full stops in the Chinese (Taiwan) translation. --- po/zh_TW.po | 80 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 097c2f9..afaf5b3 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -21,7 +21,7 @@ msgstr "安裝/卸載" msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要從軟碟，光碟或硬碟安裝新程式，請按'安裝'." +msgstr "要從軟碟，光碟或硬碟安裝新程式，請按'安裝'。" #: appwiz.rc:59 msgid "&Install..." @@ -32,7 +32,7 @@ msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Change/" "Remove." -msgstr "下列軟件可以自動卸載. 按'添加/刪除'可卸載選定程式或者調整已安裝部件." +msgstr "下列軟件可以自動卸載。按'添加/刪除'可卸載選定程式或者調整已安裝部件。" #: appwiz.rc:64 #, fuzzy @@ -121,8 +121,8 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"這個運用程式要顯示一個HTML 網頁. Wine 需要裝上 Gecko (Mozilla HTML engine)才" -"能顯示HTML網頁. 如果你想自動下載和安裝Gecko，請按'安裝'." +"這個運用程式要顯示一個HTML 網頁。 Wine 需要裝上 Gecko (Mozilla HTML engine)才" +"能顯示HTML網頁。如果你想自動下載和安裝Gecko，請按'安裝'。" #: appwiz.rc:106 msgid "&Install" @@ -156,7 +156,7 @@ msgstr "添加/刪除程式" msgid "" "Allows you to install new software, or remove existing software from your " "computer." -msgstr "允許你安裝新軟件, 和從你的電腦裡刪除現有程式." +msgstr "允許你安裝新軟件, 和從你的電腦裡刪除現有程式。" #: appwiz.rc:30 taskmgr.rc:262 winecfg.rc:30 msgid "Applications" @@ -166,7 +166,7 @@ msgstr "" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "不能執行卸載程式 '%s'. 你想把這個卸載程式從註冊表中刪除嗎?" +msgstr "不能執行卸載程式 '%s'。你想把這個卸載程式從註冊表中刪除嗎?" #: appwiz.rc:33 msgid "Not specified" @@ -975,7 +975,7 @@ msgstr "" #: comdlg32.rc:60 #, fuzzy msgid "The 'Number of copies' field cannot be empty." -msgstr "'份數' 項不能空." +msgstr "'份數' 項不能空。" #: comdlg32.rc:62 msgid "" @@ -1200,7 +1200,7 @@ msgid "" "and password are correct." msgstr "" "請確認你輸入的用戶名和密碼\n" -"是否正確." +"是否正確。" #: credui.rc:32 msgid "" @@ -1208,7 +1208,7 @@ msgid "" "\n" "Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" "entering your password." -msgstr "開著大寫鎖定可能導致你輸入錯誤的密碼." +msgstr "開著大寫鎖定可能導致你輸入錯誤的密碼。" #: credui.rc:31 msgid "Caps Lock is On" @@ -5658,7 +5658,7 @@ msgstr "" #: winerror.mc:2486 #, fuzzy msgid "Clipboard not open.\n" -msgstr "不能開啟檔案." +msgstr "不能開啟檔案。" #: winerror.mc:2491 msgid "Hotkey not registered.\n" @@ -6845,7 +6845,7 @@ msgstr "網址(&U):" #: mshtml.rc:31 msgid "HTML rendering is currently disabled." -msgstr "HTML 功能目前已被停用." +msgstr "HTML 功能目前已被停用。" #: mshtml.rc:32 msgid "HTML Document" @@ -6864,7 +6864,7 @@ msgstr "" msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." -msgstr "不能開啟所指定的安裝軟件包. 請檢查檔案路徑後再試." +msgstr "不能開啟所指定的安裝軟件包。請檢查檔案路徑後再試。" #: msi.rc:28 msgid "path %s not found" @@ -7350,7 +7350,7 @@ msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"將檔案的內容以對象的方式插入到你的檔案以便你可以用創建本檔案的程式來激活它." +"將檔案的內容以對象的方式插入到你的檔案以便你可以用創建本檔案的程式來激活它。" #: oledlg.rc:27 shell32.rc:194 msgid "Browse" @@ -7360,7 +7360,7 @@ msgstr "瀏覽" msgid "" "File does not appear to be a valid OLE module. Unable to register OLE " "control." -msgstr "本檔案不像是一個有效的 OLE 模型. 不能註冊 OLE 控件." +msgstr "本檔案不像是一個有效的 OLE 模型。不能註冊 OLE 控件。" #: oledlg.rc:29 msgid "Add Control" @@ -7368,20 +7368,20 @@ msgstr "添加控件" #: oledlg.rc:34 msgid "Inserts the contents of the clipboard into your document as %s." -msgstr "將剪貼板的內容以 %s 插入到你的檔案." +msgstr "將剪貼板的內容以 %s 插入到你的檔案。" #: oledlg.rc:35 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." -msgstr "將剪貼板的內容插入到你的檔案以便你可以使用 %s." +msgstr "將剪貼板的內容插入到你的檔案以便你可以使用 %s。" #: oledlg.rc:36 #, fuzzy msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." -msgstr "將剪貼板的內容插入到你的檔案以便你可以用 %s 激活它, 一般顯示為圖標." +msgstr "將剪貼板的內容插入到你的檔案以便你可以用 %s 激活它, 一般顯示為圖標。" #: oledlg.rc:37 #, fuzzy @@ -7390,8 +7390,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"將剪貼板的內容以 %s 插入到你的檔案. 數據是鏈接到源檔案的, 對源檔案的任何改動" -"都會反應到你的檔案." +"將剪貼板的內容以 %s 插入到你的檔案。數據是鏈接到源檔案的, 對源檔案的任何改動" +"都會反應到你的檔案。" #: oledlg.rc:38 #, fuzzy @@ -7400,8 +7400,8 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"將剪貼板的圖像插入到你的檔案. 圖像是鏈接到源檔案的, 對源檔案的任何改動都會反" -"應到你的檔案." +"將剪貼板的圖像插入到你的檔案。圖像是鏈接到源檔案的, 對源檔案的任何改動都會反" +"應到你的檔案。" #: oledlg.rc:39 #, fuzzy @@ -7410,12 +7410,12 @@ msgid "" "The shortcut is linked to the source file so that changes to the file will " "be reflected in your document." msgstr "" -"將剪貼板的捷徑插入到你的檔案. 捷徑是鏈接到源檔案的, 對源檔案的任何改動都會反" -"應到你的檔案." +"將剪貼板的捷徑插入到你的檔案。捷徑是鏈接到源檔案的, 對源檔案的任何改動都會反" +"應到你的檔案。" #: oledlg.rc:40 msgid "Inserts the contents of the clipboard into your document." -msgstr "將剪貼板的內容插入到你的檔案." +msgstr "將剪貼板的內容插入到你的檔案。" #: oledlg.rc:41 msgid "Unknown Type" @@ -9088,7 +9088,7 @@ msgstr "輸出檔案已存在, 按'確定'覆蓋。" #: winspool.rc:29 msgid "Unable to create the output file." -msgstr "不能開啟輸出檔案." +msgstr "不能開啟輸出檔案。" #: wldap32.rc:27 msgid "Success" @@ -10531,8 +10531,8 @@ msgid "" "These settings change only registry values.\n" "They have no effect on Wine performance." msgstr "" -"這些設定只改變註冊表值.\n" -"它對Wine的性能沒有影響." +"這些設定只改變註冊表值。\n" +"它對Wine的性能沒有影響。" #: oleview.rc:178 msgid "Default Interface Viewer" @@ -10605,7 +10605,7 @@ msgstr "執行 Wine 註冊表編輯器" #: oleview.rc:107 msgid "Quit the application. Prompts to save changes" -msgstr "結束程式. 提示儲存" +msgstr "結束程式。提示儲存" #: oleview.rc:108 msgid "Create an instance of the selected object" @@ -10720,7 +10720,7 @@ msgstr "激活" #: oleview.rc:142 msgid "CoGetClassObject failed." -msgstr "CoGetClassObject 失敗." +msgstr "CoGetClassObject 失敗。" #: oleview.rc:143 msgid "Unknown error" @@ -11738,7 +11738,7 @@ msgstr "處理器親和度" msgid "" "The Processor Affinity setting controls which CPUs the process will be " "allowed to execute on." -msgstr "處理器親和度設定控制各進程使用CPU分配情況." +msgstr "處理器親和度設定控制各進程使用CPU分配情況。" #: taskmgr.rc:446 msgid "CPU 0" @@ -11875,7 +11875,7 @@ msgstr "選擇顯示內容" #: taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "請選擇任務管理器中進程分頁的顯示內容." +msgstr "請選擇任務管理器中進程分頁的顯示內容。" #: taskmgr.rc:521 msgid "&Image Name" @@ -12307,7 +12307,7 @@ msgid "" "executable.\n" "Do you want to remove the uninstall entry from the registry?" msgstr "" -"卸載指令執行失敗 '%s', 可能是找不到可執行程式.\n" +"卸載指令執行失敗 '%s', 可能是找不到可執行程式。\n" "你想把這項卸載指令從註冊表中刪除嗎?" #: view.rc:33 @@ -13663,7 +13663,7 @@ msgstr "幫助檔案 (*.hlp)" #: winhlp32.rc:89 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "不能開啟檔案 '%s'. 你想要自己找這個檔案嗎?" +msgstr "不能開啟檔案 '%s'。你想要自己找這個檔案嗎?" #: winhlp32.rc:90 msgid "Cannot find a richedit implementation... Aborting" @@ -13996,17 +13996,17 @@ msgstr "儲存改動到 '%s'?" #: wordpad.rc:182 msgid "Finished searching the document." -msgstr "檔案查找結束." +msgstr "檔案查找結束。" #: wordpad.rc:183 msgid "Failed to load the RichEdit library." -msgstr "RichEdit 裝載失敗." +msgstr "RichEdit 裝載失敗。" #: wordpad.rc:184 msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "你已經選擇儲存為文本檔案, 這可能導致格式丟失. 你確定要這麼做嗎?" +msgstr "你已經選擇儲存為文本檔案, 這可能導致格式丟失。你確定要這麼做嗎?" #: wordpad.rc:187 #, fuzzy @@ -14020,19 +14020,19 @@ msgstr "不支援OLE 儲存檔案" #: wordpad.rc:189 msgid "Could not save the file." -msgstr "不能儲存檔案." +msgstr "不能儲存檔案。" #: wordpad.rc:190 msgid "You do not have access to save the file." -msgstr "你沒有儲存檔案的權力." +msgstr "你沒有儲存檔案的權力。" #: wordpad.rc:191 msgid "Could not open the file." -msgstr "不能開啟檔案." +msgstr "不能開啟檔案。" #: wordpad.rc:192 msgid "You do not have access to open the file." -msgstr "你沒有開啟檔案的權力." +msgstr "你沒有開啟檔案的權力。" #: wordpad.rc:193 #, fuzzy

1 0

Francois Gouget : msxml3/tests: Make test_XPath() static.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: ebe1a25208e723c09c5ab7b0d5ac20c0673daaa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe1a25208e723c09c5ab7b0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:32:17 2012 +0100 msxml3/tests: Make test_XPath() static. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fb3eab4..4f25961 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5523,7 +5523,7 @@ static const selection_ns_t selection_ns_data[] = { { NULL } }; -void test_XPath(void) +static void test_XPath(void) { const selection_ns_t *ptr = selection_ns_data; VARIANT var;

1 0

Francois Gouget : shell32: Make extracticon_create() static.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 79e85098d04f67ee4f779615a6337af2f03f9fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e85098d04f67ee4f779615a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:32:11 2012 +0100 shell32: Make extracticon_create() static. --- dlls/shell32/folders.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index b57fcf4..d077925 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -529,7 +529,7 @@ static const IPersistFileVtbl pfvt = (void *) 0xdeadbeef /* IEIPersistFile_fnGetCurFile */ }; -IExtractIconWImpl *extracticon_create(LPCITEMIDLIST pidl) +static IExtractIconWImpl *extracticon_create(LPCITEMIDLIST pidl) { IExtractIconWImpl *ei;

1 0

Francois Gouget : po: Use full width full stops in the Chinese (PRC) translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 9693685c2995931eb8d642e4f3c060537aadb6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9693685c2995931eb8d642e4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:40:33 2012 +0100 po: Use full width full stops in the Chinese (PRC) translation. --- po/zh_CN.po | 56 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index d1b8023..9f73710 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -21,7 +21,7 @@ msgstr "安装/卸载" msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要从软盘，光盘或硬盘安装新程序，请按'安装'." +msgstr "要从软盘，光盘或硬盘安装新程序，请按'安装'。" #: appwiz.rc:59 msgid "&Install..." @@ -32,7 +32,7 @@ msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Change/" "Remove." -msgstr "下列软件可以自动卸载. 按'添加/删除'可卸载选定程序或者调整已安装部件." +msgstr "下列软件可以自动卸载。按'添加/删除'可卸载选定程序或者调整已安装部件。" #: appwiz.rc:64 #, fuzzy @@ -157,7 +157,7 @@ msgstr "添加/删除程序" msgid "" "Allows you to install new software, or remove existing software from your " "computer." -msgstr "允许你安装新软件或删除现有程序." +msgstr "允许你安装新软件或删除现有程序。" #: appwiz.rc:30 taskmgr.rc:262 winecfg.rc:30 msgid "Applications" @@ -167,7 +167,7 @@ msgstr "应用程序" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "不能运行卸载程序 '%s'. 你想把这个卸载程序从注册表中删除吗?" +msgstr "不能运行卸载程序 '%s'。你想把这个卸载程序从注册表中删除吗?" #: appwiz.rc:33 msgid "Not specified" @@ -1173,7 +1173,7 @@ msgid "" "and password are correct." msgstr "" "请确认你输入的用户名和密码\n" -"是否正确." +"是否正确。" #: credui.rc:32 #, fuzzy @@ -1182,7 +1182,7 @@ msgid "" "\n" "Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" "entering your password." -msgstr "开着大写锁定可能导致你输入错误的密码." +msgstr "开着大写锁定可能导致你输入错误的密码。" #: credui.rc:31 msgid "Caps Lock is On" @@ -6831,7 +6831,7 @@ msgstr "网址(&U):" #: mshtml.rc:31 msgid "HTML rendering is currently disabled." -msgstr "HTML 功能目前已被停用." +msgstr "HTML 功能目前已被停用。" #: mshtml.rc:32 msgid "HTML Document" @@ -6850,7 +6850,7 @@ msgstr "" msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." -msgstr "不能打开所指定的安装软件包. 请检查文件路径后再试." +msgstr "不能打开所指定的安装软件包。请检查文件路径后再试。" #: msi.rc:28 msgid "path %s not found" @@ -7333,7 +7333,7 @@ msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"将文件的内容以对象的方式插入到你的文件以便你可以用创建本文件的程序来激活它." +"将文件的内容以对象的方式插入到你的文件以便你可以用创建本文件的程序来激活它。" #: oledlg.rc:27 shell32.rc:194 msgid "Browse" @@ -7343,7 +7343,7 @@ msgstr "浏览" msgid "" "File does not appear to be a valid OLE module. Unable to register OLE " "control." -msgstr "本文件不像是一个有效的 OLE 模型. 不能注册 OLE 控件." +msgstr "本文件不像是一个有效的 OLE 模型。不能注册 OLE 控件。" #: oledlg.rc:29 msgid "Add Control" @@ -7351,20 +7351,20 @@ msgstr "添加控件" #: oledlg.rc:34 msgid "Inserts the contents of the clipboard into your document as %s." -msgstr "将剪贴板的内容以 %s 插入到你的文件." +msgstr "将剪贴板的内容以 %s 插入到你的文件。" #: oledlg.rc:35 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." -msgstr "将剪贴板的内容插入到你的文件以便你可以使用 %s." +msgstr "将剪贴板的内容插入到你的文件以便你可以使用 %s。" #: oledlg.rc:36 #, fuzzy msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." -msgstr "将剪贴板的内容插入到你的文件以便你可以用 %s 激活它, 一般显示为图标." +msgstr "将剪贴板的内容插入到你的文件以便你可以用 %s 激活它, 一般显示为图标。" #: oledlg.rc:37 #, fuzzy @@ -7373,8 +7373,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"将剪贴板的内容以 %s 插入到你的文件. 数据是链接到源文件的, 对源文件的任何改动" -"都会反应到你的文件." +"将剪贴板的内容以 %s 插入到你的文件。数据是链接到源文件的, 对源文件的任何改动" +"都会反应到你的文件。" #: oledlg.rc:38 #, fuzzy @@ -7383,8 +7383,8 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"将剪贴板的图像插入到你的文件. 图像是链接到源文件的, 对源文件的任何改动都会反" -"应到你的文件." +"将剪贴板的图像插入到你的文件。图像是链接到源文件的, 对源文件的任何改动都会反" +"应到你的文件。" #: oledlg.rc:39 #, fuzzy @@ -7393,12 +7393,12 @@ msgid "" "The shortcut is linked to the source file so that changes to the file will " "be reflected in your document." msgstr "" -"将剪贴板的捷径插入到你的文件. 捷径是链接到源文件的, 对源文件的任何改动都会反" -"应到你的文件." +"将剪贴板的捷径插入到你的文件。捷径是链接到源文件的, 对源文件的任何改动都会反" +"应到你的文件。" #: oledlg.rc:40 msgid "Inserts the contents of the clipboard into your document." -msgstr "将剪贴板的内容插入到你的文件." +msgstr "将剪贴板的内容插入到你的文件。" #: oledlg.rc:41 msgid "Unknown Type" @@ -8222,7 +8222,7 @@ msgstr "Downloads" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied." -msgstr "无法创建新文件夹: 拒绝访问." +msgstr "无法创建新文件夹: 拒绝访问。" #: shell32.rc:167 msgid "Error during creation of a new folder" @@ -8254,7 +8254,7 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"已存在名为 '%1' 的文件.\n" +"已存在名为 '%1' 的文件。\n" "\n" "要替换吗?" @@ -8277,7 +8277,7 @@ msgstr "真的把这 %1 项送入回收站?" #: shell32.rc:176 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" -msgstr "'%1' 一项无法送入回收站. 要彻底删除吗?" +msgstr "'%1' 一项无法送入回收站。要彻底删除吗?" #: shell32.rc:183 msgid "" @@ -8287,9 +8287,9 @@ msgid "" "selected folder they will be replaced. Do you still want to move or copy\n" "the folder?" msgstr "" -"已存在名为 '%1' 的文件夹.\n" +"已存在名为 '%1' 的文件夹。\n" "\n" -"若选择合并原有同名文件将被替换. 真的要合并吗?" +"若选择合并原有同名文件将被替换。真的要合并吗?" #: shell32.rc:235 msgid "New Folder" @@ -8313,7 +8313,7 @@ msgstr "可执行文件 (*.exe)" #: shell32.rc:241 msgid "There is no Windows program configured to open this type of file." -msgstr "找不到用于打开此类文件的 Windows 程序." +msgstr "找不到用于打开此类文件的 Windows 程序。" #: shell32.rc:243 #, fuzzy @@ -9037,7 +9037,7 @@ msgstr "输出文件已存在, 按'确定'覆盖。" #: winspool.rc:29 msgid "Unable to create the output file." -msgstr "不能打开输出文件." +msgstr "不能打开输出文件。" #: wldap32.rc:27 msgid "Success" @@ -10678,7 +10678,7 @@ msgstr "激活" #: oleview.rc:142 msgid "CoGetClassObject failed." -msgstr "CoGetClassObject 失败." +msgstr "CoGetClassObject 失败。" #: oleview.rc:143 msgid "Unknown error"

1 0

Francois Gouget : po: Mark an incomplete Chinese (PRC) translation as fuzzy .
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 8de7c199ffc7808eba6208d36b1c7003fe349976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de7c199ffc7808eba6208d36… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:42:02 2012 +0100 po: Mark an incomplete Chinese (PRC) translation as fuzzy. --- po/zh_CN.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 69d0bbf..d1b8023 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1176,6 +1176,7 @@ msgstr "" "是否正确." #: credui.rc:32 +#, fuzzy msgid "" "Having Caps Lock on may cause you to enter your password incorrectly.\n" "\n"

1 0

Francois Gouget : po: Mark a couple of incomplete / invalid Chinese (Taiwan ) translations as fuzzy.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: 9a7fbaee7c73e4f9c486a6b4e5e34abac2e9f14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7fbaee7c73e4f9c486a6b4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:37:04 2012 +0100 po: Mark a couple of incomplete / invalid Chinese (Taiwan) translations as fuzzy. --- po/zh_TW.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index afaf5b3..c3a78c6 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1203,6 +1203,7 @@ msgstr "" "是否正確。" #: credui.rc:32 +#, fuzzy msgid "" "Having Caps Lock on may cause you to enter your password incorrectly.\n" "\n" @@ -13618,6 +13619,7 @@ msgid "Always on &top" msgstr "總是在最上面(&T)" #: winhlp32.rc:56 +#, fuzzy msgid "&About Wine Help" msgstr "資訊(&I)..."

1 0

Francois Gouget : po: Remove some invalid shell folder path translations from the Chinese (PRC) translation.
by Alexandre Julliard Feb. 20, 2012

Feb. 20, 2012

Module: wine Branch: master Commit: f0621ccdf9170897f2110cf5b0ee58453a0b39ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0621ccdf9170897f2110cf5b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 19 23:42:58 2012 +0100 po: Remove some invalid shell folder path translations from the Chinese (PRC) translation. --- po/zh_CN.po | 63 ++++++++++++++++++++++++---------------------------------- 1 files changed, 26 insertions(+), 37 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9f73710..b731d4f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8068,15 +8068,11 @@ msgstr "程序" #: shell32.rc:201 #, fuzzy msgid "My Documents" -msgstr "" -"#-#-#-#-# zh_CN.po (Wine) #-#-#-#-#\n" -"My Documents\n" -"#-#-#-#-# zh_CN.po (Wine) #-#-#-#-#\n" -"我的文档" +msgstr "我的文档" #: shell32.rc:202 msgid "Favorites" -msgstr "Favorites" +msgstr "" #: shell32.rc:203 msgid "StartUp" @@ -8084,15 +8080,15 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 msgid "My Music" -msgstr "My Music" +msgstr "" #: shell32.rc:206 msgid "My Videos" -msgstr "My Videos" +msgstr "" #: shell32.rc:207 #, fuzzy @@ -8102,15 +8098,15 @@ msgstr "桌面" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8122,7 +8118,7 @@ msgstr "Program Files" #: shell32.rc:214 msgid "My Pictures" -msgstr "My Pictures" +msgstr "" #: shell32.rc:215 #, fuzzy @@ -8131,24 +8127,23 @@ msgstr "复制文件..." #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "Documents" +msgstr "" #: shell32.rc:217 -#, fuzzy msgid "Administrative Tools" -msgstr "Start Menu\\Programs\\Administrative Tools" +msgstr "" #: shell32.rc:218 msgid "Music" -msgstr "Music" +msgstr "" #: shell32.rc:219 msgid "Pictures" -msgstr "Pictures" +msgstr "" #: shell32.rc:220 msgid "Videos" -msgstr "Videos" +msgstr "" #: shell32.rc:213 msgid "Program Files (x86)" @@ -8156,21 +8151,19 @@ msgstr "Program Files (x86)" #: shell32.rc:221 msgid "Contacts" -msgstr "Contacts" +msgstr "" #: shell32.rc:222 winefile.rc:112 msgid "Links" -msgstr "Links" +msgstr "" #: shell32.rc:223 -#, fuzzy msgid "Slide Shows" -msgstr "Pictures\\Slide Shows" +msgstr "" #: shell32.rc:224 -#, fuzzy msgid "Playlists" -msgstr "Music\\Playlists" +msgstr "" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -8185,40 +8178,36 @@ msgid "Model" msgstr "型号" #: shell32.rc:225 -#, fuzzy msgid "Sample Music" -msgstr "Music\\Sample Music" +msgstr "" #: shell32.rc:226 -#, fuzzy msgid "Sample Pictures" -msgstr "Pictures\\Sample Pictures" +msgstr "" #: shell32.rc:227 -#, fuzzy msgid "Sample Playlists" -msgstr "Music\\Sample Playlists" +msgstr "" #: shell32.rc:228 -#, fuzzy msgid "Sample Videos" -msgstr "Videos\\Sample Videos" +msgstr "" #: shell32.rc:229 msgid "Saved Games" -msgstr "Saved Games" +msgstr "" #: shell32.rc:230 msgid "Searches" -msgstr "Searches" +msgstr "" #: shell32.rc:231 msgid "Users" -msgstr "Users" +msgstr "" #: shell32.rc:233 msgid "Downloads" -msgstr "Downloads" +msgstr "" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied."

1 0