December 2015 - Wine-Commits

Hugh McMaster : cmd: Do not overwrite a user-specified Prompt variable.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 05bc632add5f6bc56de62632612eb10a1bff2725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05bc632add5f6bc56de626326… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 8 19:53:41 2015 +1100 cmd: Do not overwrite a user-specified Prompt variable. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ba7d9ca..bf988f5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2422,6 +2422,8 @@ int wmain (int argc, WCHAR *argvW[]) /* Until we start to read from the keyboard, stay as non-interactive */ interactive = FALSE; + SetEnvironmentVariableW(promptW, defaultpromptW); + if (opt_c || opt_k) { int len; WCHAR *q1 = NULL,*q2 = NULL,*p; @@ -2683,7 +2685,6 @@ int wmain (int argc, WCHAR *argvW[]) * Loop forever getting commands and executing them. */ - SetEnvironmentVariableW(promptW, defaultpromptW); interactive = TRUE; if (!opt_k) WCMD_version (); while (TRUE) {

1 0

Dmitry Timoshkov : winhttp/tests: Use symbolic names for http status codes.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 545a41750e164cff4775bd14a09c61c678dc164d URL: http://source.winehq.org/git/wine.git/?a=commit;h=545a41750e164cff4775bd14a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 8 07:01:29 2015 +0800 winhttp/tests: Use symbolic names for http status codes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index db789b3..7cc71b0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1061,7 +1061,7 @@ static void test_secure_connection(void) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); @@ -1125,7 +1125,7 @@ static void test_request_parameter_defaults(void) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); @@ -1161,7 +1161,7 @@ static void test_request_parameter_defaults(void) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); done: WinHttpCloseHandle(req); @@ -2176,7 +2176,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2293,7 +2293,7 @@ static void test_basic_authentication(int port) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 401, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2354,7 +2354,7 @@ static void test_basic_authentication(int port) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2390,7 +2390,7 @@ static void test_basic_authentication(int port) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2424,7 +2424,7 @@ static void test_basic_authentication(int port) size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == 401, "request failed unexpectedly %u\n", status); + ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2506,7 +2506,7 @@ static void test_no_content(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "expected success\n"); - ok(status == 204, "expected status 204, got %d\n", status); + ok(status == HTTP_STATUS_NO_CONTENT, "expected status 204, got %d\n", status); SetLastError(0xdeadbeef); size = sizeof(status); @@ -2580,14 +2580,14 @@ static void test_head_request(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to get status code %u\n", GetLastError()); - ok(status == 200, "got %u\n", status); + ok(status == HTTP_STATUS_OK, "got %u\n", status); len = 0xdeadbeef; size = sizeof(len); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &len, &size, 0); ok(ret, "failed to get content-length header %u\n", GetLastError()); - ok(len == 100, "got %u\n", len); + ok(len == HTTP_STATUS_CONTINUE, "got %u\n", len); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(req, &count); @@ -2783,7 +2783,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 200, "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); @@ -2800,7 +2800,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 200, "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -2821,7 +2821,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 200, "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); @@ -2838,7 +2838,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 200 || broken(status == 400), "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST), "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -2863,7 +2863,7 @@ static void test_cookies( int port ) size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == 400, "request failed unexpectedly %u\n", status ); + ok( status == HTTP_STATUS_BAD_REQUEST, "request failed unexpectedly %u\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 92657cf101bd7d121b17fb2d85c60a1a631b20dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=92657cf101bd7d121b17fb2d8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 8 00:08:39 2015 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ca.po b/po/ca.po index f43a5c4..8681672 100644 --- a/po/ca.po +++ b/po/ca.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: 2015-11-25 19:47-0700\n" +"PO-Revision-Date: 2015-12-07 09:53-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -3313,7 +3313,6 @@ msgctxt "home page" msgid "Home" msgstr "Inici" -# FIXME: The ellipsis makes this string too long (or not?) #: ieframe.rc:71 winhlp32.rc:69 msgid "Print..." msgstr "Imprimeix..." @@ -9649,7 +9648,6 @@ msgstr "Ana&lògic" msgid "Digi&tal" msgstr "Digi&tal" -# FIXME: The ellipsis makes this string too long (or not?) #: clock.rc:35 notepad.rc:53 winecfg.rc:303 winefile.rc:63 wordpad.rc:84 msgid "&Font..." msgstr "T&ipus de lletra..." @@ -13679,11 +13677,11 @@ msgstr "Element ressaltat" #: winecfg.rc:127 msgid "Active Title Bar Gradient" -msgstr "Degradat de barra de títol actiu" +msgstr "Títol actiu--Degradat" #: winecfg.rc:128 msgid "Inactive Title Bar Gradient" -msgstr "Degradat de barra de títol inactiu" +msgstr "Títol inactiu--Degradat" #: winecfg.rc:129 msgid "Menu Highlight"

1 0

Alex Henrie : ieframe: Widen toolbar buttons to accommodate Catalan translation.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: 9ca5cd317f96ef25df077b6f583a1655db781a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca5cd317f96ef25df077b6f5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 8 00:08:22 2015 -0700 ieframe: Widen toolbar buttons to accommodate Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/iexplore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 07061fd..5b58aa2 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -471,7 +471,7 @@ static void create_rebar(InternetExplorer *ie) add_tb_button(ie, 4, ID_BROWSE_HOME, IDS_TB_HOME); add_tb_separator(ie); add_tb_button(ie, 5, ID_BROWSE_PRINT, IDS_TB_PRINT); - SendMessageW(ie->toolbar_hwnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(55,50)); + SendMessageW(ie->toolbar_hwnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(65,50)); SendMessageW(ie->toolbar_hwnd, TB_GETMAXSIZE, 0, (LPARAM)&toolbar_size); bandinf.cbSize = sizeof(bandinf);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Dec. 8, 2015

Dec. 8, 2015

Module: wine Branch: master Commit: bc5f52c028e2f4d0bcee5420e608e6c725462756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5f52c028e2f4d0bcee5420e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 8 00:30:36 2015 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/po/ru.po b/po/ru.po index 38216e9..11f755a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -451,7 +451,7 @@ msgstr "Печатать" #: comdlg32.rc:206 comdlg32.rc:383 regedit.rc:219 msgid "&All" -msgstr "&Весь реестр" +msgstr "&Все" #: comdlg32.rc:207 msgid "S&election" @@ -543,7 +543,7 @@ msgstr "&Начертание:" #: comdlg32.rc:258 comdlg32.rc:435 winecfg.rc:294 msgid "&Size:" -msgstr "Размер:" +msgstr "&Размер:" #: comdlg32.rc:265 msgid "Effects" @@ -3807,11 +3807,11 @@ msgstr "Кончилась бумага.\n" #: winerror.mc:171 msgid "Write fault.\n" -msgstr "Не удаётся выполнить запись.\n" +msgstr "Ошибка записи.\n" #: winerror.mc:176 msgid "Read fault.\n" -msgstr "Не удаётся выполнить чтение.\n" +msgstr "Ошибка чтения.\n" #: winerror.mc:181 msgid "General failure.\n" @@ -3895,7 +3895,7 @@ msgstr "Закончилось место для хранения файлов, #: winerror.mc:281 msgid "Print canceled.\n" -msgstr "Вывод на печать отменён.\n" +msgstr "Печать отменена.\n" #: winerror.mc:286 msgid "Network name deleted.\n" @@ -3919,7 +3919,7 @@ msgstr "Слишком много сетевых имён.\n" #: winerror.mc:311 msgid "Too many network sessions.\n" -msgstr "Слишком много сетевых подключений NetBIOS.\n" +msgstr "Слишком много сетевых подключений.\n" #: winerror.mc:316 msgid "Sharing paused.\n" @@ -3927,7 +3927,7 @@ msgstr "Сервер остановлен или перезагружается. #: winerror.mc:321 msgid "Request not accepted.\n" -msgstr "Достигнут предел подключений к удалённому компьютеру.\n" +msgstr "Запрос не принят.\n" #: winerror.mc:326 msgid "Redirector paused.\n" @@ -4051,7 +4051,7 @@ msgstr "Недостаточный объём буфера.\n" #: winerror.mc:481 msgid "Invalid name.\n" -msgstr "Неверное имя файла, каталога или метки тома.\n" +msgstr "Неверное имя.\n" #: winerror.mc:486 msgid "Invalid level.\n" @@ -4395,7 +4395,7 @@ msgstr "Неверно задано имя каталога.\n" #: winerror.mc:916 msgid "Extended attributes didn't fit.\n" -msgstr "Расширенные атрибуты не помещаются.\n" +msgstr "Расширенные атрибуты не поместились.\n" #: winerror.mc:921 msgid "Extended attribute file corrupt.\n" @@ -4531,7 +4531,7 @@ msgstr "Невозможно записать ключ реестра.\n" #: winerror.mc:1086 msgid "Registry has been recovered.\n" -msgstr "Реестр восстановлен.\n" +msgstr "Реестр был восстановлен.\n" #: winerror.mc:1091 msgid "Registry is corrupt.\n" @@ -4543,7 +4543,7 @@ msgstr "Не удалось выполнить чтение или запись #: winerror.mc:1101 msgid "Not registry file.\n" -msgstr "Нет файла реестра.\n" +msgstr "Файл не является файлом реестра.\n" #: winerror.mc:1106 msgid "Key deleted.\n" @@ -4583,7 +4583,7 @@ msgstr "Не удалось создать поток службы.\n" #: winerror.mc:1151 msgid "Service database locked.\n" -msgstr "База данных службы заблокирована.\n" +msgstr "База данных служб заблокирована.\n" #: winerror.mc:1156 msgid "Service already running.\n" @@ -4663,7 +4663,7 @@ msgstr "Система работает в режиме «Последняя у #: winerror.mc:1251 msgid "Service dependency deleted.\n" -msgstr "Необходимая служба удалена.\n" +msgstr "Зависимость службы была удалена.\n" #: winerror.mc:1256 msgid "Boot already accepted as last-good config.\n" @@ -4683,7 +4683,7 @@ msgstr "Другая учётная запись.\n" #: winerror.mc:1276 msgid "Driver failure cannot be detected.\n" -msgstr "Сбой драйвера не выявляется.\n" +msgstr "Сбой драйвера не может быть обнаружен.\n" #: winerror.mc:1281 msgid "Process abort cannot be detected.\n" @@ -4879,7 +4879,7 @@ msgstr "Недостаточно пользовательских дескрип #: winerror.mc:1521 msgid "Message can only be used in synchronous calls.\n" -msgstr "Сообщение может использоваться только в асинхронных вызовах.\n" +msgstr "Сообщение может использоваться только в синхронных вызовах.\n" #: winerror.mc:1526 msgid "The source element is empty.\n" @@ -4991,7 +4991,7 @@ msgstr "Не удалось открыть профиль сетевого со #: winerror.mc:1661 msgid "Corrupt network connection profile.\n" -msgstr "Профиль сетевого соединения испорчен.\n" +msgstr "Профиль сетевого соединения повреждён.\n" #: winerror.mc:1666 msgid "Not a container.\n" @@ -5175,7 +5175,7 @@ msgstr "Необходимо выполнять операцию даже при #: winerror.mc:1896 msgid "The user profile is invalid.\n" -msgstr "Ошибка в профиле пользователя.\n" +msgstr "Неверный профиль пользователя.\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server.\n" @@ -5411,7 +5411,7 @@ msgstr "Превышено ограничение на число доменов #: winerror.mc:2191 msgid "Internal database corruption.\n" -msgstr "Разрушение внутренней базы данных.\n" +msgstr "Внутреннее повреждение базы данных.\n" #: winerror.mc:2196 msgid "Internal error.\n" @@ -7572,7 +7572,7 @@ msgstr "Настройки %s" #: serialui.rc:31 msgid "Baud Rate" -msgstr "Наибольшая скорость" +msgstr "Скорость" #: serialui.rc:33 msgid "Parity" @@ -7607,8 +7607,8 @@ msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" -"Вставьте установочный диск, и затем\n" -"проверьте что выбран нужный привод" +"Вставьте установочный диск, а затем\n" +"убедитесь что выбран нужный привод" #: setupapi.rc:57 msgid "Copy manufacturer's files from:" @@ -9125,7 +9125,7 @@ msgid "" "until the device is free, and then try again." msgstr "" "Невозможно использовать текущее устройство для воспроизведения, так как оно " -"занято. Подождите, пока устройство освободится, и попробуйте заново." +"занято. Подождите пока устройство освободится, и попробуйте заново." #: winmm.rc:114 msgid "" @@ -9133,7 +9133,7 @@ msgid "" "Wait until a wave device is free, and then try again." msgstr "" "Невозможно использовать текущее устройство для записи, так как оно занято. " -"Подождите, пока устройство освободится, и попробуйте заново." +"Подождите пока устройство освободится, и попробуйте заново." #: winmm.rc:115 msgid "" @@ -9141,7 +9141,7 @@ msgid "" "until the device is free, and then try again." msgstr "" "Невозможно использовать текущее устройство для воспроизведения, так как оно " -"занято. Подождите, пока устройство освободится, и попробуйте заново." +"занято. Подождите пока устройство освободится, и попробуйте заново." #: winmm.rc:116 msgid "Any compatible waveform playback device may be used." @@ -9528,7 +9528,7 @@ msgid "" "Not Yet Implemented\n" "\n" msgstr "" -"Ещё не выполнено\n" +"Ещё не реализовано\n" "\n" #: attrib.rc:31 cmd.rc:364

1 0

Julian Rüger : German translation of the SFC fundraiser
by Jeremy Newman Dec. 7, 2015

Dec. 7, 2015

Module: website Branch: master Commit: c4130a73f5926d9378ef91e9d7d7d7850c08492b URL: http://source.winehq.org/git/website.git/?a=commit;h=c4130a73f5926d9378ef91… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Dec 6 15:10:22 2015 +0100 German translation of the SFC fundraiser Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015112901.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2015112901.xml b/news/de/2015112901.xml new file mode 100644 index 0000000..d8cf55f --- /dev/null +++ b/news/de/2015112901.xml @@ -0,0 +1,18 @@ +<news> +<date>29. November 2015</date> +<title>Software Freedom Conservancy 2015 Spendenkampagne</title> +<body> +Die <a href="https://sfconservancy.org/">Software Freedom Conservancy</a> ist eine nicht-profitorientierte +Organisation die FLOSS-Projekte unterstützt, indem sie für Dinge wie die Verwaltung von Spenden und Vermögen, +grundlegende Rechtsberatung und die Durchsetzung der FLOSS-Lizenzen sorgt. Sie waren auch für das Wine-Projekt +immer äußerst hilfreich. + +Leider wurde der SFC in den letzten Jahren, besonders durch Aktivitäten wie der Durchsetzung von FLOSS-Lizenzen, +die kommerzielle Unterstützung einiger Unternehmen entzogen, so dass sie jetzt noch mehr auf individuelle Spender +angewiesen ist. Daher hat die SFC kürzlich ihre <a href="https://sfconservancy.org/supporter/">Spendenkampagne 2015</a> +gestartet und ihre Mitgliedsprojekte um Unterstützung bei der Bekanntmachung gebeten. + +Bitte ziehen auch Sie eine <a href="https://sfconservancy.org/donate/">Spende</a> in Betracht; Ihre Unterstützung +der SFC wird all ihren <a href="https://sfconservancy.org/members/current/">Mitgliedern</a> zu Gute kommen, +einschließlich des Wine-Projektes. +</body></news>

1 0

Julian Rüger : German translation for release 1.8-rc3
by Jeremy Newman Dec. 7, 2015

Dec. 7, 2015

Module: website Branch: master Commit: 66bd39f02db123926d56e61f2977c107658921bf URL: http://source.winehq.org/git/website.git/?a=commit;h=66bd39f02db123926d56e6… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Dec 6 15:12:08 2015 +0100 German translation for release 1.8-rc3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015120401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2015120401.xml b/news/de/2015120401.xml new file mode 100644 index 0000000..90eca43 --- /dev/null +++ b/news/de/2015120401.xml @@ -0,0 +1,12 @@ +<news> +<date>4. Dezember 2015</date> +<title>Wine 1.8-rc3 freigegeben</title> +<body> + Die Entwicklungsversion 1.8-rc3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8-rc3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerkorrekturen, da wir uns im Code-freeze befinden.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Jacek Caban : mshtml: Return success in SetCorsIncludeCredentials and SetCorsMode.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 7c4c93a2bf0189e9911b9aba52e80654f1e062fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4c93a2bf0189e9911b9aba5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 4 17:32:47 2015 +0100 mshtml: Return success in SetCorsIncludeCredentials and SetCorsMode. Fixes regression in loading site-provided fonts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bd6a202..a2615c4 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1922,8 +1922,8 @@ static nsresult NSAPI nsHttpChannelInternal_SetCorsIncludeCredentials(nsIHttpCha cpp_bool aCorsIncludeCredentials) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); - FIXME("(%p)->(%x)\n", This, aCorsIncludeCredentials); - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%x)\n", This, aCorsIncludeCredentials); + return NS_OK; } static nsresult NSAPI nsHttpChannelInternal_GetCorsMode(nsIHttpChannelInternal *iface, UINT32 *aCorsMode) @@ -1936,8 +1936,8 @@ static nsresult NSAPI nsHttpChannelInternal_GetCorsMode(nsIHttpChannelInternal * static nsresult NSAPI nsHttpChannelInternal_SetCorsMode(nsIHttpChannelInternal *iface, UINT32 aCorsMode) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); - FIXME("(%p)->(%d)\n", This, aCorsMode); - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%d)\n", This, aCorsMode); + return NS_OK; } static nsresult NSAPI nsHttpChannelInternal_GetTopWindowURI(nsIHttpChannelInternal *iface, nsIURI **aTopWindowURI)

1 0

Jacek Caban : mshtml: Fixed nsIHttpChannelInternal declaration.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 4dc8a96f78297c8b9033d6e07f959bf1d3989f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc8a96f78297c8b9033d6e07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 4 17:31:57 2015 +0100 mshtml: Fixed nsIHttpChannelInternal declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsiface.idl | 4 +++- dlls/mshtml/nsio.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 943cdb4..ccb2547 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -652,9 +652,11 @@ interface nsIHttpChannelInternal : nsISupports nsresult SetDocumentURI(nsIURI *aDocumentURI); nsresult GetRequestVersion(uint32_t *major, uint32_t *minor); nsresult GetResponseVersion(uint32_t *major, uint32_t *minor); - nsresult TakeAllSecurityMessages(void /*securityMessagesArray*/ *aMessages); + nsresult TakeAllSecurityMessages(void /*nsCOMArray<nsISecurityConsoleMessage>*/ *aMessages); nsresult SetCookie(const char *aCookieHeader); nsresult SetupFallbackChannel(const char *aFallbackKey); + nsresult GetThirdPartyFlags(uint32_t *aThirdPartyFlags); + nsresult SetThirdPartyFlags(uint32_t aThirdPartyFlags); nsresult GetForceAllowThirdPartyCookie(bool *aForceAllowThirdPartyCookie); nsresult SetForceAllowThirdPartyCookie(bool aForceAllowThirdPartyCookie); nsresult GetCanceled(bool *aCanceled); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c4efc5c..bd6a202 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1726,6 +1726,20 @@ static nsresult NSAPI nsHttpChannelInternal_SetupFallbackChannel(nsIHttpChannelI return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsHttpChannelInternal_GetThirdPartyFlags(nsIHttpChannelInternal *iface, UINT32 *aThirdPartyFlags) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aThirdPartyFlags); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_SetThirdPartyFlags(nsIHttpChannelInternal *iface, UINT32 aThirdPartyFlags) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%x)\n", This, aThirdPartyFlags); + return NS_ERROR_NOT_IMPLEMENTED; +} + static nsresult NSAPI nsHttpChannelInternal_GetForceAllowThirdPartyCookie(nsIHttpChannelInternal *iface, cpp_bool *aForceThirdPartyCookie) { nsChannel *This = impl_from_nsIHttpChannelInternal(iface); @@ -1974,6 +1988,8 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_TakeAllSecurityMessages, nsHttpChannelInternal_SetCookie, nsHttpChannelInternal_SetupFallbackChannel, + nsHttpChannelInternal_GetThirdPartyFlags, + nsHttpChannelInternal_SetThirdPartyFlags, nsHttpChannelInternal_GetForceAllowThirdPartyCookie, nsHttpChannelInternal_SetForceAllowThirdPartyCookie, nsHttpChannelInternal_GetCanceled,

1 0

Francois Gouget : po: Fuzzy an incomplete Croatian translation.
by Alexandre Julliard Dec. 7, 2015

Dec. 7, 2015

Module: wine Branch: master Commit: 3975181a4d6dd2eaa1929eb5e740b162fd8dc052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3975181a4d6dd2eaa1929eb5e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:25:45 2015 +0100 po: Fuzzy an incomplete Croatian translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/hr.po | 1 + 1 file changed, 1 insertion(+) diff --git a/po/hr.po b/po/hr.po index 3566c1d..9046139 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11262,6 +11262,7 @@ msgid "File `%s' exists. Not overwritten." msgstr "Datoteka `%s' postoji. Nije prepisana." #: progman.rc:80 +#, fuzzy msgid "Save group as `%s to prevent overwriting original files." msgstr "Spremi grupi kao `%s' kako "

1 0