December 2015 - Wine-commits

Nikolay Sivov : dwrite/tests: Some tests for MapCharacters().
by Alexandre Julliard 08 Dec '15

08 Dec '15

Module: wine Branch: master Commit: 55e53648b4c009787b21e48c4a972a1effb614f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e53648b4c009787b21e48c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 8 18:28:33 2015 +0300 dwrite/tests: Some tests for MapCharacters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 255 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 251 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=55e53648b4c009787b21e…

1 0

Michael Müller : advapi32: Set last error to ERROR_SUCCESS in GetSidIdentifierAuthority.
by Alexandre Julliard 08 Dec '15

08 Dec '15

Module: wine Branch: master Commit: 79636bebbfa510b5f010098f57d422a4a2461e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79636bebbfa510b5f010098f5… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 8 16:07:44 2015 +0100 advapi32: Set last error to ERROR_SUCCESS in GetSidIdentifierAuthority. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 3 ++- dlls/advapi32/tests/security.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c64981e..08f88c0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1167,7 +1167,8 @@ GetEffectiveRightsFromAclW( PACL pacl, PTRUSTEEW pTrustee, PACCESS_MASK pAccessR PSID_IDENTIFIER_AUTHORITY WINAPI GetSidIdentifierAuthority( PSID pSid ) { - return RtlIdentifierAuthoritySid(pSid); + SetLastError(ERROR_SUCCESS); + return RtlIdentifierAuthoritySid(pSid); } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b171a81..c71e6fe 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -132,6 +132,7 @@ static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_S static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static NTSTATUS (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static PSID_IDENTIFIER_AUTHORITY (WINAPI *pGetSidIdentifierAuthority)(PSID); static HMODULE hmod; static int myARGC; @@ -196,6 +197,7 @@ static void init(void) pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); pGetAce = (void *)GetProcAddress(hmod, "GetAce"); pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid"); + pGetSidIdentifierAuthority = (void *)GetProcAddress(hmod, "GetSidIdentifierAuthority"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -6040,6 +6042,34 @@ static void test_GetWindowsAccountDomainSid(void) HeapFree(GetProcessHeap(), 0, user); } +static void test_GetSidIdentifierAuthority(void) +{ + char buffer[SECURITY_MAX_SID_SIZE]; + PSID authority_sid = (PSID *)buffer; + PSID_IDENTIFIER_AUTHORITY id; + BOOL ret; + + if (!pGetSidIdentifierAuthority) + { + win_skip("GetSidIdentifierAuthority not available\n"); + return; + } + + memset(buffer, 0xcc, sizeof(buffer)); + ret = IsValidSid(authority_sid); + ok(!ret, "expected FALSE, got %u\n", ret); + + SetLastError(0xdeadbeef); + id = GetSidIdentifierAuthority(authority_sid); + ok(id != NULL, "got NULL pointer as identifier authority\n"); + ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + id = GetSidIdentifierAuthority(NULL); + ok(id != NULL, "got NULL pointer as identifier authority\n"); + ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -6084,4 +6114,5 @@ START_TEST(security) test_AdjustTokenPrivileges(); test_AddAce(); test_system_security_access(); + test_GetSidIdentifierAuthority(); }

1 0

Henri Verbeet : ddraw: Mark surfaces as lost on mode changes.
by Alexandre Julliard 08 Dec '15

08 Dec '15

Module: wine Branch: master Commit: 571dc0faa502b63880e905c35d3e3da6d87c5599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571dc0faa502b63880e905c35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 8 14:27:18 2015 +0100 ddraw: Mark surfaces as lost on mode changes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 5 ++++- dlls/ddraw/tests/ddraw1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 42 +++++++++++++++++++++++++++++++++++++++++- 5 files changed, 167 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=571dc0faa502b63880e90…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 08 Dec '15

08 Dec '15

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

Alex Henrie : winecfg: Widen "Folder" column to accommodate Catalan translation.
by Alexandre Julliard 08 Dec '15

08 Dec '15

Module: wine Branch: master Commit: 7e5cb215403b621d205723dc9341806ca6431cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5cb215403b621d205723dc9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 8 00:08:10 2015 -0700 winecfg: Widen "Folder" column to accommodate Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 1f4818b..52e64eb 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -750,7 +750,7 @@ static void init_shell_folder_listview_headers(HWND dialog) { LoadStringW(GetModuleHandleW(NULL), IDS_LINKS_TO, szLinksTo, sizeof(szLinksTo)/sizeof(WCHAR)); GetClientRect(GetDlgItem(dialog, IDC_LIST_SFPATHS), &viewRect); - width = (viewRect.right - viewRect.left) / 4; + width = (viewRect.right - viewRect.left) / 3; listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = szShellFolder;

1 0

Julian Rüger : German translation for release 1.8-rc3
by Jeremy Newman 07 Dec '15

07 Dec '15

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

Julian Rüger : German translation of the SFC fundraiser
by Jeremy Newman 07 Dec '15

07 Dec '15

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

Jacek Caban : mshtml: Return success in SetCorsIncludeCredentials and SetCorsMode.
by Alexandre Julliard 07 Dec '15

07 Dec '15

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

Francois Gouget : po: Fix some trailing sp ace and exclamation mark issues in the Norwegian Bokmål translation.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: 608767a86c826446918a8c8ca74f06503fa0060e URL: http://source.winehq.org/git/wine.git/?a=commit;h=608767a86c826446918a8c8ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:06:22 2015 +0100 po: Fix some trailing space and exclamation mark issues in the Norwegian Bokmål translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 869e0d1..bf25bad 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2035,7 +2035,7 @@ msgstr "Sertifikatregler" #: cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "ID for regel:" +msgstr "ID for regel: " #: cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -3451,7 +3451,7 @@ msgstr "Oppsett av Wine Internet Explorer og relaterte innstillinger" #: inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "Sikkerhetsinnstillinger for sone:" +msgstr "Sikkerhetsinnstillinger for sone: " #: inetcpl.rc:34 msgid "Custom" @@ -13388,7 +13388,7 @@ msgstr "(Ingen)" #: winecfg.rc:86 msgid "Audio test failed!" -msgstr "Lydtesten feilet" +msgstr "Lydtesten feilet!" #: winecfg.rc:88 msgid "(System default)"

1 0

Francois Gouget : po: Fix ellipsis issues in the Norwegian Bokmål translation.
by Alexandre Julliard 07 Dec '15

07 Dec '15

Module: wine Branch: master Commit: 4f2016e57feb93a6b90e035682aad1ea599b0834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2016e57feb93a6b90e03568… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 6 19:09:17 2015 +0100 po: Fix ellipsis issues in the Norwegian Bokmål translation. The Microsoft Style Guidelines forbids inserting a space before the ellipsis in menu and button labels, unlike in regular sentences. Also Wine avoids the Unicode ellipsis character. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index bf25bad..cf75675 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2199,7 +2199,7 @@ msgstr "&Filnavn:" #: cryptui.rc:296 cryptui.rc:318 cryptui.rc:432 winecfg.rc:309 msgid "B&rowse..." -msgstr "&Bla …" +msgstr "&Bla..." #: cryptui.rc:297 msgid "" @@ -3251,23 +3251,23 @@ msgstr "Vind&u" #: ieframe.rc:34 view.rc:33 winhlp32.rc:32 msgid "&Open..." -msgstr "&Åpne …" +msgstr "&Åpne..." #: ieframe.rc:36 notepad.rc:33 wordpad.rc:34 msgid "Save &as..." -msgstr "L&agre som …" +msgstr "L&agre som..." #: ieframe.rc:38 msgid "Print &format..." -msgstr "Utskri&ftformat …" +msgstr "Utskri&ftformat..." #: ieframe.rc:39 msgid "Pr&int..." -msgstr "Skr&iv ut …" +msgstr "Skr&iv ut..." #: ieframe.rc:40 wordpad.rc:37 msgid "Print previe&w" -msgstr "Forhånds&visning …" +msgstr "Forhånds&visning..." #: ieframe.rc:47 msgid "&Toolbars" @@ -3365,11 +3365,11 @@ msgstr "" #: inetcpl.rc:59 msgid "Delete &files..." -msgstr "Slett &filer …" +msgstr "Slett &filer..." #: inetcpl.rc:60 msgid "&Settings..." -msgstr "Inn&stillinger …" +msgstr "Inn&stillinger..." #: inetcpl.rc:68 msgid "Delete browsing history" @@ -3435,11 +3435,11 @@ msgstr "" #: inetcpl.rc:114 msgid "Certificates..." -msgstr "Sertifikater …" +msgstr "Sertifikater..." #: inetcpl.rc:115 msgid "Publishers..." -msgstr "Utgivere …" +msgstr "Utgivere..." #: inetcpl.rc:31 msgid "Internet Settings" @@ -6783,7 +6783,7 @@ msgstr "HTML-dokument" #: mshtml.rc:29 msgid "Downloading from %s..." -msgstr "Laster ned fra «%s» …" +msgstr "Laster ned fra «%s» ..." #: mshtml.rc:28 msgid "Done" @@ -10431,7 +10431,7 @@ msgstr "Klarte ikke finne PATH\n" #: cmd.rc:383 msgid "Press any key to continue... " -msgstr "Trykk en tast for å fortsette …" +msgstr "Trykk en tast for å fortsette ... " #: cmd.rc:384 msgid "Wine Command Prompt" @@ -11753,7 +11753,7 @@ msgstr "&Om Registerredigering" #: regedit.rc:91 msgid "Modify Binary Data..." -msgstr "Endre binærdata …" +msgstr "Endre binærdata..." #: regedit.rc:218 msgid "Export registry" @@ -13943,7 +13943,7 @@ msgstr "Klarte ikke lagre" #: winedbg.rc:44 msgid "Loading detailed information, please wait..." -msgstr "Laster detaljert informasjon. Vent litt …" +msgstr "Laster detaljert informasjon. Vent litt ..." #: winefile.rc:29 msgid "&Open\tEnter" @@ -13967,7 +13967,7 @@ msgstr "&Stasjon" #: winefile.rc:44 msgid "Connect &Network Drive..." -msgstr "Koble til &nettverkstasjon …" +msgstr "Koble til &nettverkstasjon..." #: winefile.rc:45 msgid "&Disconnect Network Drive" @@ -13999,7 +13999,7 @@ msgstr "Sorter etter &dato" #: winefile.rc:59 msgid "Filter by&..." -msgstr "Filtrer &etter …" +msgstr "Filtrer &etter..." #: winefile.rc:66 msgid "&Drive Bar"

1 0