wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Dmitry Timoshkov : ntdll: Add an access check for file mappings.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 3a5ee02735d49a808f3f3fc3a3f39d8e14089a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5ee02735d49a808f3f3fc3a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 24 17:45:54 2012 +0800 ntdll: Add an access check for file mappings. --- dlls/kernel32/tests/loader.c | 2 +- dlls/kernel32/tests/virtual.c | 1 - dlls/ntdll/virtual.c | 48 +++++++++++++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 398e5f5..0b67bb6 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -639,7 +639,7 @@ static void test_VirtualProtect(void *base, void *section) ret = VirtualProtect(section, si.dwPageSize, td[i].prot_set, &old_prot); if (td[i].prot_get) { - ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); + ok(ret, "%d: VirtualProtect error %d, requested prot %#x\n", i, GetLastError(), td[i].prot_set); ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 915f92d..d502bbf 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2207,7 +2207,6 @@ static void test_mapping(void) /* NT4 doesn't fail on incompatible map and view */ if (ret) { - todo_wine ok(broken(ret), "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); skip("Incompatible map and view are not properly handled on this platform\n"); break; /* NT4 won't pass remaining tests */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 344a81a..717917d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -73,6 +73,7 @@ struct file_view void *base; /* Base address */ size_t size; /* Size in bytes */ HANDLE mapping; /* Handle to the file mapping */ + unsigned int map_protect; /* Mapping protection */ unsigned int protect; /* Protection for all pages at allocation time */ BYTE prot[1]; /* Protection byte for each page */ }; @@ -474,6 +475,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz view->base = base; view->size = size; view->mapping = 0; + view->map_protect = 0; view->protect = vprot; memset( view->prot, vprot, size >> page_shift ); @@ -1116,7 +1118,7 @@ static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) * Map an executable (PE format) image into memory. */ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_size, SIZE_T mask, - SIZE_T header_size, int shared_fd, HANDLE dup_mapping, PVOID *addr_ptr ) + SIZE_T header_size, int shared_fd, HANDLE dup_mapping, unsigned int map_vprot, PVOID *addr_ptr ) { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; @@ -1363,6 +1365,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz done: view->mapping = dup_mapping; + view->map_protect = map_vprot; server_leave_uninterrupted_section( &csVirtual, &sigset ); *addr_ptr = ptr; @@ -2039,6 +2042,34 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si return status; } +static ULONG map_protection_to_access( ULONG vprot ) +{ + vprot &= VPROT_READ | VPROT_WRITE | VPROT_EXEC | VPROT_WRITECOPY; + if (vprot & VPROT_EXEC) + { + if (vprot & VPROT_WRITE) vprot |= VPROT_WRITECOPY; + } + else vprot &= ~VPROT_WRITECOPY; + return vprot; +} + +static BOOL is_compatible_protection( const struct file_view *view, ULONG new_prot ) +{ + ULONG view_prot, map_prot; + + view_prot = map_protection_to_access( view->protect ); + new_prot = map_protection_to_access( new_prot ); + + if (view_prot == new_prot) return TRUE; + if (!view_prot) return FALSE; + + if ((view_prot & new_prot) != new_prot) return FALSE; + + map_prot = map_protection_to_access( view->map_protect ); + if ((map_prot & new_prot) == new_prot) return TRUE; + + return FALSE; +} /*********************************************************************** * NtProtectVirtualMemory (NTDLL.@) @@ -2099,9 +2130,13 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T status = STATUS_INVALID_PAGE_PROTECTION; else { - new_vprot |= VPROT_COMMITTED; - if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); - if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + if (!view->mapping || is_compatible_protection( view, new_vprot )) + { + new_vprot |= VPROT_COMMITTED; + if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); + if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; + } + else status = STATUS_INVALID_PAGE_PROTECTION; } } } @@ -2571,14 +2606,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if ((res = server_get_unix_fd( shared_file, FILE_READ_DATA|FILE_WRITE_DATA, &shared_fd, &shared_needs_close, NULL, NULL ))) goto done; res = map_image( handle, unix_handle, base, size, mask, header_size, - shared_fd, dup_mapping, addr_ptr ); + shared_fd, dup_mapping, map_vprot, addr_ptr ); if (shared_needs_close) close( shared_fd ); NtClose( shared_file ); } else { res = map_image( handle, unix_handle, base, size, mask, header_size, - -1, dup_mapping, addr_ptr ); + -1, dup_mapping, map_vprot, addr_ptr ); } if (needs_close) close( unix_handle ); if (res >= 0) *size_ptr = size; @@ -2628,6 +2663,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p *addr_ptr = view->base; *size_ptr = size; view->mapping = dup_mapping; + view->map_protect = map_vprot; dup_mapping = 0; /* don't close it */ } else

1 0

Dmitry Timoshkov : ntdll: Use PAGE_EXECUTE_READ protection for an image section.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 0e85fc66deef8524fa079d0906f4ff3728448bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e85fc66deef8524fa079d090… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 24 17:45:21 2012 +0800 ntdll: Use PAGE_EXECUTE_READ protection for an image section. --- dlls/ntdll/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 98e3dfb..381e2ac 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1486,12 +1486,12 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, size.QuadPart = 0; status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ, - NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); + NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, file ); if (status != STATUS_SUCCESS) return status; module = NULL; status = NtMapViewOfSection( mapping, NtCurrentProcess(), - &module, 0, 0, &size, &len, ViewShare, 0, PAGE_READONLY ); + &module, 0, 0, &size, &len, ViewShare, 0, PAGE_EXECUTE_READ ); if (status < 0) goto done; /* create the MODREF */

1 0

Dmitry Timoshkov : server: Store correct protection for an image mapping.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 29b91206a85878b43a31a7ab2dba7d62e33f7457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b91206a85878b43a31a7ab2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 24 17:44:56 2012 +0800 server: Store correct protection for an image mapping. --- server/mapping.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index f37016f..90956e9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -395,7 +395,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, } /* retrieve the mapping parameters for an executable (PE) image */ -static int get_image_params( struct mapping *mapping, int unix_fd ) +static int get_image_params( struct mapping *mapping, int unix_fd, int protect ) { IMAGE_DOS_HEADER dos; IMAGE_SECTION_HEADER *sec = NULL; @@ -453,7 +453,7 @@ static int get_image_params( struct mapping *mapping, int unix_fd ) if (mapping->shared_file) list_add_head( &shared_list, &mapping->shared_entry ); - mapping->protect = VPROT_IMAGE; + mapping->protect = protect; free( sec ); return 1; @@ -523,7 +523,7 @@ static struct object *create_mapping( struct directory *root, const struct unico if ((unix_fd = get_unix_fd( mapping->fd )) == -1) goto error; if (protect & VPROT_IMAGE) { - if (!get_image_params( mapping, unix_fd )) goto error; + if (!get_image_params( mapping, unix_fd, protect )) goto error; return &mapping->obj; } if (fstat( unix_fd, &st ) == -1)

1 0

Francois Gouget : po: Remove spaces before a '\n'.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: bf044ed50cf0652ab17b1f5da503161f8b027194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf044ed50cf0652ab17b1f5da… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:36:42 2012 +0100 po: Remove spaces before a '\n'. --- po/ca.po | 2 +- po/fa.po | 2 +- po/ja.po | 4 ++-- po/ko.po | 22 +++++++++++----------- po/nl.po | 4 ++-- po/sl.po | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/po/ca.po b/po/ca.po index b871546..1a8e42f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10093,7 +10093,7 @@ msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" -"Error: Establir el nom d'equip del sistema no és possible amb la utilitat \n" +"Error: Establir el nom d'equip del sistema no és possible amb la utilitat\n" "hostname.\n" #: ipconfig.rc:27 diff --git a/po/fa.po b/po/fa.po index b79ff57..4ad62ff 100644 --- a/po/fa.po +++ b/po/fa.po @@ -8324,7 +8324,7 @@ msgid "" "Not enough memory available for this task. Quit one or more applications to " "increase available memory, and then try again." msgstr "" -"حافظه‌ی موقت برای انجام این کار وجود ندارد. \n" +"حافظه‌ی موقت برای انجام این کار وجود ندارد.\n" "یک یا چند ابزار و برنامه‌ی دیگر را ببندید تا مقدار آزاد حافظه‌ی موقت را افزایش " "دهید." diff --git a/po/ja.po b/po/ja.po index d4e055b..d040d31 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11402,11 +11402,11 @@ msgid "" msgstr "" "start.exe バージョン 0.2 Copyright (C) 2003, Dan Kegel\n" "このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェ\n" -"ア財団によって発行されたGNU 劣等一般公衆利用許諾契約書(バージョン2.1 \n" +"ア財団によって発行されたGNU 劣等一般公衆利用許諾契約書(バージョン2.1\n" "か、希望によってはそれ以降のバージョンのうちどれか)の定める条件の下で\n" "再頒布または改変することができます。\n" "\n" -"このプログラムは有用であることを願って頒布されますが、*全くの無保証* \n" +"このプログラムは有用であることを願って頒布されますが、*全くの無保証*\n" "です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含\n" "め全く存在しません。詳しくはGNU 劣等一般公衆利用許諾契約書をご覧くださ\n" "い。\n" diff --git a/po/ko.po b/po/ko.po index a6aa913..a907518 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3832,7 +3832,7 @@ msgstr "세마포어가 설정되었습니다\n" #: winerror.mc:391 msgid "Too many semaphore requests\n" -msgstr "세마포어 요청이 너무 많습니다 \n" +msgstr "세마포어 요청이 너무 많습니다\n" #: winerror.mc:396 msgid "Invalid at interrupt time\n" @@ -3924,7 +3924,7 @@ msgstr "~에 대해 대기하는 자식 프로세스가 없음\n" #: winerror.mc:511 msgid "Child process has not completed\n" -msgstr "자식 프로세스가 완료되지 않았습니다 \n" +msgstr "자식 프로세스가 완료되지 않았습니다\n" #: winerror.mc:516 msgid "Invalid use of direct access handle\n" @@ -4080,7 +4080,7 @@ msgstr "올바르지 않은 세그멘트 번호\n" #: winerror.mc:711 msgid "Invalid ordinal for %1\n" -msgstr "올바르지 않은 %1 오디널 \n" +msgstr "올바르지 않은 %1 오디널\n" #: winerror.mc:716 msgid "File already exists\n" @@ -4108,7 +4108,7 @@ msgstr "%1의 올바르지 않은 모듈 형식\n" #: winerror.mc:746 msgid "Invalid EXE signature in %1\n" -msgstr "%1 의 올바르지 않은 EXE 서명 \n" +msgstr "%1 의 올바르지 않은 EXE 서명\n" #: winerror.mc:751 msgid "EXE %1 is marked invalid\n" @@ -4124,7 +4124,7 @@ msgstr "%1의 반복 데이타가 64k를 넘음\n" #: winerror.mc:766 msgid "Invalid MinAllocSize in %1\n" -msgstr "%1의 올바르지 않은 MinAllocSize \n" +msgstr "%1의 올바르지 않은 MinAllocSize\n" #: winerror.mc:771 msgid "Dynlink from invalid ring\n" @@ -4136,7 +4136,7 @@ msgstr "IOPL는 가능하지 않습니다\n" #: winerror.mc:781 msgid "Invalid SEGDPL in %1\n" -msgstr "%1의 올바르지 않은 SEGDPL \n" +msgstr "%1의 올바르지 않은 SEGDPL\n" #: winerror.mc:786 msgid "Auto data segment exceeds 64k\n" @@ -5520,7 +5520,7 @@ msgstr "올바르지 않은 편집 높이\n" #: winerror.mc:2521 msgid "DC not found\n" -msgstr "DC를 찾을 수 없습니다 \n" +msgstr "DC를 찾을 수 없습니다\n" #: winerror.mc:2526 msgid "Invalid hook filter\n" @@ -5616,7 +5616,7 @@ msgstr "올바르지 않은 스코롤바 범위\n" #: winerror.mc:2641 msgid "Invalid ShowWin command\n" -msgstr "올바르지 않은 ShowWin 명령 \n" +msgstr "올바르지 않은 ShowWin 명령\n" #: winerror.mc:2646 msgid "No system resources\n" @@ -6197,7 +6197,7 @@ msgstr "RPC 요구는 이미 작업중입니다\n" #: winerror.mc:3371 msgid "NETLOGON is not started\n" -msgstr "NETLOGON 는 시작되어 있지 않습니다 \n" +msgstr "NETLOGON 는 시작되어 있지 않습니다\n" #: winerror.mc:3376 msgid "Account expired\n" @@ -9695,7 +9695,7 @@ msgid "" "presses an allowed Key from a selectable list.\n" "CHOICE is mainly used to build a menu selection in a batch file.\n" msgstr "" -"CHOICE는 텍스트를 보여주고, 사용자가 선택된 목록에서 \n" +"CHOICE는 텍스트를 보여주고, 사용자가 선택된 목록에서\n" "허용하는 키를 누를 때까지 기다립니다.\n" "CHOICE는 주로 배치 파일에서 메뉴 선택을 넣는 데 사용됩니다..\n" @@ -13941,7 +13941,7 @@ msgstr "%1를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "r/c %3!d!로 '%1'를 '%2'로 복사 실패 \n" +msgstr "r/c %3!d!로 '%1'를 '%2'로 복사 실패\n" #: xcopy.rc:39 msgid "Failed during reading of '%1'\n" diff --git a/po/nl.po b/po/nl.po index 8952efb..77a6ebc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9733,8 +9733,8 @@ msgstr "" "SETLOCAL begint localisatie van omgevingswijzigingen in een batchbestand.\n" "\n" "Omgevingswijzigingen na een SETLOCAL opdracht zijn alleen in het\n" -"batchbestand zichtbaar en worden behouden tot de volgende ENDLOCAL \n" -"opdracht (of tot het eind van het bestand, welke eerst komst), \n" +"batchbestand zichtbaar en worden behouden tot de volgende ENDLOCAL\n" +"opdracht (of tot het eind van het bestand, welke eerst komst),\n" "waar de vorige omgevingsvariabelen worden teruggezet.\n" #: cmd.rc:220 diff --git a/po/sl.po b/po/sl.po index 209b011..56d859b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -5631,7 +5631,7 @@ msgstr "Neveljaven obseg drsnika\n" #: winerror.mc:2641 msgid "Invalid ShowWin command\n" -msgstr "Neveljaven ukaz ShowWin \n" +msgstr "Neveljaven ukaz ShowWin\n" #: winerror.mc:2646 msgid "No system resources\n"

1 0

Francois Gouget : po: A small Slovenian translation update.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 8adea4836848690347255355a0aa69f532ec5ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adea4836848690347255355a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 09:19:23 2012 +0100 po: A small Slovenian translation update. --- po/sl.po | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/po/sl.po b/po/sl.po index b7839bf..209b011 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2179,13 +2179,12 @@ msgid "B&rowse..." msgstr "B&rskaj ..." #: cryptui.rc:294 -#, fuzzy msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" msgstr "" -"Opomba: naslednje vrste datotek lahko vsebujejo več kot eno potrdilo, seznam " -"preklicanih potrdil ali seznam zaupana vrednih potrdil:" +"Opomba: Naslednje vrste datotek lahko vsebujejo več kot eno potrdilo, seznam " +"preklicanih potrdil ali seznam zaupanja vrednih potrdil:" #: cryptui.rc:296 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" @@ -8222,21 +8221,19 @@ msgstr "Ra_zpni" #: user32.rc:33 #, fuzzy msgid "&Close\tAlt+F4" -msgstr "&Zapri\tAlt-F4" +msgstr "&Zapri\tAlt+F4" #: user32.rc:35 msgid "&About Wine" msgstr "&O Wine" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl+F4" -msgstr "&Zapri\tCtrl-F4" +msgstr "&Zapri\tCtrl+F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Na&prej\tCtrl-F6" +msgstr "Na&prej\tCtrl+F6" #: user32.rc:79 msgid "&Abort" @@ -9857,9 +9854,8 @@ msgid "No open command associated with file type '%1'\n" msgstr "Noben ukaz za odprtje ni povezan z vrsto datotek '%1'\n" #: cmd.rc:295 -#, fuzzy msgid "Overwrite %1?" -msgstr "Prepiši %1" +msgstr "Prepiši %1?" #: cmd.rc:296 msgid "More..." @@ -9916,12 +9912,11 @@ msgstr "Klic paketne oznake zunaj paketnega skripta ni mogoč\n" #: cmd.rc:311 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "A" +msgstr "V" #: cmd.rc:312 -#, fuzzy msgid "Delete %1?" -msgstr "Izbriši" +msgstr "Izbriši %1?" #: cmd.rc:313 msgid "Echo is %1\n" @@ -9984,14 +9979,12 @@ msgid "Volume in drive %1!c! has no label.\n" msgstr "Nosilec v pogonu %1!c! nima oznake.\n" #: cmd.rc:327 -#, fuzzy msgid " (Yes|No)" -msgstr "%1 (Da|Ne)\n" +msgstr " (Da|Ne)" #: cmd.rc:328 -#, fuzzy msgid " (Yes|No|All)" -msgstr "%1 (Da|Ne)\n" +msgstr " (Da|Ne|Vse)" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -13658,7 +13651,7 @@ msgstr "Uve&ljavi\tCtrl+Y" #: wordpad.rc:47 #, fuzzy msgid "&Clear\tDel" -msgstr "Po&čisti\tDEL" +msgstr "Po&čisti\tDel" #: wordpad.rc:48 msgid "&Select all\tCtrl+A" @@ -13989,11 +13982,11 @@ msgstr "Neveljavno število parametrov - za pomoč uporabite xcopy /?\n" #: xcopy.rc:28 #, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Neveljaven parameter '%1' - za pomoč uporabite xcopy /?\n" +msgstr "Neveljaven parameter '%1' - za pomoč uporabite xcopy /?\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" -msgstr "Za začetek kopiranja pritisnite <enter>\n" +msgstr "Pritisnite <enter> za začetek kopiranja\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n"

1 0

Francois Gouget : po: A small Japanese translation update.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 4f6697f455e76e5cef2b8d87c4eebd9fb72adf68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6697f455e76e5cef2b8d87c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:26:35 2012 +0100 po: A small Japanese translation update. 'Unicode' and 'UTF-8' are used as is in Japanese (with thanks to Akihiro Sagawa). --- po/ja.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 224001c..d4e055b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10360,7 +10360,7 @@ msgstr "'%s' は見つかりませんでした" #: notepad.rc:82 msgid "Unicode (UTF-16)" -msgstr "" +msgstr "Unicode (UTF-16)" #: notepad.rc:83 msgid "Unicode (UTF-16 big-endian)" @@ -10368,7 +10368,7 @@ msgstr "" #: notepad.rc:84 msgid "Unicode (UTF-8)" -msgstr "" +msgstr "Unicode (UTF-8)" #: notepad.rc:91 msgid "" @@ -13579,7 +13579,7 @@ msgstr "常に手前に表示(&T)" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "情報(&I)..." +msgstr "" #: winhlp32.rc:64 msgid "Annotation..."

1 0

Francois Gouget : po: Fix an accelerator key specification in the Walloon translation.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 5f7f14182e43cf3a6f109a44f102d3f5f5ab7815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7f14182e43cf3a6f109a44f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:41:16 2012 +0100 po: Fix an accelerator key specification in the Walloon translation. --- po/wa.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/wa.po b/po/wa.po index 3656015..c05d049 100644 --- a/po/wa.po +++ b/po/wa.po @@ -9835,7 +9835,7 @@ msgstr "&Rafacer\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "&Tchwezi totafwait" +msgstr "&Tchwezi totafwait\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

Francois Gouget : po: Fix the accelerator key specifications in the Chinese (PRC) translation.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 008b170568512d1d767fcd188cd5fbfb2c157d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008b170568512d1d767fcd188… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:41:00 2012 +0100 po: Fix the accelerator key specifications in the Chinese (PRC) translation. --- po/zh_CN.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 955ae2e..713a08f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10150,7 +10150,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "全选(&A)" +msgstr "全选(&A)\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -10162,7 +10162,7 @@ msgstr "自动换行(&W)" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "搜索(&S)..." +msgstr "搜索(&S)...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3"

1 0

Francois Gouget : po: Fix the accelerator key specifications in the Chinese (Taiwan) translation .
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: ca68a40263ca9713e5a4161f349f7b574708efc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca68a40263ca9713e5a4161f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:39:59 2012 +0100 po: Fix the accelerator key specifications in the Chinese (Taiwan) translation. --- po/zh_TW.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 3e7127a..2cd0ce5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10197,7 +10197,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "全選(&A)" +msgstr "全選(&A)\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -10209,7 +10209,7 @@ msgstr "自動換行(&W)" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "尋找(&S)..." +msgstr "尋找(&S)...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3"

1 0

Francois Gouget : po: Fix an accelerator key specification in the Swedish translation.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 452ec21da5fe531e7d60a39b59956ba67e1c3711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=452ec21da5fe531e7d60a39b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:35:33 2012 +0100 po: Fix an accelerator key specification in the Swedish translation. --- po/sv.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/sv.po b/po/sv.po index d2d5941..2dfc695 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10259,7 +10259,7 @@ msgstr "&Ta bort\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "Markera &allt" +msgstr "Markera &all\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012