July 2009 - Wine-commits - list.winehq.org

Paul Vriens : transl: Remove an unused parameter.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: tools Branch: master Commit: 03ae75ffd460c79da50cdd20efcf6c03f69ee252 URL: http://source.winehq.org/git/tools.git/?a=commit;h=03ae75ffd460c79da50cdd20… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 12:14:41 2009 +0200 transl: Remove an unused parameter. --- transl/scripts/checkmakefile.pl | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index c0294fd..ef83bdd 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -238,7 +238,6 @@ sub mycheck my %missing_rl; my %notes_rl; - my %warn_rl; my %missing_count; foreach $resource (@resources) @@ -339,11 +338,6 @@ sub mycheck print LANGOUT "$dir$suffix: Error: resource ".resource_name2($resource).": $msg\n"; } - foreach my $msg (@{$warn_rl{$resource}{$lang}}) - { - print LANGOUT "$dir$suffix: Warning: resource ".resource_name2($resource).": $msg\n"; - } - foreach my $msg (@{$missing_rl{$resource}{$lang}}) { print LANGOUT "$dir$suffix: Missing: resource ".resource_name2($resource).": $msg\n";

1 0

Paul Vriens : transl: Don't offer to compare English(US) with English(US).
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: tools Branch: master Commit: 1f2a5c6b18c794b544b8d54c007f8f1e300cb060 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f2a5c6b18c794b544b8d54c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 11:33:48 2009 +0200 transl: Don't offer to compare English(US) with English(US). --- transl/php/resource.php | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/transl/php/resource.php b/transl/php/resource.php index 877c363..e86fe8c 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -68,10 +68,13 @@ if ($compare) if (!$compare) { - echo "<tr class=\"subheader\"><td colspan=\"3\" style=\"text-align: right\">"; - echo "".gen_resource_a($lang, $resfile, $type, $id, TRUE); - echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a>"; - echo "</td></tr>"; + if ($lang != $MASTER_LANGUAGE) + { + echo "<tr class=\"subheader\"><td colspan=\"3\" style=\"text-align: right\">"; + echo "".gen_resource_a($lang, $resfile, $type, $id, TRUE); + echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a>"; + echo "</td></tr>"; + } } else {

1 0

Paul Vriens : transl: Remove unused files.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: tools Branch: master Commit: 7a9b120a718e89559cb260a7667f6673e9deb5ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=7a9b120a718e89559cb260a7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 11:18:28 2009 +0200 transl: Remove unused files. --- transl/php/devel/dump-locales.php | 40 --------- transl/php/dump_locales.php | 159 ------------------------------------- 2 files changed, 0 insertions(+), 199 deletions(-) diff --git a/transl/php/devel/dump-locales.php b/transl/php/devel/dump-locales.php deleted file mode 100644 index 8b27c78..0000000 --- a/transl/php/devel/dump-locales.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php - -include("../lib.php"); -include("../lib_res.php"); - -$DATAROOT = ".."; - -function res_enum($header, $f) -{ -# echo "Checking ".$header["type"]." ".$header["name"]."\n"; - global $LOCALE_NAMES; - if ($header["type"] != 6) - return FALSE; - if ($header["name"] != 1) - return FALSE; -# echo "Found resource for locale ".$header["language"]." \n"; - $data = fread($f, $header["resSize"]); - $str = new StringTable($header, $data, 0); - $langid = sprintf("%03x:%02x", $header["language"] & 0x3ff, $header["language"] >> 10); - $LOCALE_NAMES[$langid] = $str->getString(2); -} - -$LOCALE_NAMES = array(); -$res = new ResFile("../dumps/res/dlls-kernel32.res"); -$res->enumResources("res_enum"); -ksort($LOCALE_NAMES); -echo "<?php # Generated by devel/dump-locales.php \$LOCALE_NAMES = array(); "; -foreach ($LOCALE_NAMES as $langid => $name) -{ - echo "\$LOCALE_NAMES[\"$langid\"] = "; - dump_unicode($name); - echo "; \n"; - - $baseid = get_lang_base($langid); - if (file_exists("$DATAROOT/conf/$baseid") && is_lang_ignore_sublang($baseid)) - echo "\$LOCALE_NAMES[\"".get_lang_base($baseid)."\"] = \$LOCALE_NAMES[\"$langid\"]; # ignore sublangs\n"; -} -echo "?>"; - -?> \ No newline at end of file diff --git a/transl/php/dump_locales.php b/transl/php/dump_locales.php deleted file mode 100644 index 8d1bb90..0000000 --- a/transl/php/dump_locales.php +++ /dev/null @@ -1,159 +0,0 @@ -<?php -# Generated by devel/dump-locales.php -$LOCALE_NAMES = array(); -$LOCALE_NAMES["001:01"] = "Arabic (Saudi Arabia)"; -$LOCALE_NAMES["001:02"] = "Arabic (Iraq)"; -$LOCALE_NAMES["001:03"] = "Arabic (Egypt)"; -$LOCALE_NAMES["001:04"] = "Arabic (Libya)"; -$LOCALE_NAMES["001:05"] = "Arabic (Algeria)"; -$LOCALE_NAMES["001:06"] = "Arabic (Morocco)"; -$LOCALE_NAMES["001:07"] = "Arabic (Tunisia)"; -$LOCALE_NAMES["001:08"] = "Arabic (Oman)"; -$LOCALE_NAMES["001:09"] = "Arabic (Yemen)"; -$LOCALE_NAMES["001:0a"] = "Arabic (Syria)"; -$LOCALE_NAMES["001:0b"] = "Arabic (Jordan)"; -$LOCALE_NAMES["001:0c"] = "Arabic (Lebanon)"; -$LOCALE_NAMES["001:0d"] = "Arabic (Kuwait)"; -$LOCALE_NAMES["001:0e"] = "Arabic (U.A.E.)"; -$LOCALE_NAMES["001:0f"] = "Arabic (Bahrain)"; -$LOCALE_NAMES["001:10"] = "Arabic (Qatar)"; -$LOCALE_NAMES["002:01"] = "Bulgarian"; -$LOCALE_NAMES["003:01"] = "Catalan"; -$LOCALE_NAMES["004:01"] = "Chinese (Taiwan)"; -$LOCALE_NAMES["004:02"] = "Chinese (PRC)"; -$LOCALE_NAMES["004:03"] = "Chinese (Hong Kong S.A.R.)"; -$LOCALE_NAMES["004:04"] = "Chinese (Singapore)"; -$LOCALE_NAMES["004:05"] = "Chinese (Macau S.A.R.)"; -$LOCALE_NAMES["005:01"] = "Czech"; -$LOCALE_NAMES["005:00"] = $LOCALE_NAMES["005:01"]; # ignore sublangs -$LOCALE_NAMES["006:01"] = "Danish"; -$LOCALE_NAMES["007:01"] = "German (Germany)"; -$LOCALE_NAMES["007:02"] = "German (Switzerland)"; -$LOCALE_NAMES["007:03"] = "German (Austria)"; -$LOCALE_NAMES["007:04"] = "German (Luxembourg)"; -$LOCALE_NAMES["007:05"] = "German (Liechtenstein)"; -$LOCALE_NAMES["008:01"] = "Greek"; -$LOCALE_NAMES["009:01"] = "English (United States)"; -$LOCALE_NAMES["009:02"] = "English (United Kingdom)"; -$LOCALE_NAMES["009:03"] = "English (Australia)"; -$LOCALE_NAMES["009:04"] = "English (Canada)"; -$LOCALE_NAMES["009:05"] = "English (New Zealand)"; -$LOCALE_NAMES["009:06"] = "English (Ireland)"; -$LOCALE_NAMES["009:07"] = "English (South Africa)"; -$LOCALE_NAMES["009:08"] = "English (Jamaica)"; -$LOCALE_NAMES["009:09"] = "English (Caribbean)"; -$LOCALE_NAMES["009:0a"] = "English (Belize)"; -$LOCALE_NAMES["009:0b"] = "English (Trinidad)"; -$LOCALE_NAMES["009:0c"] = "English (Zimbabwe)"; -$LOCALE_NAMES["009:0d"] = "English (Philippines)"; -$LOCALE_NAMES["00a:01"] = "Spanish (Traditional Sort)"; -$LOCALE_NAMES["00a:02"] = "Spanish (Mexico)"; -$LOCALE_NAMES["00a:03"] = "Spanish (International Sort)"; -$LOCALE_NAMES["00a:04"] = "Spanish (Guatemala)"; -$LOCALE_NAMES["00a:05"] = "Spanish (Costa Rica)"; -$LOCALE_NAMES["00a:06"] = "Spanish (Panama)"; -$LOCALE_NAMES["00a:07"] = "Spanish (Dominican Republic)"; -$LOCALE_NAMES["00a:08"] = "Spanish (Venezuela)"; -$LOCALE_NAMES["00a:09"] = "Spanish (Colombia)"; -$LOCALE_NAMES["00a:0a"] = "Spanish (Peru)"; -$LOCALE_NAMES["00a:0b"] = "Spanish (Argentina)"; -$LOCALE_NAMES["00a:0c"] = "Spanish (Ecuador)"; -$LOCALE_NAMES["00a:0d"] = "Spanish (Chile)"; -$LOCALE_NAMES["00a:0e"] = "Spanish (Uruguay)"; -$LOCALE_NAMES["00a:0f"] = "Spanish (Paraguay)"; -$LOCALE_NAMES["00a:10"] = "Spanish (Bolivia)"; -$LOCALE_NAMES["00a:11"] = "Spanish (El Salvador)"; -$LOCALE_NAMES["00a:12"] = "Spanish (Honduras)"; -$LOCALE_NAMES["00a:13"] = "Spanish (Nicaragua)"; -$LOCALE_NAMES["00a:14"] = "Spanish (Puerto Rico)"; -$LOCALE_NAMES["00b:01"] = "Finnish"; -$LOCALE_NAMES["00c:01"] = "French (France)"; -$LOCALE_NAMES["00c:02"] = "French (Belgium)"; -$LOCALE_NAMES["00c:03"] = "French (Canada)"; -$LOCALE_NAMES["00c:04"] = "French (Switzerland)"; -$LOCALE_NAMES["00c:05"] = "French (Luxembourg)"; -$LOCALE_NAMES["00c:06"] = "French (Monaco)"; -$LOCALE_NAMES["00d:01"] = "Hebrew"; -$LOCALE_NAMES["00e:01"] = "Hungarian"; -$LOCALE_NAMES["00e:00"] = $LOCALE_NAMES["00e:01"]; # ignore sublangs -$LOCALE_NAMES["00f:01"] = "Icelandic"; -$LOCALE_NAMES["010:01"] = "Italian (Italy)"; -$LOCALE_NAMES["010:02"] = "Italian (Switzerland)"; -$LOCALE_NAMES["011:01"] = "Japanese"; -$LOCALE_NAMES["011:00"] = $LOCALE_NAMES["011:01"]; # ignore sublangs -$LOCALE_NAMES["012:01"] = "Korean"; -$LOCALE_NAMES["012:00"] = $LOCALE_NAMES["012:01"]; # ignore sublangs -$LOCALE_NAMES["013:01"] = "Dutch (Netherlands)"; -$LOCALE_NAMES["013:02"] = "Dutch (Belgium)"; -$LOCALE_NAMES["013:03"] = "Dutch (Surinam)"; -$LOCALE_NAMES["014:01"] = "Norwegian (Bokmal)"; -$LOCALE_NAMES["014:02"] = "Norwegian (Nynorsk)"; -$LOCALE_NAMES["015:01"] = "Polish"; -$LOCALE_NAMES["015:00"] = $LOCALE_NAMES["015:01"]; # ignore sublangs -$LOCALE_NAMES["016:01"] = "Portuguese (Brazil)"; -$LOCALE_NAMES["016:02"] = "Portuguese (Portugal)"; -$LOCALE_NAMES["017:01"] = "Romansh (Switzerland)"; -$LOCALE_NAMES["018:01"] = "Romanian"; -$LOCALE_NAMES["018:00"] = $LOCALE_NAMES["018:01"]; # ignore sublangs -$LOCALE_NAMES["019:01"] = "Russian"; -$LOCALE_NAMES["019:00"] = $LOCALE_NAMES["019:01"]; # ignore sublangs -$LOCALE_NAMES["01a:01"] = "Croatian"; -$LOCALE_NAMES["01a:02"] = "Serbian (Latin)"; -$LOCALE_NAMES["01a:03"] = "Serbian (Cyrillic)"; -$LOCALE_NAMES["01b:01"] = "Slovak"; -$LOCALE_NAMES["01b:00"] = $LOCALE_NAMES["01b:01"]; # ignore sublangs -$LOCALE_NAMES["01c:01"] = "Albanian"; -$LOCALE_NAMES["01d:01"] = "Swedish"; -$LOCALE_NAMES["01d:02"] = "Swedish (Finland)"; -$LOCALE_NAMES["01e:01"] = "Thai"; -$LOCALE_NAMES["01f:01"] = "Turkish"; -$LOCALE_NAMES["020:01"] = "Urdu"; -$LOCALE_NAMES["021:01"] = "Indonesian"; -$LOCALE_NAMES["022:01"] = "Ukrainian"; -$LOCALE_NAMES["023:01"] = "Belarusian"; -$LOCALE_NAMES["024:01"] = "Slovenian"; -$LOCALE_NAMES["024:00"] = $LOCALE_NAMES["024:01"]; # ignore sublangs -$LOCALE_NAMES["025:01"] = "Estonian"; -$LOCALE_NAMES["026:01"] = "Latvian"; -$LOCALE_NAMES["027:01"] = "Lithuanian"; -$LOCALE_NAMES["029:01"] = "Farsi"; -$LOCALE_NAMES["02a:01"] = "Vietnamese"; -$LOCALE_NAMES["02b:01"] = "Armenian"; -$LOCALE_NAMES["02c:01"] = "Azeri (Latin)"; -$LOCALE_NAMES["02c:02"] = "Azeri (Cyrillic)"; -$LOCALE_NAMES["02d:01"] = "Basque"; -$LOCALE_NAMES["02f:01"] = "FYRO Macedonian"; -$LOCALE_NAMES["036:01"] = "Afrikaans"; -$LOCALE_NAMES["037:01"] = "Georgian"; -$LOCALE_NAMES["038:01"] = "Faeroese"; -$LOCALE_NAMES["039:01"] = "Hindi"; -$LOCALE_NAMES["03e:01"] = "Malay (Malaysia)"; -$LOCALE_NAMES["03e:02"] = "Malay (Brunei Darussalam)"; -$LOCALE_NAMES["03f:01"] = "Kazakh"; -$LOCALE_NAMES["040:01"] = "Kyrgyz (Cyrillic)"; -$LOCALE_NAMES["041:01"] = "Swahili"; -$LOCALE_NAMES["043:01"] = "Uzbek (Latin)"; -$LOCALE_NAMES["043:02"] = "Uzbek (Cyrillic)"; -$LOCALE_NAMES["044:01"] = "Tatar"; -$LOCALE_NAMES["046:01"] = "Punjabi"; -$LOCALE_NAMES["047:01"] = "Gujarati"; -$LOCALE_NAMES["049:01"] = "Tamil"; -$LOCALE_NAMES["04a:01"] = "Telugu"; -$LOCALE_NAMES["04b:01"] = "Kannada"; -$LOCALE_NAMES["04e:01"] = "Marathi"; -$LOCALE_NAMES["04f:01"] = "Sanskrit"; -$LOCALE_NAMES["050:01"] = "Mongolian (Cyrillic)"; -$LOCALE_NAMES["052:01"] = "Welsh (United Kingdom)"; -$LOCALE_NAMES["056:01"] = "Galician"; -$LOCALE_NAMES["057:01"] = "Konkani"; -$LOCALE_NAMES["05a:01"] = "Syriac"; -$LOCALE_NAMES["065:01"] = "Divehi"; -$LOCALE_NAMES["07e:01"] = "Brezhoneg"; -$LOCALE_NAMES["08f:01"] = "Esperanto"; -$LOCALE_NAMES["08f:00"] = $LOCALE_NAMES["08f:01"]; # ignore sublangs -$LOCALE_NAMES["090:01"] = "Walon"; -$LOCALE_NAMES["091:01"] = "Cornish (United Kingdom)"; -$LOCALE_NAMES["094:01"] = "Gaeilge (Éire)"; -$LOCALE_NAMES["094:02"] = "Gaidhlig (Breatainn Mhòr)"; -$LOCALE_NAMES["094:03"] = "Gaelg (Manninn)"; -?>

1 0

Paul Vriens : transl: Better highlight issues in Dialog resource when comparing to English(US).
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: tools Branch: master Commit: 298f63b842913c784ed32c8b2dc1162cd496a48c URL: http://source.winehq.org/git/tools.git/?a=commit;h=298f63b842913c784ed32c8b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 10:59:15 2009 +0200 transl: Better highlight issues in Dialog resource when comparing to English(US). --- transl/php/lib_res.php | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index 534e16d..cbb60a8 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -890,7 +890,18 @@ class DialogResource extends Resource return ($this_ctrl['id'] != $other_ctrl['id']) || (($this_ctrl['style'] | $ignore_style) != ($other_ctrl['style'] | $ignore_style)) || ($this_ctrl['exStyle'] != $other_ctrl['exStyle']) || - !is_equal_unicode_or_id($this_ctrl['className'], $other_ctrl['className']); + (!is_equal_unicode_or_id($this_ctrl['className'], $other_ctrl['className'])) || + // We should have either id's or text in both + (is_int($this_ctrl['text']) ^ is_int($other_ctrl['text'])) || + // If it's an id they should be equal + (is_int($this_ctrl['text']) && + !is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])) || + // If either text is empty they should be equal + (!is_int($this_ctrl['text']) && ((count($this_ctrl['text']) == 0) || (count($other_ctrl['text']) == 0)) && + !is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])) || + // If we have text in both they should not be equal + (!is_int($this_ctrl['text']) && ((count($this_ctrl['text']) != 0) && (count($other_ctrl['text']) != 0)) && + is_equal_unicode_or_id($this_ctrl['text'], $other_ctrl['text'])); } function dump($master_res = NULL)

1 0

Paul Vriens : transl: Sort the languages by translations and locale name.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: tools Branch: master Commit: eb71250f257a58d30abe88d7df7d0fb3bdff485f URL: http://source.winehq.org/git/tools.git/?a=commit;h=eb71250f257a58d30abe88d7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 17 09:44:52 2009 +0200 transl: Sort the languages by translations and locale name. --- transl/php/index.php | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 94ee569..a000d70 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -3,6 +3,8 @@ include_once("config.php"); include_once("lib.php"); $summary = fopen("$DATAROOT/langs/summary", "r"); +$transl = array(); +$sum = 0; while ($line = fgets($summary, 1024)) { if (!preg_match("/LANG ([0-9a-f]+:[0-9a-f]+) ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)/", $line, $m)) @@ -13,10 +15,9 @@ while ($line = fgets($summary, 1024)) if ($m[3] == 0) continue; - $sum = $m[2]+0; - $transl[$m[1]] = $m[3]; - $missing[$m[1]] = $m[4]; - $errors[$m[1]] = $m[5]; + $sum = $m[2]; + $transl[] = array('langid' => $m[1], 'name' => get_locale_name($m[1]), 'translated' => $m[3], + 'missing' => $m[4], 'errors' => $m[5]); } ?> <html> @@ -59,36 +60,48 @@ function draw_bar($tr, $err, $sum) echo "</td></tr>"; } -arsort($transl, SORT_NUMERIC); +function nicesort($a, $b) +{ + if ($a['translated'] != $b['translated']) + return ($a['translated'] < $b['translated']); + + // English (Unites States) always on top + if ($a['langid'] == "009:01") + return 0; + if ($b['langid'] == "009:01") + return 1; + return strcasecmp($a['name'], $b['name']); +} + +usort($transl, 'nicesort'); $nr = 1; $missing_sum = 0; $errors_sum = 0; $transl_sum = 0; $serial = 0; -$transl_keys = array_keys($transl); for ($i = 0; $i < count($transl); $i++) { - $langid = $transl_keys[$i]; - $value = $transl[$langid]; + extract($transl[$i]); + echo "<tr>"; if ($serial == 0) { for ($j = $i; $j < count($transl); $j++) - if ($transl[$langid] != $transl[$transl_keys[$j]]) + if ($translated != $transl[$j]['translated']) break; $serial = $j - $i; echo "<td rowspan=\"$serial\" style=\"text-align: center\">$nr"; echo "</td>"; } - echo "<td>".gen_lang_a($langid).get_lang_name($langid)."</a></td>"; - printf("<td>%d (%.1f%%)</td>", $value, ($value*100)/$sum); - echo "<td>".$missing[$langid]."</td><td>".$errors[$langid]."</td>\n"; - draw_bar($value, $errors[$langid], $sum); + echo "<td>".gen_lang_a($langid).$name."</a></td>"; + printf("<td>%d (%.1f%%)</td>", $translated, ($translated*100)/$sum); + echo "<td>".$missing."</td><td>".$errors."</td>\n"; + draw_bar($translated, $errors, $sum); $nr++; - $missing_sum += $missing[$langid]; - $errors_sum += $errors[$langid]; - $transl_sum += $value; + $transl_sum += $translated; + $missing_sum += $missing; + $errors_sum += $errors; $serial--; } ?>

1 0

Frédéric Delanoy : kernel32: Update French translation of error messages.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: ba74403918fc5fc0235fc98362cd600064ec9619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba74403918fc5fc0235fc9836… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 17 14:43:11 2009 +0200 kernel32: Update French translation of error messages. --- dlls/kernel32/nls/winerr_fra.mc | 1119 ++++++++++++++++++++------------------- 1 files changed, 560 insertions(+), 559 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba74403918fc5fc0235fc…

1 0

Dylan Smith : richedit: Handle missing colours in rtf colour table.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: dde41d5c13e5efdb9607c6ce063e0105a9de12e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde41d5c13e5efdb9607c6ce0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 17 09:17:20 2009 -0400 richedit: Handle missing colours in rtf colour table. When a colour table entry is empty, then the default colour is used. For an incomplete colour table entry 0 is used for the missing colours. Previously the -1 value used internally for missing colours was being converted into white, where it should be using the default colour that is normally black. This bug could be seen by loading the following rich text into wordpad: {\rtf{\colortbl;;}\cf1 text} --- dlls/riched20/editor.c | 12 ++++++++---- dlls/riched20/reader.c | 23 +++++++++++++---------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7ffb7cb..14a7246 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -422,7 +422,10 @@ void ME_RTFCharAttrHook(RTF_Info *info) else if (info->rtfParam != rtfNoParam) { RTFColor *c = RTFGetColor(info, info->rtfParam); - fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + if (c && c->rtfCBlue >= 0) + fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + else + fmt.dwEffects = CFE_AUTOBACKCOLOR; } break; case rtfForeColor: @@ -433,10 +436,11 @@ void ME_RTFCharAttrHook(RTF_Info *info) else if (info->rtfParam != rtfNoParam) { RTFColor *c = RTFGetColor(info, info->rtfParam); - if (c) + if (c && c->rtfCBlue >= 0) fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); - else - fmt.crTextColor = 0; + else { + fmt.dwEffects = CFE_AUTOCOLOR; + } } break; case rtfFontNum: diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index b6a6f44..0462f71 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -990,18 +990,21 @@ static void ReadColorTbl(RTF_Info *info) break; } cp->rtfCNum = cnum++; - cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1; cp->rtfNextColor = info->colorList; info->colorList = cp; - while (RTFCheckCM (info, rtfControl, rtfColorName)) - { - switch (info->rtfMinor) - { - case rtfRed: cp->rtfCRed = info->rtfParam; break; - case rtfGreen: cp->rtfCGreen = info->rtfParam; break; - case rtfBlue: cp->rtfCBlue = info->rtfParam; break; - } - RTFGetToken (info); + if (!RTFCheckCM (info, rtfControl, rtfColorName)) + cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1; + else { + cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = 0; + do { + switch (info->rtfMinor) + { + case rtfRed: cp->rtfCRed = info->rtfParam & 0xFF; break; + case rtfGreen: cp->rtfCGreen = info->rtfParam & 0xFF; break; + case rtfBlue: cp->rtfCBlue = info->rtfParam & 0xFF; break; + } + RTFGetToken (info); + } while (RTFCheckCM (info, rtfControl, rtfColorName)); } if (info->rtfClass == rtfEOF) break;

1 0

Ricardo Filipe : devenum: Update Portuguese translation.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 1e5d72a630ddc484446fe4203356e0755d608794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5d72a630ddc484446fe4203… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jul 17 04:45:32 2009 -0700 devenum: Update Portuguese translation. --- dlls/devenum/devenum.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 60dd59b..01f76b4 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -72,7 +72,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL { 7 "DirectSound padrão" 8 "DirectSound: %s"

1 0

Ricardo Filipe : cryptdlg: Add Portuguese translation.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 3eb5da4b6ecf664f6568d033758e91cacb5c9444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb5da4b6ecf664f6568d0337… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jul 17 04:21:13 2009 -0700 cryptdlg: Add Portuguese translation. --- dlls/cryptdlg/Makefile.in | 1 + dlls/cryptdlg/cryptdlg_Pt.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 311e805..0cc2d3f 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ cryptdlg_Ko.rc \ cryptdlg_Lt.rc \ cryptdlg_Nl.rc \ + cryptdlg_Pt.rc \ cryptdlg_Ro.rc @MAKE_DLL_RULES@ diff --git a/dlls/cryptdlg/cryptdlg_Pt.rc b/dlls/cryptdlg/cryptdlg_Pt.rc new file mode 100644 index 0000000..92d179c --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Pt.rc @@ -0,0 +1,40 @@ +/* + * cryptdlg dll Portuguese resources + * + * Copyright 2008 Ricardo Filipe + * + * This library 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. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "cryptres.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Política de Certificados" + IDS_POLICY_ID "Identificador da Política: " + IDS_POLICY_QUALIFIER_INFO "Informação do Qualificador da Política" + IDS_POLICY_QUALIFIER_ID "ID do Qualificador da Política=" + IDS_CPS "CPS" /* Certification Practice Statement */ + IDS_USER_NOTICE "Aviso ao Utilizador" + IDS_QUALIFIER "Qualificador" + IDS_NOTICE_REF "Referência do Aviso" + IDS_ORGANIZATION "Organização=" + IDS_NOTICE_NUM "Número do Aviso=" + IDS_NOTICE_TEXT "Texto do Aviso=" +}

1 0

Ricardo Filipe : wordpad: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 87d5d882b321bbc67dcfd4219a69a2b9d7c480f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d5d882b321bbc67dcfd4219… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Fri Jul 17 03:30:55 2009 -0700 wordpad: Update Portuguese translation and convert to UTF8. --- programs/wordpad/Pt.rc | 71 +++++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 34 deletions(-) diff --git a/programs/wordpad/Pt.rc b/programs/wordpad/Pt.rc index f8d7df2..fd512c9 100644 --- a/programs/wordpad/Pt.rc +++ b/programs/wordpad/Pt.rc @@ -20,7 +20,9 @@ #include "wordpad.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDM_MAINMENU MENU DISCARDABLE BEGIN @@ -32,8 +34,8 @@ BEGIN MENUITEM "Guardar &como...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Imprimir...\tCtrl+P", ID_PRINT - MENUITEM "&Pr� visualizar...", ID_PREVIEW - MENUITEM "C&onfigurar p�gina...", ID_PRINTSETUP + MENUITEM "&Pré visualizar...", ID_PREVIEW + MENUITEM "C&onfigurar página...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Sair", ID_FILE_EXIT END @@ -57,21 +59,21 @@ BEGIN MENUITEM SEPARATOR POPUP "E&xtras" BEGIN - MENUITEM "&Informa��o da selec��o", ID_EDIT_SELECTIONINFO + MENUITEM "&Informação da selecção", ID_EDIT_SELECTIONINFO MENUITEM "&Formato dos caracteres", ID_EDIT_CHARFORMAT MENUITEM "&Definir formato dos caracteres", ID_EDIT_DEFCHARFORMAT - MENUITEM "F&ormato dos par�grafos", ID_EDIT_PARAFORMAT + MENUITEM "F&ormato dos parágrafos", ID_EDIT_PARAFORMAT MENUITEM "&Buscar texto", ID_EDIT_GETTEXT END END POPUP "&Ver" BEGIN MENUITEM "&Barra de Ferramentas", ID_TOGGLE_TOOLBAR - MENUITEM "Barra de &Formata��o", ID_TOGGLE_FORMATBAR - MENUITEM "&R�gua", ID_TOGGLE_RULER + MENUITEM "Barra de &Formatação", ID_TOGGLE_FORMATBAR + MENUITEM "&Régua", ID_TOGGLE_RULER MENUITEM "Barra de &Estado", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Op��es...", ID_VIEWPROPERTIES + MENUITEM "&Opções...", ID_VIEWPROPERTIES END POPUP "&Inserir" BEGIN @@ -81,8 +83,8 @@ BEGIN BEGIN MENUITEM "&Tipo de Letra...", ID_FONTSETTINGS MENUITEM "&Lista de marcas" ID_BULLET - MENUITEM "&Par�grafo..." ID_PARAFORMAT - MENUITEM "T&abula��es..." ID_TABSTOPS + MENUITEM "&Parágrafo..." ID_PARAFORMAT + MENUITEM "T&abulações..." ID_TABSTOPS POPUP "&Fundo" BEGIN MENUITEM "&Sistema\tCtrl+1", ID_BACK_1 @@ -104,7 +106,7 @@ BEGIN MENUITEM "Co&lar", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Lista de marcas" ID_BULLET - MENUITEM "&Par�grafo..." ID_PARAFORMAT + MENUITEM "&Parágrafo..." ID_PARAFORMAT END END @@ -113,7 +115,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Data e hora" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Formatos Dispon�veis",-1,3,2,100,15 + LTEXT "Formatos Disponíveis",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Cancelar",IDCANCEL,87,26,40,12 @@ -132,10 +134,10 @@ END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Par�grafo" +Caption "Parágrafo" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Identa��o", -1, 10, 10, 120, 68 + GROUPBOX "Identação", -1, 10, 10, 120, 68 LTEXT "Esquerda", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 LTEXT "Direita", -1, 15, 40, 40, 13 @@ -150,10 +152,10 @@ END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -Caption "Tabula��es" +Caption "Tabulações" FONT 8, "MS SHell DLg" BEGIN - GROUPBOX "Marca de tabula��o", -1, 10, 10, 120, 90 + GROUPBOX "Marca de tabulação", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE DEFPUSHBUTTON "&Adicionar", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Remover", ID_TAB_DEL, 72, 80, 45, 15 @@ -169,12 +171,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Moldar o texto", -1, 10, 10, 130, 85 RADIOBUTTON "&Sem moldagem", IDC_PAGEFMT_WN, 18, 25, 117, 15 - RADIOBUTTON "&Moldar � janela", IDC_PAGEFMT_WW, 18, 45, 117, 15 - RADIOBUTTON "Moldar pela &r�gua", IDC_PAGEFMT_WM, 18, 65, 117, 15 + RADIOBUTTON "&Moldar à janela", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Moldar pela &régua", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Barras de Ferramentas", -1, 150, 10, 120, 85 CHECKBOX "&Barra de Ferramentas", IDC_PAGEFMT_TB, 160, 20, 90, 15 - CHECKBOX "Barra de &Formata��o", IDC_PAGEFMT_FB, 160, 38, 90, 15 - CHECKBOX "&R�gua", IDC_PAGEFMT_RU, 160, 56, 90, 15 + CHECKBOX "Barra de &Formatação", IDC_PAGEFMT_FB, 160, 38, 90, 15 + CHECKBOX "&Régua", IDC_PAGEFMT_RU, 160, 56, 90, 15 CHECKBOX "Barra de &Estado", IDC_PAGEFMT_SB, 160, 74, 90, 15 LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 END @@ -208,7 +210,7 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_VIEWPROPS_TITLE, "Op��es" + STRING_VIEWPROPS_TITLE, "Opções" STRING_VIEWPROPS_TEXT, "Texto" STRING_VIEWPROPS_RICHTEXT, "Rich text" END @@ -216,10 +218,10 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_PREVIEW_PRINT, "Imprimir" - STRING_PREVIEW_NEXTPAGE, "Pr�xima p�gina" - STRING_PREVIEW_PREVPAGE, "P�gina anterior" - STRING_PREVIEW_TWOPAGES, "Duas p�ginas" - STRING_PREVIEW_ONEPAGE, "Uma p�gina" + STRING_PREVIEW_NEXTPAGE, "Próxima página" + STRING_PREVIEW_PREVPAGE, "Página anterior" + STRING_PREVIEW_TWOPAGES, "Duas páginas" + STRING_PREVIEW_ONEPAGE, "Uma página" STRING_PREVIEW_CLOSE, "Fechar" END @@ -231,17 +233,18 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Documento" - STRING_PROMPT_SAVE_CHANGES, "Guardar altera��es a '%s'?" + STRING_PROMPT_SAVE_CHANGES, "Guardar alterações a '%s'?" STRING_SEARCH_FINISHED, "Acabou a pesquisa do documento." STRING_LOAD_RICHED_FAILED, "Falhou o carregamento da biblioteca RichEdit." STRING_SAVE_LOSEFORMATTING, "Escolheu guardar em formato de texto simples, " \ - "o que vai anular todas as formata��es. " \ + "o que vai anular todas as formatações. " \ "Tem a certeza que quer fazer isto?" - STRING_INVALID_NUMBER, "Formato de n�mero inv�lido" - STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE n�o s�o suportados" - STRING_WRITE_FAILED, "N�o foi poss�vel guardar o ficheiro." - STRING_WRITE_ACCESS_DENIED, "N�o tem permiss�es para guardar o ficheiro." - STRING_OPEN_FAILED, "N�o foi poss�vel abrir o ficheiro." - STRING_OPEN_ACCESS_DENIED, "N�o tem permiss�es para abrir o ficheiro." - STRING_PRINTING_NOT_IMPLEMENTED, "Impress�o n�o implementada" + STRING_INVALID_NUMBER, "Formato de número inválido" + STRING_OLE_STORAGE_NOT_SUPPORTED, "Documentos OLE não são suportados" + STRING_WRITE_FAILED, "Não foi possível guardar o ficheiro." + STRING_WRITE_ACCESS_DENIED, "Não tem permissões para guardar o ficheiro." + STRING_OPEN_FAILED, "Não foi possível abrir o ficheiro." + STRING_OPEN_ACCESS_DENIED, "Não tem permissões para abrir o ficheiro." + STRING_PRINTING_NOT_IMPLEMENTED, "Impressão não implementada" + STRING_MAX_TAB_STOPS, "Não pode adicionar mais de 32 tabs." END

1 0