February 2012 - Wine-Devel - list.winehq.org

Wrong charcter encoding in winmm-tests

by Julian Rüger

Hello everyone, I ran the winmm-tests in wine today, with a german locale, and noticed that the umlauts are displayed incorrectly. My terminal is in UTF-8 and wine outputs ISO 8859-1. I looked into the code and found out that ie. in wave.c, wave_out_error() declares the strings as static char, and thus uses waveOutGetErrorTextA() if I am not mistaken. Should this be fixed or doesn't it matter in the tests? Best regards, Julian

Feb. 26, 2012

Re: po: zh_TW translation updates

by Franklin Weng

Hi, Thank you for your notification. I'll fix it in a few days and provide the patch again. Tuesday or Wednesday the latest I think, since I have some important things to do these days. If it can't catch the release schedule of wine 1.4 please tell me and I'll send it as soon as possible. Thanks, Franklin 在 2012年2月26日下午10:14，Francois Gouget <fgouget(a)free.fr> 寫道： > > It's great seeing lots of progress being made on the Taiwanese > translation. > > There are a few changes that look a bit strange to me though: > > msgid "Theme files (*.msstyles; *.theme)" > -msgstr "佈景主題檔案 (*.msstyles；*.theme)" > +msgstr "佈景主題檔案 (*.msstyles; *.theme)" > > msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" > -msgstr "TypeLib 檔案 (*.tlb；*.olb；*.dll；*.ocx；*.exe)" > +msgstr "TypeLib 檔案 (*.tlb;*.olb;*.dll;*.ocx;*.exe)" > > So half width semicolons seem to be preferred to full width ones which > is fine to me. But in the first patch it's followed by a space, like in > English, and not in the second one which seems inconsistent. > > > msgid "Wine Programs (*.exe; *.exe.so)" > -msgstr "Wine 程式 (*.exe；*.exe.so)" > +msgstr "Wine 程式 (*.exe,*.exe.so)" > > Here the semicolon was replaced by a comma (and no space), which is > probably wrong. > > > msgid "Programs (*.exe)" > -msgstr "程式 (*.exe)" > +msgstr "程式(*.exe) " > > The previous changes all preserved the space before the opening > parenthesis. If I add the fact that this introduces a space after > the closing parenthesis I'd guess this was unintentional. > > > msgid "Printer files (*.prn)" > -msgstr "列印檔案 (*.prn)" > +msgstr "列印檔案 (*.PRN)" > > All other strings of this type use lower case for the extension so I'm > not sure about this change. > > > +#, fuzzy > msgid "The device door is open.\n" > -msgstr "" > +msgstr "印表機蓋是打開的; 。\n" > > +#, fuzzy > msgid "Connection unavailable.\n" > -msgstr "" > +msgstr "不可用; 。\n" > > The combination of the semicolon and full width full stop seems wrong. I > suspect the fuzzy translations were from the printer common dialog > English strings that ended in a semicolon which escaped removal. > > > msgid "" > "This program is free software; you can redistribute it and/or modify it " > "under the terms of the GNU Lesser General Public License as published by the " > "Free Software Foundation; either version 2.1 of the License, or (at your " > "option) any later version." > msgstr "" > "這個程式是自由軟體﹐您可以遵照\n" > "自由軟體基金會出版的 GNU LGPL 2.1\n" > "版或新版的許可條款來修改和重新\n" > "散佈這個程式。" > > This string is not supposed to be explicitly wrapped. Is the wrapping > made necessary for Taiwanese because of a Wine bug? > > > msgid "Finished searching the document." > -msgstr "檔案搜尋結束。" > +msgstr "檔案查找結束." > > msgid "Failed to load the RichEdit library." > -msgstr "RichEdit 載入失敗。" > +msgstr "RichEdit 裝載失敗." > > Everywhere else full width full stops are used so this change looks > strange to me. > > > msgid "Overwrite %1? (Yes|No|All)\n" > -msgstr "" > +msgstr "是否覆蓋 %1？（是｜否｜全部皆是）\n" > > Note that in English the 'Yes' implies one should use the 'Y' key, > etc. So this set of strings is tied to the following translations: > > msgctxt "Yes key" > msgid "Y" > msgstr "" > > msgctxt "No key" > msgid "N" > msgstr "" > > msgctxt "All key" > msgid "A" > msgstr "" > > So depending on the keyboard layout it may be necessary to do something > like '（是(Y)｜否(N)｜全部皆是(A)）' > > > There's another translation which works the same way, look for > "(F - File, D - Directory)" > > > -- > Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ > tcA thgirypoC muinelliM latigiD eht detaloiv tsuj evah uoY

Feb. 26, 2012

Re: po: zh_TW translation updates

by Francois Gouget

It's great seeing lots of progress being made on the Taiwanese translation. There are a few changes that look a bit strange to me though: msgid "Theme files (*.msstyles; *.theme)" -msgstr "�Ѿ��}�n�� (*.msstyles��*.theme)" +msgstr "�Ѿ��}�n�� (*.msstyles; *.theme)" msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib �n�� (*.tlb��*.olb��*.dll��*.ocx��*.exe)" +msgstr "TypeLib �n�� (*.tlb;*.olb;*.dll;*.ocx;*.exe)" So half width semicolons seem to be preferred to full width ones which is fine to me. But in the first patch it's followed by a space, like in English, and not in the second one which seems inconsistent. msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine ��ʽ (*.exe��*.exe.so)" +msgstr "Wine ��ʽ (*.exe,*.exe.so)" Here the semicolon was replaced by a comma (and no space), which is probably wrong. msgid "Programs (*.exe)" -msgstr "��ʽ (*.exe)" +msgstr "��ʽ(*.exe) " The previous changes all preserved the space before the opening parenthesis. If I add the fact that this introduces a space after the closing parenthesis I'd guess this was unintentional. msgid "Printer files (*.prn)" -msgstr "��ӡ�n�� (*.prn)" +msgstr "��ӡ�n�� (*.PRN)" All other strings of this type use lower case for the extension so I'm not sure about this change. +#, fuzzy msgid "The device door is open.\n" -msgstr "" +msgstr "ӡ��C�w�Ǵ��_��; ��\n" +#, fuzzy msgid "Connection unavailable.\n" -msgstr "" +msgstr "��; ��\n" The combination of the semicolon and full width full stop seems wrong. I suspect the fuzzy translations were from the printer common dialog English strings that ended in a semicolon which escaped removal. msgid "" "This program is free software; you can redistribute it and/or modify it " "under the terms of the GNU Lesser General Public License as published by the " "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" "�@��ʽ��ܛ�w�o��\n" "��ܛ�w�� GNU LGPL 2.1\n" "��°��S�ɗl��޸ĺ��\n" "ɢ��@��ʽ��" This string is not supposed to be explicitly wrapped. Is the wrapping made necessary for Taiwanese because of a Wine bug? msgid "Finished searching the document." -msgstr "�n��ь��Y��" +msgstr "�n��ҽY��." msgid "Failed to load the RichEdit library." -msgstr "RichEdit �d��ʧ��" +msgstr "RichEdit �b�dʧ��." Everywhere else full width full stops are used so this change looks strange to me. msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "" +msgstr "�Ƿ��w %1�� ǣ��ȫ��ǣ�\n" Note that in English the 'Yes' implies one should use the 'Y' key, etc. So this set of strings is tied to the following translations: msgctxt "Yes key" msgid "Y" msgstr "" msgctxt "No key" msgid "N" msgstr "" msgctxt "All key" msgid "A" msgstr "" So depending on the keyboard layout it may be necessary to do something like '��(Y)��(N)��ȫ��(A)��' There's another translation which works the same way, look for "(F - File, D - Directory)" -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ tcA thgirypoC muinelliM latigiD eht detaloiv tsuj evah uoY

Feb. 26, 2012

Re: [PATCH] po: Update Swedish translation.

by Jan-Peter Nilsson

Hi I have a few questions/comments/suggestions on/for the change in the Swedish translation. On -28163-01--10 20:59, Lauri Kenttä wrote: > #: comdlg32.rc:292 > -#, fuzzy > msgctxt "Luminance" > msgid "&Lum:" > -msgstr "&Lum:" > +msgstr "&Val:" Can you explain 'Val' here? I don't understand it. I would assume 'Luminance' to be translated to 'Luminans', so Lum as abbreviation makes sense to me. > #: ieframe.rc:78 > -#, fuzzy > msgid "Searching for %s" > -msgstr "Egenskaper för %s" > +msgstr "Söker för %s" "Söker efter" would probably be better. > #: shell32.rc:215 > -#, fuzzy > msgid "Common Files" > -msgstr "Kopierar filer..." > +msgstr "" Perhaps 'Delade Filer'? > #: cmd.rc:331 > -#, fuzzy > msgid "Verify is %1\n" > -msgstr "Verifiera blev %s\n" > +msgstr "Verifiera blev %1\n" I would use 'är', 'blev' is more 'became' than 'is'. > #: cmd.rc:335 > -#, fuzzy > msgid "Volume label (11 characters, <Enter> for none)?" > -msgstr "Diskvolymens namn (11 karaktärer, tryck enter för inget)?" > +msgstr "Diskvolymens namn (11 karaktärer, tryck <Enter> för inget)?" 'Karaktärer' is the other kind of characters, the word here is 'tecken'. > #: explorer.rc:29 > #, fuzzy > @@ -10042,9 +9949,8 @@ msgid "Usage: hostname\n" > msgstr "" > > #: hostname.rc:28 > -#, fuzzy > msgid "Error: Invalid option '%c'.\n" > -msgstr "Fel: ogiltigt nyckelnamn\n" > +msgstr "Fel: Ogiltigt val '%c'.\n" I'm not sure about 'val' here. To me 'val' reads more like 'selection' than 'option'. > #: net.rc:41 > msgid "There are no entries in the list.\n" > @@ -10215,14 +10110,12 @@ msgstr "" > "---------------------------------------------------------------\n" > > #: net.rc:43 > -#, fuzzy > msgid "%1 %2 %3 Open resources: %4!u!\n" > -msgstr "%s %s %s Öppna resurser: %lu\n" > +msgstr "%1 %1 %1 Öppna resurser: %4!u!\n" I suppose that should be %1 %2 %3. > #: regedit.rc:88 > -#, fuzzy > msgid "Modify Binary Data..." > -msgstr "Ändra binärt data" > +msgstr "Ändra binärt data..." 'binärdata' is one word. > #: taskkill.rc:31 > -#, fuzzy > msgid "Error: Option %1 expects a command line parameter.\n" > -msgstr "Fel: Valet %s kräver en kommandoradsparameter.\n" > +msgstr "Fel: Valet %1 kräver en kommandoradsparameter.\n" > > #: taskkill.rc:32 > msgid "Error: Options /im and /pid are mutually exclusive.\n" > msgstr "Fel: Valen /im och /pid kan inte användas tillsammans.\n" > Val again. I don't really have any better suggestion, but it sounds strange to me. > #: winecfg.rc:146 > -#, fuzzy > msgid "" > "Wine can mimic different Windows versions for each application. This tab is " > "linked to the Libraries and Graphics tabs to allow you to change systemwide " > "or per-application settings in those tabs as well." > msgstr "" > -"Wine kan imitera olika Windows-versioner för varje program. Den här fliken " > +"Wine kan imitera olika Windows-versioner för varje program. Den här fliken " > "är länkad till flikarna Bibliotek och Grafik för att låta dig ändra " > "inställningar i de flikarna också, antingen systembreda eller per program." > I believe 'systemövergripande' would be better than 'systembreda'. > > #: winecfg.rc:83 > -#, fuzzy > msgid "Audio test failed!" > -msgstr "Återställning av hårddisk misslyckades\n" > +msgstr "" Maybe "Ljudtest misslyckades!" ? > > #: winecfg.rc:85 > -#, fuzzy > msgid "(System default)" > -msgstr "Systemsökväg" > +msgstr "" Maybe "(Systemstandard)" ? > #: winefile.rc:197 > msgctxt "accelerator Fullscreen" > @@ -13528,9 +13355,8 @@ msgid "Error while selecting new font." > msgstr "Ett fel uppstod när ett nytt teckensnitt valdes." > > #: winefile.rc:95 > -#, fuzzy > msgid "Wine File Manager" > -msgstr "Winefile" > +msgstr "Wine Filhanteraren" "Wine Filhanterare", unless we want definite form "The Wine File Manager". > #: wordpad.rc:188 > -#, fuzzy > msgid "OLE storage documents are not supported." > -msgstr "Utökade attribut ej stödda\n" > +msgstr "" Maybe "OLE lagringsdokument stöds ej." ? //Jan-Peter

Feb. 26, 2012

Re: shlwapi: Implemented StrToInt64ExA/W

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=17105 Your paranoid android. === W2KPROSP4 (32 bit string) === Timeout

Feb. 26, 2012

Re: RFT: Use Greek semicolons for comdlg32's printer status enumeration?

by Jerome Leclanche

2012/2/25 Francois Gouget <fgouget(a)free.fr> > > So I would expect the Greek translation to use ano teleia characters as > the separator but instead it uses plain semicolons: > > msgid "Paused; " > msgstr "Σταματημένος; " > > msgid "Error; " > msgstr "Σφάλμα; " > > msgid "Busy; " > msgstr "Απασχολημένος; " > > > So I'm hoping some Greek-speaking Wine hacker or user can enlighten me > on the following points: > * Did I understand Wikipedia wrong? Do both English semicolons and > question marks translate to a semicolon in Greek? > > * Is this a special case that justifies not following the standard > rule? If so why? > > * Does the attached patch replacing semicolons with ano teleia > characters make sense? > (Greek is my second native language) - You understood Wikipedia correctly, a latin semicolon character is always interpreted as a questionmark. - You will never find a semicolon used as anything else in (proper) Greek. There are no special cases. Though you'll commonly find people using a latin questionmark instead of a semicolon online. - I don't think an ano telia would be appropriate for this. To be honest I don't even find a semicolon appropriate in English here. I don't build with printing support but it sounds to me like it would be more appropriate to use a comma, or a dash. J. Leclanche

Feb. 25, 2012

Re: po: fixed remaining Slovenian true positives in the winepo error report

by Francois Gouget

On Wed, 22 Feb 2012, Jaka Kranjc wrote: [...] > So if I understand correctly, parts of this composite get choped and > concatenated and then printed as a sequence. Lacking full sentences, > semicolons *are* a good choice for Slovenian in this case too. Commas would be > fitting for proper "etc" lists. > > This brings up another can of worms though; capitalisation. We don't use title > case at all, so these translation have the wrong case. Well, except for the > first one being printed, but that is runtime knowledge, so we can't really fix > it well. Gettext has no provisions for this (or gender or ...), so all that > comes to mind is autocapitalisation depending on the locale, but that is > probably ugly and I doubt it would work with more exotic scripts (but not sure > if any would need it). I don't think we really care about capitalization in this specific case (or that it can be handled right anyway). So would the attached patch work? [...] > Re usage strings: is there no 80 column limit imposed? I saw even some > original strings were longer. If no line feed is hardcoded then the line will wrap at the 80th column. The line feeds are only there to ensure words are not cut in the middle. I suspect the authors of the command line tools did not care about that. Or they did not want to hardcode line wrapping at 80 columns when the terminal may be wider or narrower. And that issue was probably overlooked in a number of cases too. So these are probably all contributing factors to the current situation. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ f u kn rd ts, ur wy 2 gky 4 ur wn gd.

Feb. 25, 2012

Re: shlwapi: Implemented StrToInt64ExA/W

by Nikolay Sivov

On 2/25/2012 17:49, carlo.bramix(a)libero.it wrote: > I tried to implement StrToInt64ExA/W as a reply to bug #27633 > I also corrected the comment in functions FormatInt() and FormatDouble() > because, according to MSDN, GetNumberFormat() returns the number of characters > written (or required) and not the number of bytes emitted: > http://msdn.microsoft.com/en-us/library/windows/desktop/dd318110%28v=vs.85%…. > aspx > I hope my first patch to WINE is correct and it could be useful. > Sincerely, > > Carlo Bramini. > > > > BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) > { > + LARGE_INTEGER li; > + BOOL bRes; > + > + TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); > + > + // Test on lpszStr is done into StrToInt64ExA No cpp comments please. Also this comment is a bit redundant for a function that small. > + if (!lpiRet) > + { > + WARN("Invalid lpiRet would crash under Win32!\n"); > + return FALSE; > + } You don't need to WARN on that, especially with such message. > + > + bRes = StrToInt64ExA(lpszStr, dwFlags,&li.QuadPart); > + if (bRes) > + *lpiRet = li.u.LowPart; > + > + return bRes; > +} This needs tests, take a look at shlwapi/tests for some examples.

Feb. 25, 2012

RFT: Use Greek semicolons for comdlg32's printer status enumeration?

by Francois Gouget

Request For Translators<g> So what I've gathered from Wikipedia is that the Greek language does not use semicolons as a separator for enumerations: http://en.wikipedia.org/wiki/Semicolon#Greek_and_Church_Slavonic | In Greek and Church Slavonic, a semicolon indicates a question, | similar to a Latin question mark.[2] To indicate a long pause or | separate sections, each with commas (the semicolon's purpose in | English), Greek uses an ano teleia ( · ). Wine uses semicolons as a separator in one place, for comdlg32's printer status enumeration. It's a list of status indicators separated by semicolons and looks like this: Error; Paper jam; or Initialising; Default Printer; I/O Active; So I would expect the Greek translation to use ano teleia characters as the separator but instead it uses plain semicolons: msgid "Paused; " msgstr "Σταματημένος; " msgid "Error; " msgstr "Σφάλμα; " msgid "Busy; " msgstr "Απασχολημένος; " So I'm hoping some Greek-speaking Wine hacker or user can enlighten me on the following points: * Did I understand Wikipedia wrong? Do both English semicolons and question marks translate to a semicolon in Greek? * Is this a special case that justifies not following the standard rule? If so why? * Does the attached patch replacing semicolons with ano teleia characters make sense? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ You can have my guns when you pry them from my kids cold, dead hands.

Feb. 25, 2012

Re: msvcrt/file.c: file mode T (temporary file)

by Nikolay Sivov

On 2/25/2012 00:19, Robert van Herk wrote: > Windows fopen has some fancy file modes 'T' and 'D'. > Currently, wine wrongly interprets 'T' as 't'. They should be > interpreted differently though: 't' is text file, and 'T' is temporary > file. > > I've fixed this, and added a conformance test. > > Test ran on Windows 7 Home Premium. > > Kind regards, > Robert > > dlls/msvcrt/file.c | 8 +++++- > dlls/msvcrt/tests/Makefile.in | 1 + > dlls/msvcrt/tests/filemodeT.c | 61 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 69 insertions(+), 1 deletions(-) > create mode 100644 dlls/msvcrt/tests/filemodeT.c You clearly don't need a new file for that, please place it into existing file.c.

Feb. 25, 2012