October 2017 - Wine-Commits

Alexandre Julliard : Wine release 2.20
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: website Branch: master Commit: 067a9fdcfb896112b8d146d870bcbaea07509ed5 URL: http://source.winehq.org/git/website.git/?a=commit;h=067a9fdcfb896112b8d146… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 19:16:12 2017 +0100 Wine release 2.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017103101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2017103101.xml b/news/en/2017103101.xml new file mode 100644 index 0000000..9fa8f99 --- /dev/null +++ b/news/en/2017103101.xml @@ -0,0 +1,18 @@ +<news> +<date>October 31, 2017</date> +<title>Wine 2.20 Released</title> +<body> + The Wine development release 2.20 is now available. + <a href="{$root}/announce/2.20">What's new</a> in this release: +<ul> + <li>Improved event support in MSHTML.</li> + <li>Preloader support on ARM64.</li> + <li>Interpolation modes in Direct3D.</li> + <li>Improved metafile support in GdiPlus.</li> + <li>Initial version of Kerberos5 Authentication Package.</li> + <li>OLE clipboard cache improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Marcus Meissner : po: Update German translation.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: b3ee6101734d6d4337ce6a4ae93772fb6c9ebe06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ee6101734d6d4337ce6a4ae… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 30 18:07:14 2017 +0100 po: Update German translation. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/po/de.po b/po/de.po index 15d0a75..89a132a 100644 --- a/po/de.po +++ b/po/de.po @@ -1,17 +1,20 @@ # German translations for Wine # +# Marcus Meissner <marcus(a)jet.franken.de>, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-08-08 16:25+0200\n" -"Last-Translator: Julian Rüger\n" -"Language-Team: German\n" +"PO-Revision-Date: 2017-10-28 15:22+0100\n" +"Last-Translator: Marcus Meissner <marcus(a)jet.franken.de>\n" +"Language-Team: German <kde-i18n-de(a)kde.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 2.0\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -12058,17 +12061,6 @@ msgid "Icons (*.ico)" msgstr "Symbole (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12084,7 +12076,7 @@ msgstr "" " REG [Operation] [Parameter]\n" "\n" "Unterstützte Operationen:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "Hilfe für eine spezifische Operation:\n" " REG [Operation] /?\n" @@ -12213,25 +12205,19 @@ msgstr "(Wert nicht gesetzt)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT file.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Die Datei '%1' wurde nicht gefunden.\n" +msgstr "reg: Die Datei '%1' wurde nicht gefunden.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "reg: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Unbekannte Escape-Sequenz [\\%1!c!]\n" +msgstr "reg: Unbekannte Escape-Sequenz [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry"

1 0

Lauri Kenttä : readme: Fix word order.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 258a1c783b9c39c892615cd7eb01678939557dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=258a1c783b9c39c892615cd7e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Oct 29 12:47:08 2017 +0200 readme: Fix word order. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 3d2e4cf..4b76546 100644 --- a/README +++ b/README @@ -23,7 +23,7 @@ Then either install wine: make install -Or run from it the build directory: +Or run it from the build directory: ./wine notepad

1 0

Huw Davies : user32: Trace the full NCCALCSIZE_PARAMS info if present.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 05e40aa67ddf4b570e0e549c0a000ea2dafd019f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e40aa67ddf4b570e0e549c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 30 10:29:14 2017 +0000 user32: Trace the full NCCALCSIZE_PARAMS info if present. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index ff80051..9fb7307 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2479,9 +2479,20 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) } break; case WM_NCCALCSIZE: + if (!sp_e->wParam) { RECT *rc = (RECT *)sp_e->lParam; - TRACE("Rect (%s)\n", wine_dbgstr_rect(rc)); + TRACE("Rect %s\n", wine_dbgstr_rect(rc)); + } + else + { + NCCALCSIZE_PARAMS *nc = (NCCALCSIZE_PARAMS *)sp_e->lParam; + TRACE("Rects %s %s %s\n", wine_dbgstr_rect(nc->rgrc), + wine_dbgstr_rect(nc->rgrc + 1), wine_dbgstr_rect(nc->rgrc + 2)); + if (nc->lppos) + TRACE("WINDOWPOS hwnd=%p, after=%p, at (%d,%d) w=%d h=%d, flags=0x%08x\n", + nc->lppos->hwnd, nc->lppos->hwndInsertAfter, nc->lppos->x, nc->lppos->y, + nc->lppos->cx, nc->lppos->cy, nc->lppos->flags); } break; case WM_NOTIFY:

1 0

Alexandre Julliard : Release 2.20.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 40b7831cd80607e42b9e1c910a62f022c45ac884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b7831cd80607e42b9e1c910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 31 19:13:35 2017 +0100 Release 2.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 510 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 260 insertions(+), 271 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b7831cd80607e42b9e1…

1 0

Huw Davies : ole32: There' s no need to store a separate clip format for the data.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 9cf2bd9d9165582e54ef824970818dda2cd767a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf2bd9d9165582e54ef82497… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:32 2017 +0000 ole32: There's no need to store a separate clip format for the data. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 9f9fdd3..7a19a17 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -101,8 +101,6 @@ typedef struct DataCacheEntry struct list entry; /* format of this entry */ FORMATETC fmtetc; - /* the clipboard format of the data */ - CLIPFORMAT data_cf; /* cached data */ STGMEDIUM stgmedium; /* @@ -351,7 +349,6 @@ static BOOL init_cache_entry(DataCacheEntry *entry, const FORMATETC *fmt, DWORD hr = copy_formatetc(&entry->fmtetc, fmt); if (FAILED(hr)) return FALSE; - entry->data_cf = 0; entry->stgmedium.tymed = TYMED_NULL; entry->stgmedium.pUnkForRelease = NULL; entry->stream = NULL; @@ -637,7 +634,6 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) GlobalUnlock( hmfpict ); if (SUCCEEDED( hr )) { - cache_entry->data_cf = cache_entry->fmtetc.cfFormat; cache_entry->stgmedium.tymed = TYMED_MFPICT; cache_entry->stgmedium.u.hMetaFilePict = hmfpict; } @@ -722,7 +718,6 @@ static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) GlobalUnlock( hglobal ); - cache_entry->data_cf = cache_entry->fmtetc.cfFormat; cache_entry->stgmedium.tymed = TYMED_HGLOBAL; cache_entry->stgmedium.u.hGlobal = hglobal; @@ -803,7 +798,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag if (FAILED(hr)) return hr; - hr = write_clipformat(pres_stream, cache_entry->data_cf); + hr = write_clipformat(pres_stream, cache_entry->fmtetc.cfFormat); if (FAILED(hr)) return hr; @@ -819,7 +814,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag header.dwSize = 0; /* size the data */ - switch (cache_entry->data_cf) + switch (cache_entry->fmtetc.cfFormat) { case CF_METAFILEPICT: { @@ -854,7 +849,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag } /* get the data */ - switch (cache_entry->data_cf) + switch (cache_entry->fmtetc.cfFormat) { case CF_METAFILEPICT: { @@ -983,7 +978,6 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, cache_entry->dirty = TRUE; ReleaseStgMedium(&cache_entry->stgmedium); - cache_entry->data_cf = cache_entry->fmtetc.cfFormat ? cache_entry->fmtetc.cfFormat : formatetc->cfFormat; if (formatetc->cfFormat == CF_BITMAP) { @@ -1001,8 +995,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, return S_OK; } else - return copy_stg_medium(cache_entry->data_cf, - &cache_entry->stgmedium, stgmedium); + return copy_stg_medium(cache_entry->fmtetc.cfFormat, &cache_entry->stgmedium, stgmedium); } static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fmt, STGMEDIUM *stgmedium) @@ -1023,13 +1016,12 @@ static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fm stgmedium->pUnkForRelease = NULL; return S_OK; } - return copy_stg_medium(cache_entry->data_cf, stgmedium, &cache_entry->stgmedium); + return copy_stg_medium(cache_entry->fmtetc.cfFormat, stgmedium, &cache_entry->stgmedium); } static inline HRESULT DataCacheEntry_DiscardData(DataCacheEntry *cache_entry) { ReleaseStgMedium(&cache_entry->stgmedium); - cache_entry->data_cf = cache_entry->fmtetc.cfFormat; return S_OK; } @@ -1844,7 +1836,7 @@ static HRESULT WINAPI DataCache_Draw( if (pfnContinue && !pfnContinue(dwContinue)) return E_ABORT; - switch (cache_entry->data_cf) + switch (cache_entry->fmtetc.cfFormat) { case CF_METAFILEPICT: { @@ -2103,7 +2095,7 @@ static HRESULT WINAPI DataCache_GetExtent( continue; - switch (cache_entry->data_cf) + switch (cache_entry->fmtetc.cfFormat) { case CF_METAFILEPICT: {

1 0

Huw Davies : ole32: TYMED_NULL is not valid.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: c3fe4b87d6e5f1635241faf8146ee0dddd054177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fe4b87d6e5f1635241faf81… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:31 2017 +0000 ole32: TYMED_NULL is not valid. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/ole2.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2bb0948..9f9fdd3 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -328,7 +328,7 @@ static HRESULT check_valid_formatetc( const FORMATETC *fmt ) if (fmt->dwAspect == DVASPECT_ICON && fmt->cfFormat != CF_METAFILEPICT) return DV_E_FORMATETC; - if (!fmt->cfFormat || !fmt->tymed || + if (!fmt->cfFormat || (fmt->cfFormat == CF_METAFILEPICT && fmt->tymed == TYMED_MFPICT) || (fmt->cfFormat == CF_BITMAP && fmt->tymed == TYMED_GDI) || (fmt->cfFormat == CF_DIB && fmt->tymed == TYMED_HGLOBAL) || diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 4f72622..aaee677 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2332,6 +2332,13 @@ static void test_data_cache_cache(void) hr = IOleCache2_Uncache( cache, conn ); ok( hr == S_OK, "got %08x\n", hr ); + /* tymed == 0 */ + fmt.cfFormat = CF_ENHMETAFILE; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.tymed = 0; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == DV_E_TYMED, "got %08x\n", hr ); + IDataObject_Release( data ); IOleCache2_Release( cache ); }

1 0

Huw Davies : ole32: Adding a view cache for DVASPECT_ICON produces a CF_METAFILEPICT cache entry.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 8d0a53e60d008e96cd136e4a286eb9591e381006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0a53e60d008e96cd136e4a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 13:23:29 2017 +0000 ole32: Adding a view cache for DVASPECT_ICON produces a CF_METAFILEPICT cache entry. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 11 ++++++++-- dlls/ole32/tests/ole2.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 360ecd8..7b33c59 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -310,10 +310,10 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { /* FIXME: also compare DVTARGETDEVICEs */ - if ((!cache_entry->fmtetc.cfFormat || !fmt.cfFormat || (fmt.cfFormat == cache_entry->fmtetc.cfFormat)) && + if ((fmt.cfFormat == cache_entry->fmtetc.cfFormat) && (fmt.dwAspect == cache_entry->fmtetc.dwAspect) && (fmt.lindex == cache_entry->fmtetc.lindex) && - (!cache_entry->fmtetc.tymed || !fmt.tymed || (fmt.tymed == cache_entry->fmtetc.tymed))) + ((fmt.tymed == cache_entry->fmtetc.tymed) || !cache_entry->fmtetc.cfFormat)) /* tymed is ignored for view caching */ return cache_entry; } return NULL; @@ -2245,6 +2245,13 @@ static HRESULT WINAPI DataCache_Cache( fmt_cpy.tymed = TYMED_HGLOBAL; } + /* View caching DVASPECT_ICON gets converted to CF_METAFILEPICT */ + if (fmt_cpy.dwAspect == DVASPECT_ICON && fmt_cpy.cfFormat == 0) + { + fmt_cpy.cfFormat = CF_METAFILEPICT; + fmt_cpy.tymed = TYMED_MFPICT; + } + *pdwConnection = 0; cache_entry = DataCache_GetEntryForFormatEtc(This, &fmt_cpy); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 08b6a27..509c625 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2122,7 +2122,7 @@ static void check_dib_size( HGLOBAL h, int cx, int cy ) GlobalUnlock( h ); } -static void test_data_cache_bitmap(void) +static void test_data_cache_cache(void) { HRESULT hr; IOleCache2 *cache; @@ -2137,6 +2137,13 @@ static void test_data_cache_bitmap(void) {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 0 }, {{ CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 0 } }; + STATDATA view_caching[] = + { + {{ 0, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 0 }, + {{ 0, 0, DVASPECT_THUMBNAIL, -1, TYMED_HGLOBAL }, 0, NULL, 0 }, + {{ 0, 0, DVASPECT_DOCPRINT, -1, TYMED_HGLOBAL }, 0, NULL, 0 }, + {{ CF_METAFILEPICT, 0, DVASPECT_ICON, -1, TYMED_MFPICT }, 0, NULL, 0 } + }; hr = CreateDataCache( NULL, &CLSID_NULL, &IID_IOleCache2, (void **)&cache ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2259,6 +2266,49 @@ static void test_data_cache_bitmap(void) check_dib_size( U(med).hGlobal, 2, 1 ); ReleaseStgMedium( &med ); + /* uncache everything */ + hr = IOleCache2_Uncache( cache, conn ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* view caching */ + fmt.cfFormat = 0; + fmt.tymed = TYMED_ENHMF; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + view_caching[0].dwConnection = conn; + + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + fmt.dwAspect = DVASPECT_THUMBNAIL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + view_caching[1].dwConnection = conn; + + fmt.dwAspect = DVASPECT_DOCPRINT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + view_caching[2].dwConnection = conn; + + /* DVASPECT_ICON view cache gets mapped to CF_METAFILEPICT */ + fmt.dwAspect = DVASPECT_ICON; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + view_caching[3].dwConnection = conn; + + check_enum_cache( cache, view_caching, 4 ); + + /* uncache everything */ + hr = IOleCache2_Uncache( cache, view_caching[3].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, view_caching[2].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, view_caching[1].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, view_caching[0].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + IDataObject_Release( data ); IOleCache2_Release( cache ); } @@ -3750,7 +3800,7 @@ START_TEST(ole2) test_data_cache(); test_data_cache_dib_contents_stream( 0 ); test_data_cache_dib_contents_stream( 1 ); - test_data_cache_bitmap(); + test_data_cache_cache(); test_data_cache_init(); test_data_cache_initnew(); test_default_handler();

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 37eb3066de199bbc2358010186db1b010e640a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=37eb3066de199bbc235801018… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Sun Oct 29 23:45:20 2017 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index fc09f30..84ed2b2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-08-18 22:29+0800\n" +"PO-Revision-Date: 2017-10-27 00:02-0500\n" "Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Poedit 2.0.4\n" "Plural-Forms: nplurals=1; plural=0;\n" #: appwiz.rc:58 @@ -11774,17 +11774,6 @@ msgid "Icons (*.ico)" msgstr "图标 (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -11923,25 +11912,19 @@ msgstr "(没有设值)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT file.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: 找不到文件 '%1'。\n" +msgstr "reg: 找不到文件 '%1'。\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: 无法打开注册表键 '%1'。\n" +msgstr "reg: 无法打开注册表键 '%1'。\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: 无法识别的转义序列 [\\%1!c!]\n" +msgstr "reg: 无法识别的转义序列 [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry"

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard Oct. 31, 2017

Oct. 31, 2017

Module: wine Branch: master Commit: 40156f3d0b5c76c6404193cec5b27f55edf6198e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40156f3d0b5c76c6404193cec… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Oct 29 12:48:22 2017 +0200 readme: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.fi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/README.fi b/documentation/README.fi index b2dc9ed..2c1bd0d 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -18,6 +18,14 @@ Aja Winen lähdekoodin juurihakemistossa seuraavat komennot: ./configure make +Sitten joko asenna Wine: + +make install + +Tai aja se käännöshakemistosta: + +./wine notepad + Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä ennen kaikkea Internetissä osoitteessa http://www.winehq.org/.

1 0