Thread: [Winmerge-svn] SF.net SVN: winmerge: [4827] trunk/Web (Page 4)
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2007-12-14 23:26:06
|
Revision: 4827 http://winmerge.svn.sourceforge.net/winmerge/?rev=4827&view=rev Author: gerundt Date: 2007-12-14 15:26:01 -0800 (Fri, 14 Dec 2007) Log Message: ----------- PATCH: [ 1850413 ] Web: Add "Translations" tab Modified Paths: -------------- trunk/Web/css/print.css trunk/Web/css/screen.css trunk/Web/page.inc trunk/Web/sitemap.txt Added Paths: ----------- trunk/Web/translations/ trunk/Web/translations/images/ trunk/Web/translations/images/fuzzy.png trunk/Web/translations/images/translated.png trunk/Web/translations/images/untranslated.png trunk/Web/translations/index.php trunk/Web/translations/status_branch.php trunk/Web/translations/status_trunk.php trunk/Web/translations/status_trunk.xml trunk/Web/translations/translations.inc Modified: trunk/Web/css/print.css =================================================================== --- trunk/Web/css/print.css 2007-12-13 23:49:38 UTC (rev 4826) +++ trunk/Web/css/print.css 2007-12-14 23:26:01 UTC (rev 4827) @@ -94,27 +94,38 @@ display: none; } -/* Status of translations */ -#status { - margin-bottom: 10px; +/* Inline list */ +ul.inline { + margin: 1em; + padding: 0; +} + +ul.inline li { + margin: 0; + margin-right: 1em; + padding: 0; + display: inline; + list-style: none; +} + +/* Translations Status */ +.status { border-collapse: collapse; + border: 1px solid black; } -#status th { +.status th { padding: 3px; + background: white; border: 1px solid black; } -#status td { +.status td { padding: 3px; + background: white; border: 1px solid black; } .left { text-align: left; } .center { text-align: center; } -.right { text-align: right; } - -.actively { background-color: white; } -.maintained { background-color: white; } -.unmaintained { background-color: white; } -.unknown { background-color: white; } \ No newline at end of file +.right { text-align: right; } \ No newline at end of file Modified: trunk/Web/css/screen.css =================================================================== --- trunk/Web/css/screen.css 2007-12-13 23:49:38 UTC (rev 4826) +++ trunk/Web/css/screen.css 2007-12-14 23:26:01 UTC (rev 4827) @@ -215,27 +215,38 @@ border-bottom: 1px dotted black; } -/* Status of translations */ -#status { - margin-bottom: 10px; +/* Inline list */ +ul.inline { + margin: 1em; + padding: 0; +} + +ul.inline li { + margin: 0; + margin-right: 1em; + padding: 0; + display: inline; + list-style: none; +} + +/* Translations Status */ +.status { border-collapse: collapse; + border: 1px solid #aaaaaa; } -#status th { +.status th { padding: 3px; - border: 1px solid black; + background: #f2f2f2; + border: 1px solid #aaaaaa ; } -#status td { +.status td { padding: 3px; - border: 1px solid black; + background: #f9f9f9; + border: 1px solid #aaaaaa; } .left { text-align: left; } .center { text-align: center; } -.right { text-align: right; } - -.actively { background-color: #CCFFCC; } -.maintained { background-color: #CCCCFF; } -.unmaintained { background-color: #FFCCCC; } -.unknown { background-color: #FFFFCC; } \ No newline at end of file +.right { text-align: right; } \ No newline at end of file Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2007-12-13 23:49:38 UTC (rev 4826) +++ trunk/Web/page.inc 2007-12-14 23:26:01 UTC (rev 4827) @@ -17,6 +17,7 @@ define ('WINMERGE_2_6', '2.6'); define ('TAB_DOWNLOADS', 'downloads'); define ('TAB_SUPPORT', 'support'); + define ('TAB_TRANSLATIONS', 'translations'); include 'release.inc'; @@ -188,6 +189,12 @@ else { //if NOT "Support" ... $temp .= " <li><a href=\"/support/index.php\">Support</a></li>\n"; } + if ($this->_tab == TAB_TRANSLATIONS) { //if "Translations" ... + $temp .= " <li><a href=\"/translations/index.php\" id=\"current\">Translations</a></li>\n"; + } + else { //if NOT "Translations" ... + $temp .= " <li><a href=\"/translations/index.php\">Translations</a></li>\n"; + } $temp .= " <li><a href=\"/Wiki/\">Developer Wiki</a></li>\n"; $temp .= "</ul>\n"; /* Sub Tabs */ @@ -248,6 +255,14 @@ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=313216\" title=\"Submit a Patch\">Patches</a></li>\n"; $temp .= "</ul>\n"; break; + case TAB_TRANSLATIONS: //if "Translations" ... + $temp .= "<ul id=\"subtabs\">\n"; + $temp .= " <li><a href=\"/translations/index.php\" title=\"Index\">Index</a></li>\n"; + $temp .= " <li><a href=\"http://winmerge.org/Wiki/Translations\" title=\"Translations Status (Branch)\">Status (Branch)</a></li>\n"; + //$temp .= " <li><a href=\"/translations/status_branch.php\" title=\"Translations Status (Branch)\">Status (Branch)</a></li>\n"; + $temp .= " <li><a href=\"/translations/status_trunk.php\" title=\"Translations Status (Trunk)\">Status (Trunk)</a></li>\n"; + $temp .= "</ul>\n"; + break; } return $temp; } Modified: trunk/Web/sitemap.txt =================================================================== --- trunk/Web/sitemap.txt 2007-12-13 23:49:38 UTC (rev 4826) +++ trunk/Web/sitemap.txt 2007-12-14 23:26:01 UTC (rev 4827) @@ -59,3 +59,6 @@ http://winmerge.org/support/index.php http://winmerge.org/support/mailing-lists.php http://winmerge.org/support/tracker-shortcuts.php +http://winmerge.org/translations/index.php +http://winmerge.org/translations/status_branch.php +http://winmerge.org/translations/status_trunk.php Added: trunk/Web/translations/images/fuzzy.png =================================================================== (Binary files differ) Property changes on: trunk/Web/translations/images/fuzzy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Web/translations/images/translated.png =================================================================== (Binary files differ) Property changes on: trunk/Web/translations/images/translated.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Web/translations/images/untranslated.png =================================================================== (Binary files differ) Property changes on: trunk/Web/translations/images/untranslated.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Web/translations/index.php =================================================================== --- trunk/Web/translations/index.php (rev 0) +++ trunk/Web/translations/index.php 2007-12-14 23:26:01 UTC (rev 4827) @@ -0,0 +1,34 @@ +<?php + include('../page.inc'); + + $page = new Page; + $page->printHead('WinMerge: Translations', TAB_TRANSLATIONS); +?> +<h2>Translations</h2> +<p>We currently have WinMerge translated into the languages listed below:</p> +<?php + $status = $page->convertXml2Array('status_trunk.xml'); + print("<ul class=\"inline\">\n"); + $translations = $status['TRANSLATIONS'][0]['TRANSLATION']; + $translations = $page->multisortArray($translations, 'LANGUAGE', SORT_ASC); + for ($i = 0; $i < count($translations); $i++) { //For all translations... + $translation = $translations[$i]; + $language_name = $translation['LANGUAGE'][0]['VALUE']; + + print(" <li>" . $language_name . "</li>\n"); + } + print("</ul>\n"); +?> +<p>To change languages, select the desired language from the <em>View->Languages</em> menu choice.</p> +<h3>Translating</h3> +<p>If you would like to update any of these translations or add another translation, then please follow <a href="http://winmerge.svn.sourceforge.net/viewvc/*checkout*/winmerge/trunk/Docs/Developers/Translations.html">these instructions</a>.</p> +<h3>Status</h3> +<p>The following two pages inform you about the translations status of the stable and developer version of WinMerge:</p> +<ul> + <li><a href="http://winmerge.org/Wiki/Translations">Stable Version (Branch)</a></li> + <!--<li><a href="status_branch.php">Stable Version (Branch)</a></li>--> + <li><a href="status_trunk.php">Developer Version (Trunk)</a></li> +</ul> +<?php + $page->printFoot(); +?> \ No newline at end of file Added: trunk/Web/translations/status_branch.php =================================================================== --- trunk/Web/translations/status_branch.php (rev 0) +++ trunk/Web/translations/status_branch.php 2007-12-14 23:26:01 UTC (rev 4827) @@ -0,0 +1,20 @@ +<?php + include('../page.inc'); + include('translations.inc'); + + $page = new Page; + $page->printHead('WinMerge: Translations Status (Branch)', TAB_TRANSLATIONS); + + $status = $page->convertXml2Array('status_branch.xml'); + print("<h2>Translations Status (Branch)</h2>\n"); + if (!empty($status)) { + printTranslationsStatus($status, 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/branch/R2_6/Src/Languages/'); + printTranslationsStatusGraphLegend(); + print("<h3>Translators</h3>\n"); + printTranslationsTranslators($status); + } + else { + print("<p>The translations status is currently not available...</p>\n"); + } + $page->printFoot(); +?> \ No newline at end of file Added: trunk/Web/translations/status_trunk.php =================================================================== --- trunk/Web/translations/status_trunk.php (rev 0) +++ trunk/Web/translations/status_trunk.php 2007-12-14 23:26:01 UTC (rev 4827) @@ -0,0 +1,20 @@ +<?php + include('../page.inc'); + include('translations.inc'); + + $page = new Page; + $page->printHead('WinMerge: Translations Status (Trunk)', TAB_TRANSLATIONS); + + $status = $page->convertXml2Array('status_trunk.xml'); + print("<h2>Translations Status (Trunk)</h2>\n"); + if (!empty($status)) { + printTranslationsStatus($status, 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/trunk/Src/Languages/'); + printTranslationsStatusGraphLegend(); + print("<h3>Translators</h3>\n"); + printTranslationsTranslators($status); + } + else { + print("<p>The translations status is currently not available...</p>\n"); + } + $page->printFoot(); +?> \ No newline at end of file Added: trunk/Web/translations/status_trunk.xml =================================================================== --- trunk/Web/translations/status_trunk.xml (rev 0) +++ trunk/Web/translations/status_trunk.xml 2007-12-14 23:26:01 UTC (rev 4827) @@ -0,0 +1,463 @@ +<translations> + <update>2007-12-15</update> + <translation> + <language>Brazilian</language> + <file>Brazilian.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>328</translated> + <fuzzy>2</fuzzy> + <untranslated>829</untranslated> + </strings> + <translators> + <translator> + <name>Wender Firmino</name> + <mail>wender at pta.com.br</mail> + </translator> + </translators> + </translation> + <translation> + <language>Bulgarian</language> + <file>Bulgarian.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>974</translated> + <fuzzy>2</fuzzy> + <untranslated>183</untranslated> + </strings> + <translators> + <translator> + <name>sld</name> + <mail>sld at mail.bg</mail> + </translator> + <translator> + <name>tigertron</name> + <mail>tigertron at dir.bg</mail> + </translator> + </translators> + </translation> + <translation> + <language>Catalan</language> + <file>Catalan.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>1065</translated> + <fuzzy>2</fuzzy> + <untranslated>92</untranslated> + </strings> + <translators> + <translator> + <name>Jordi Vilar</name> + <mail>jvilar at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>ChineseSimplified</language> + <file>ChineseSimplified.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>1037</translated> + <fuzzy>2</fuzzy> + <untranslated>120</untranslated> + </strings> + <translators> + <translator> + <name>Liaobin</name> + <mail>liaobin at jite. net</mail> + </translator> + <translator> + <name>xmpdhml</name> + <mail>xmpdhml at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>ChineseTraditional</language> + <file>ChineseTraditional.po</file> + <update>2007-11-02</update> + <strings> + <count>1159</count> + <translated>1156</translated> + <fuzzy>0</fuzzy> + <untranslated>3</untranslated> + </strings> + <translators> + <translator> + <name>Koko</name> + <mail>kokokoko at giga.net.tw</mail> + </translator> + <translator> + <name>wck3</name> + <mail>wck3171 at pchome.com.tw</mail> + </translator> + </translators> + </translation> + <translation> + <language>Croatian</language> + <file>Croatian.po</file> + <update>2007-11-19</update> + <strings> + <count>1159</count> + <translated>1156</translated> + <fuzzy>0</fuzzy> + <untranslated>3</untranslated> + </strings> + <translators> + <translator> + <name>Hasan Osmanag\xE6</name> + <mail>hasan.osmanagic at public.carnet.hr</mail> + </translator> + </translators> + </translation> + <translation> + <language>Czech</language> + <file>Czech.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>875</translated> + <fuzzy>2</fuzzy> + <untranslated>282</untranslated> + </strings> + <translators> + <translator> + <name>Jiri Tax</name> + <mail>jt at taxoft.cz</mail> + </translator> + <translator> + <name>Jan Hryz</name> + <mail>janhryz at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Danish</language> + <file>Danish.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>664</translated> + <fuzzy>2</fuzzy> + <untranslated>493</untranslated> + </strings> + <translators> + <translator> + <name>Christian List</name> + <mail>list1974 at hotmail.com</mail> + </translator> + </translators> + </translation> + <translation> + <language>Dutch</language> + <file>Dutch.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>676</translated> + <fuzzy>0</fuzzy> + <untranslated>483</untranslated> + </strings> + <translators> + <translator> + <name>Ronald Schaap</name> + <mail>ronald at schaap.demon.nl</mail> + </translator> + <translator> + <name>Michel Coene</name> + </translator> + </translators> + </translation> + <translation> + <language>French</language> + <file>French.po</file> + <update>2007-09-21</update> + <strings> + <count>1159</count> + <translated>1154</translated> + <fuzzy>0</fuzzy> + <untranslated>5</untranslated> + </strings> + <translators> + <translator> + <name>Gil Andre</name> + <mail>gil_andre at compuserve.com</mail> + </translator> + <translator> + <name>Laurent Ganier</name> + <mail>ccganier at club-internet.fr</mail> + </translator> + <translator> + <name>Jean-F Jolin</name> + <mail>jean-f-j at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>German</language> + <file>German.po</file> + <update>2007-09-06</update> + <strings> + <count>1159</count> + <translated>1061</translated> + <fuzzy>0</fuzzy> + <untranslated>98</untranslated> + </strings> + <translators> + <translator> + <name>Winfried Peter</name> + <mail>winfried.peter at omicron.at</mail> + </translator> + <translator> + <name>J\xF6rg Schneider</name> + <mail>tonda at users.sourceforge.net</mail> + </translator> + <translator> + <name>Tim Gerundt</name> + <mail>tim at gerundt.de</mail> + </translator> + </translators> + </translation> + <translation> + <language>Hungarian</language> + <file>Hungarian.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>803</translated> + <fuzzy>2</fuzzy> + <untranslated>354</untranslated> + </strings> + <translators> + <translator> + <name>M\xE1rton Bal\xE1zs</name> + <mail>documan at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Italian</language> + <file>Italian.po</file> + <update>2007-09-30</update> + <strings> + <count>1159</count> + <translated>1151</translated> + <fuzzy>0</fuzzy> + <untranslated>8</untranslated> + </strings> + <translators> + <translator> + <name>Michele Merega</name> + <mail>michele.merega at ifminfomaster.com</mail> + </translator> + <translator> + <name>Andrea Decorte</name> + <mail>deco1985 at hotmail.com</mail> + </translator> + </translators> + </translation> + <translation> + <language>Japanese</language> + <file>Japanese.po</file> + <update>2007-11-11</update> + <strings> + <count>1159</count> + <translated>1156</translated> + <fuzzy>0</fuzzy> + <untranslated>3</untranslated> + </strings> + <translators> + <translator> + <name>Takashi Sawanaka</name> + <mail>sawanaka at d1.dion.ne.jp</mail> + </translator> + </translators> + </translation> + <translation> + <language>Korean</language> + <file>Korean.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>902</translated> + <fuzzy>2</fuzzy> + <untranslated>255</untranslated> + </strings> + <translators> + <translator> + <name>Hwang Sukjoon</name> + <mail>bbcool at gmail.com</mail> + </translator> + <translator> + <name>Lee Jae-Hong</name> + <mail>pyrasis at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Norwegian</language> + <file>Norwegian.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>590</translated> + <fuzzy>2</fuzzy> + <untranslated>567</untranslated> + </strings> + <translators> + <translator> + <name>Hans Fredrik Nordhaug</name> + <mail>hansfn at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Polish</language> + <file>Polish.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>1030</translated> + <fuzzy>2</fuzzy> + <untranslated>127</untranslated> + </strings> + <translators> + <translator> + <name>Pawel Wawrzysko</name> + <mail>traduc at kki.pl</mail> + </translator> + </translators> + </translation> + <translation> + <language>Portuguese</language> + <file>Portuguese.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>1015</translated> + <fuzzy>0</fuzzy> + <untranslated>144</untranslated> + </strings> + <translators> + <translator> + <name>Nelson Sim\xE3o</name> + </translator> + </translators> + </translation> + <translation> + <language>Russian</language> + <file>Russian.po</file> + <update>2007-09-23</update> + <strings> + <count>1159</count> + <translated>1149</translated> + <fuzzy>5</fuzzy> + <untranslated>5</untranslated> + </strings> + <translators> + <translator> + <name>Dmitriy S. Aleshkowskiy</name> + <mail>wwarlock at mail.ru</mail> + </translator> + <translator> + <name>geek2k</name> + <mail>geek2k at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Slovak</language> + <file>Slovak.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>1033</translated> + <fuzzy>2</fuzzy> + <untranslated>124</untranslated> + </strings> + <translators> + <translator> + <name>majvan</name> + <mail>vancojur at decef.elf.stuba.sk</mail> + </translator> + <translator> + <name>Ivan Mas\xE1r</name> + <mail>helix84 at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Spanish</language> + <file>Spanish.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>967</translated> + <fuzzy>4</fuzzy> + <untranslated>188</untranslated> + </strings> + <translators> + <translator> + <name>Dean Grimm</name> + <mail>grimmdp at yahoo.com</mail> + </translator> + <translator> + <name>Jes\xFAs M. Delgado 'MacK'</name> + <mail>mack_ at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Swedish</language> + <file>Swedish.po</file> + <update>2007-08-24</update> + <strings> + <count>1159</count> + <translated>1152</translated> + <fuzzy>0</fuzzy> + <untranslated>7</untranslated> + </strings> + <translators> + <translator> + <name>G\xF6ran H\xE5kansson</name> + <mail>goran.x.hakansson at telia.com</mail> + </translator> + <translator> + <name>Hans Eriksson</name> + <mail>hans.ericson at bredband.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Turkish</language> + <file>Turkish.po</file> + <update></update> + <strings> + <count>1159</count> + <translated>74</translated> + <fuzzy>0</fuzzy> + <untranslated>1085</untranslated> + </strings> + <translators> + <translator> + <name>Ozkan UNVER</name> + <mail>turquaz37915 at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>English</language> + <file>English.pot</file> + <update>2007-12-15</update> + <strings> + <count>1159</count> + <translated>1159</translated> + <fuzzy>0</fuzzy> + <untranslated>0</untranslated> + </strings> + </translation> +</translations> Added: trunk/Web/translations/translations.inc =================================================================== --- trunk/Web/translations/translations.inc (rev 0) +++ trunk/Web/translations/translations.inc 2007-12-14 23:26:01 UTC (rev 4827) @@ -0,0 +1,167 @@ +<?php +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program 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 General Public License for more details. + + /** + * ... + * + * Based partially on the TortoiseSVN Drupal module: + * @link http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/drupal-modules/module/tortoisesvn.module + */ + function get_status_graph($count, $translated, $fuzzy, $untranslated) { + // Calculate width of bars + $wc = 150; + $wt = round($wc * $translated / $count); + $wf = round($wc * $fuzzy / $count); + $wu = round($wc * $untranslated / $count); + + // Make sure that each bar is at least 2px wide if its value is > 0 + if (($wt<2) && ($translated>0)) $wt=2; + if (($wf<2) && ($fuzzy>0)) $wf=2; + if (($wu<2) && ($untranslated>0)) $wu=2; + + // Make sure total width stays constant by determining the widest bar + // and subtracting the width of the shorter bars from it. + if ($wt+$wf+$wu!=$wc) { + if ($wt>=$wf && $wt>=$wu) { + $wt = $wc-$wf-$wu; + } else if ($wf>=$wt && $wf>=$wu) { + $wf = $wc-$wt-$wu; + } else { + $wu = $wc-$wt-$wf; + } + } + + // Calculate percentages + $pt = ($translated * 100) / $count; + $pf = ($fuzzy * 100) / $count; + $pu = ($untranslated * 100) / $count; + + $temp = ""; + if ($wt > 0) + $temp .= "<img src=\"images/translated.png\" alt=\"Translated\" title=\"Translated: " . round($pt, 1) . "%\" width=\"$wt\" height=\"16\">"; + if ($wf > 0) + $temp .= "<img src=\"images/fuzzy.png\" alt=\"Fuzzy\" title=\"Fuzzy: " . round($pf, 1) . "%\" width=\"$wf\" height=\"16\">"; + if ($wu > 0) + $temp .= "<img src=\"images/untranslated.png\" alt=\"Untranslated\" title=\"Untranslated: " . round($pu, 1) . "%\" width=\"$wu\" height=\"16\">"; + + return $temp; + } + + /** + * ... + */ + function printTranslationsStatus($xmlarray, $svnurl) { + global $page; + + $update = $xmlarray['TRANSLATIONS'][0]['UPDATE'][0]['VALUE']; + $temp = "<p>Status from <strong>" . $update . "</strong>:</p>\n"; + $temp .= "<table class=\"status\">\n"; + $temp .= " <tr>\n"; + $temp .= " <th class=\"left\">Language</th>\n"; + $temp .= " <th class=\"center\">Graph</th>\n"; + $temp .= " <th class=\"right\">Translated</th>\n"; + $temp .= " <th class=\"right\">Fuzzy</th>\n"; + $temp .= " <th class=\"right\">Untranslated</th>\n"; + $temp .= " <th class=\"center\">Last Update</th>\n"; + $temp .= " </tr>\n"; + $translations = $xmlarray['TRANSLATIONS'][0]['TRANSLATION']; + $translations = $page->multisortArray($translations, 'LANGUAGE', SORT_ASC); + for ($i = 0; $i < count($translations); $i++) { //For all translations... + $translation = $translations[$i]; + $language_name = $translation['LANGUAGE'][0]['VALUE']; + if ($language_name != 'English') { //If NOT English... + $file_name = $translation['FILE'][0]['VALUE']; + $translation_update = $translation['UPDATE'][0]['VALUE']; + $strings = $translation['STRINGS'][0]; + $strings_count = $strings['COUNT'][0]['VALUE']; + $strings_translated = $strings['TRANSLATED'][0]['VALUE']; + $strings_fuzzy = $strings['FUZZY'][0]['VALUE']; + $strings_untranslated = $strings['UNTRANSLATED'][0]['VALUE']; + + $temp .= " <tr>\n"; + $temp .= " <td class=\"left\"><a href=\"" . $svnurl . $file_name . "\">" . $language_name . "</a></td>\n"; + $temp .= " <td class=\"center\">" . get_status_graph($strings_count, $strings_translated, $strings_fuzzy, $strings_untranslated) . "</td>\n"; + $temp .= " <td class=\"right\">" . $strings_translated . "</td>\n"; + $temp .= " <td class=\"right\">" . $strings_fuzzy . "</td>\n"; + $temp .= " <td class=\"right\">" . $strings_untranslated . "</td>\n"; + $temp .= " <td class=\"center\">" . $translation_update . "</td>\n"; + $temp .= " </tr>\n"; + } + else { //If English... + $english = $translations[$i]; + $english_file_name = $english['FILE'][0]['VALUE']; + $english_translation_update = $english['UPDATE'][0]['VALUE']; + $english_strings_count = $english['STRINGS'][0]['COUNT'][0]['VALUE']; + } + } + $temp .= " <tr>\n"; + $temp .= " <td class=\"left\"><a href=\"" . $svnurl . $english_file_name . "\">English (Template)</a></td>\n"; + $temp .= " <td class=\"center\"></td>\n"; + $temp .= " <td colspan=\"3\" class=\"center\">Total: " . $english_strings_count . "</td>\n"; + $temp .= " <td class=\"center\">" . $english_translation_update . "</td>\n"; + $temp .= " </tr>\n"; + $temp .= "</table>\n"; + print($temp); + } + + /** + * ... + */ + function printTranslationsStatusGraphLegend() { + $temp = "<ul class=\"inline\">\n"; + $temp .= " <li><img src=\"images/translated.png\" alt=\"*\" width=\"16\" height=\"16\"> Translated</li>\n"; + $temp .= " <li><img src=\"images/fuzzy.png\" alt=\"*\" width=\"16\" height=\"16\"> Fuzzy</li>\n"; + $temp .= " <li><img src=\"images/untranslated.png\" alt=\"*\" width=\"16\" height=\"16\"> Untranslated</li>\n"; + $temp .= "</ul>\n"; + print($temp); + } + + /** + * ... + */ + function printTranslationsTranslators($xmlarray) { + global $page; + + $temp = "<table class=\"status\">\n"; + $temp .= " <tr>\n"; + $temp .= " <th class=\"left\">Language</th>\n"; + $temp .= " <th class=\"left\">Translator(s)</th>\n"; + $temp .= " </tr>\n"; + $translations = $xmlarray['TRANSLATIONS'][0]['TRANSLATION']; + $translations = $page->multisortArray($translations, 'LANGUAGE', SORT_ASC); + for ($i = 0; $i < count($translations); $i++) { //For all translations... + $translation = $translations[$i]; + $language_name = $translation['LANGUAGE'][0]['VALUE']; + if ($language_name != 'English') { //If NOT English... + $translators = $translation['TRANSLATORS'][0]['TRANSLATOR']; + + $temp .= " <tr>\n"; + $temp .= " <td class=\"left\">" . $language_name . "</td>\n"; + $temp .= " <td class=\"left\">"; + for ($j = 0; $j < count($translators); $j++) { //For all translators... + $translator = $translators[$j]; + $translator_name = $translator['NAME'][0]['VALUE']; + $translator_mail = $translator['MAIL'][0]['VALUE']; + + if ($translator_mail != '') + $temp .= "<a href=\"mailto:" . $translator_mail . "\" title=\"" . htmlentities($translator_name) . " <" . $translator_mail . ">\">" . htmlentities($translator_name) . "</a>"; + else + $temp .= $translator_name; + $temp .= "<br>"; + } + $temp .= "</td>\n"; + $temp .= " </tr>\n"; + } + } + $temp .= "</table>\n"; + print($temp); + } +?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2007-12-19 20:31:33
|
Revision: 4839 http://winmerge.svn.sourceforge.net/winmerge/?rev=4839&view=rev Author: gerundt Date: 2007-12-19 12:31:30 -0800 (Wed, 19 Dec 2007) Log Message: ----------- Web: Colorize Translations Status table Modified Paths: -------------- trunk/Web/css/print.css trunk/Web/css/screen.css trunk/Web/translations/translations.inc Modified: trunk/Web/css/print.css =================================================================== --- trunk/Web/css/print.css 2007-12-19 16:42:52 UTC (rev 4838) +++ trunk/Web/css/print.css 2007-12-19 20:31:30 UTC (rev 4839) @@ -126,6 +126,10 @@ border: 1px solid black; } +.translated { color: black; } +.fuzzy { color: black; } +.untranslated { color: black; } + .left { text-align: left; } .center { text-align: center; } .right { text-align: right; } \ No newline at end of file Modified: trunk/Web/css/screen.css =================================================================== --- trunk/Web/css/screen.css 2007-12-19 16:42:52 UTC (rev 4838) +++ trunk/Web/css/screen.css 2007-12-19 20:31:30 UTC (rev 4839) @@ -247,6 +247,10 @@ border: 1px solid #aaaaaa; } +.translated { color: #2D802B; } +.fuzzy { color: #05359B; } +.untranslated { color: #D42323; } + .left { text-align: left; } .center { text-align: center; } .right { text-align: right; } \ No newline at end of file Modified: trunk/Web/translations/translations.inc =================================================================== --- trunk/Web/translations/translations.inc 2007-12-19 16:42:52 UTC (rev 4838) +++ trunk/Web/translations/translations.inc 2007-12-19 20:31:30 UTC (rev 4839) @@ -67,9 +67,9 @@ $temp .= " <tr>\n"; $temp .= " <th class=\"left\">Language</th>\n"; $temp .= " <th class=\"center\">Graph</th>\n"; - $temp .= " <th class=\"right\">Translated</th>\n"; - $temp .= " <th class=\"right\">Fuzzy</th>\n"; - $temp .= " <th class=\"right\">Untranslated</th>\n"; + $temp .= " <th class=\"right translated\">Translated</th>\n"; + $temp .= " <th class=\"right fuzzy\">Fuzzy</th>\n"; + $temp .= " <th class=\"right untranslated\">Untranslated</th>\n"; $temp .= " <th class=\"center\">Last Update</th>\n"; $temp .= " </tr>\n"; $translations = $xmlarray['TRANSLATIONS'][0]['TRANSLATION']; @@ -89,9 +89,9 @@ $temp .= " <tr>\n"; $temp .= " <td class=\"left\"><a href=\"" . $svnurl . $file_name . "\">" . $language_name . "</a></td>\n"; $temp .= " <td class=\"center\">" . get_status_graph($strings_count, $strings_translated, $strings_fuzzy, $strings_untranslated) . "</td>\n"; - $temp .= " <td class=\"right\">" . $strings_translated . "</td>\n"; - $temp .= " <td class=\"right\">" . $strings_fuzzy . "</td>\n"; - $temp .= " <td class=\"right\">" . $strings_untranslated . "</td>\n"; + $temp .= " <td class=\"right translated\">" . $strings_translated . "</td>\n"; + $temp .= " <td class=\"right fuzzy\">" . $strings_fuzzy . "</td>\n"; + $temp .= " <td class=\"right untranslated\">" . $strings_untranslated . "</td>\n"; $temp .= " <td class=\"center\">" . $translation_update . "</td>\n"; $temp .= " </tr>\n"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2007-12-23 00:22:01
|
Revision: 4843 http://winmerge.svn.sourceforge.net/winmerge/?rev=4843&view=rev Author: gerundt Date: 2007-12-22 16:21:56 -0800 (Sat, 22 Dec 2007) Log Message: ----------- Web: Add own 404 error page. Modified Paths: -------------- trunk/Web/.htaccess Added Paths: ----------- trunk/Web/404.php Modified: trunk/Web/.htaccess =================================================================== --- trunk/Web/.htaccess 2007-12-20 18:35:41 UTC (rev 4842) +++ trunk/Web/.htaccess 2007-12-23 00:21:56 UTC (rev 4843) @@ -1,3 +1,5 @@ +ErrorDocument 404 /404.php + <FilesMatch "\.inc$"> Order Deny,Allow Deny from all Added: trunk/Web/404.php =================================================================== --- trunk/Web/404.php (rev 0) +++ trunk/Web/404.php 2007-12-23 00:21:56 UTC (rev 4843) @@ -0,0 +1,26 @@ +<?php + //Send 404 headers... + header('HTTP/1.1 404 Not Found'); + header('Status: 404 Not Found'); + + include('page.inc'); + + $page = new Page; + $page->printHead('WinMerge: Error 404 (Page Not Found)', TAB_HOME); +?> +<h2>Page Not Found...</h2> +<p>For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found. +<!--This site has recently undergone a major re-working, so that might explain why you got this page instead.--></p> + +<h3>Were you looking for...</h3> +<ul> + <li><a href="/2.6/manual/index.html">Manual</a>?</li> + <li><a href="/2.6/screenshots.php">Screenshots</a>?</li> + <!--<li><a href="/docs">Documentation</a>?</li>--> + <li><a href="/downloads">Downloads</a>?</li> + <li><a href="/support">Support</a>?</li> + <li><a href="/translations">Translations</a>?</li> +</ul> +<?php + $page->printFoot(); +?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-01-27 00:31:33
|
Revision: 4962 http://winmerge.svn.sourceforge.net/winmerge/?rev=4962&view=rev Author: gerundt Date: 2008-01-26 16:31:15 -0800 (Sat, 26 Jan 2008) Log Message: ----------- PATCH: [ 1880489 ] Web: Translations status as RSS feed Modified Paths: -------------- trunk/Web/page.inc trunk/Web/translations/index.php trunk/Web/translations/status_branch.php trunk/Web/translations/status_trunk.php trunk/Web/translations/translations.inc Added Paths: ----------- trunk/Web/images/rss.png trunk/Web/translations/status_branch_rss.php trunk/Web/translations/status_trunk_rss.php Added: trunk/Web/images/rss.png =================================================================== (Binary files differ) Property changes on: trunk/Web/images/rss.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-01-26 11:23:40 UTC (rev 4961) +++ trunk/Web/page.inc 2008-01-27 00:31:15 UTC (rev 4962) @@ -26,7 +26,7 @@ */ class Page { var $_title, $_charset; - var $_description, $_keywords; + var $_description, $_keywords, $_rssfeeds; var $_tab; var $_stablerelease; @@ -38,6 +38,7 @@ $this->_charset = 'ISO-8859-1'; $this->_description = 'WinMerge HomePage: Visual text file comparison and merging (Open Source software).'; $this->_keywords = 'WinMerge, free, download, Beyond Compare, Scooter Software, DLSuperC, DLSubCF, Component Software Diff, Viff, TreeDiff, FileSync, WMatch, Quick Spot, NTDMatch, windiff, WDIFF, FolderMatch, Merge 99, Merge99, PMdiff, PMDiff, PMDIFF, pmdiff, visual, visually, file, folder, directory, synchronization, comparison, graphical, document, text, compare, diff, difference, revision, Araxis, compare folders, compare files, synchronize folders, merge files, merge folders, Y2K, Year 2000, Year 2K, side-by-side, VFC, GFC, gdiff, CSDiff, OS2GFC, vdiff, ediff, fc'; + $this->_rssfeeds = array(); $this->_tab = WINMERGE_2_6; /* _Stable Release */ $this->_stablerelease = new Release; @@ -75,6 +76,13 @@ } /** + * add RSS feed to the page head + */ + function addRssFeed($url, $title = 'RSS') { + $this->_rssfeeds[$url] = $title; + } + + /** * set the tab from the page */ function setTab($tab) { @@ -102,6 +110,9 @@ $temp .= " <style type=\"text/css\" media=\"screen\">@import \"/css/screen.css\";</style>\n"; $temp .= " <link rel=\"stylesheet\" type=\"text/css\" media=\"print\" href=\"/css/print.css\">\n"; $temp .= " <link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/favicon.ico\">\n"; + foreach ($this->_rssfeeds as $rssurl => $rsstitle) { //for all RSS feeds... + $temp .= " <link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $rsstitle . "\" href=\"" . $rssurl . "\">\n"; + } $temp .= "</head>\n\n"; $temp .= "<body>\n"; $temp .= "<div id=\"head\">\n"; @@ -148,6 +159,17 @@ } /** + * print a RSS feed link + */ + function printRssFeedLink($url, $text = '') { + $temp = "<a href=\"" . $url . "\"><img src=\"/images/rss.png\" alt=\"RSS\" border=\"0\"></a>"; + if ($text != '') { //if WITH text... + $temp .= " <a href=\"" . $url . "\"> " . $text . "</a>"; + } + print($temp); + } + + /** * get the tabs menu from the page */ function getTabs() { Modified: trunk/Web/translations/index.php =================================================================== --- trunk/Web/translations/index.php 2008-01-26 11:23:40 UTC (rev 4961) +++ trunk/Web/translations/index.php 2008-01-27 00:31:15 UTC (rev 4962) @@ -2,6 +2,8 @@ include('../page.inc'); $page = new Page; + //$page->addRssFeed('status_branch_rss.php', 'Translations Status (Branch)'); + $page->addRssFeed('status_trunk_rss.php', 'Translations Status (Trunk)'); $page->printHead('WinMerge: Translations', TAB_TRANSLATIONS); ?> <h2>Translations</h2> @@ -26,8 +28,8 @@ <p>The following two pages inform you about the translations status of the stable and developer version of WinMerge:</p> <ul> <li><a href="http://winmerge.org/Wiki/Translations">Stable Version (Branch)</a></li> - <!--<li><a href="status_branch.php">Stable Version (Branch)</a></li>--> - <li><a href="status_trunk.php">Developer Version (Trunk)</a></li> + <!--<li><a href="status_branch.php">Stable Version (Branch)</a> <?php $page->printRssFeedLink('status_branch_rss.php'); ?></li>--> + <li><a href="status_trunk.php">Developer Version (Trunk)</a> <?php $page->printRssFeedLink('status_trunk_rss.php'); ?></li> </ul> <?php $page->printFoot(); Modified: trunk/Web/translations/status_branch.php =================================================================== --- trunk/Web/translations/status_branch.php 2008-01-26 11:23:40 UTC (rev 4961) +++ trunk/Web/translations/status_branch.php 2008-01-27 00:31:15 UTC (rev 4962) @@ -3,12 +3,15 @@ include('translations.inc'); $page = new Page; + $page->addRssFeed('status_branch_rss.php'); $page->printHead('WinMerge: Translations Status (Branch)', TAB_TRANSLATIONS); $status = $page->convertXml2Array('status_branch.xml'); - print("<h2>Translations Status (Branch)</h2>\n"); + print("<h2>Translations Status (Branch) "); + $page->printRssFeedLink('status_branch_rss.php'); + print("</h2>\n"); if (!empty($status)) { - printTranslationsStatus($status, 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/branch/R2_6/Src/Languages/'); + printTranslationsStatus($status, 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/branch/R2_8/Src/Languages/'); printTranslationsStatusGraphLegend(); print("<h3>Translators</h3>\n"); printTranslationsTranslators($status); Added: trunk/Web/translations/status_branch_rss.php =================================================================== --- trunk/Web/translations/status_branch_rss.php (rev 0) +++ trunk/Web/translations/status_branch_rss.php 2008-01-27 00:31:15 UTC (rev 4962) @@ -0,0 +1,10 @@ +<?php + header('Content-type: application/rss+xml'); + + include('../page.inc'); + include('translations.inc'); + + $page = new Page; + $status = $page->convertXml2Array('status_branch.xml'); + printTranslationsStatusRSS($status, 'Branch', 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/branch/R2_8/Src/Languages/'); +?> \ No newline at end of file Modified: trunk/Web/translations/status_trunk.php =================================================================== --- trunk/Web/translations/status_trunk.php 2008-01-26 11:23:40 UTC (rev 4961) +++ trunk/Web/translations/status_trunk.php 2008-01-27 00:31:15 UTC (rev 4962) @@ -3,10 +3,13 @@ include('translations.inc'); $page = new Page; + $page->addRssFeed('status_trunk_rss.php'); $page->printHead('WinMerge: Translations Status (Trunk)', TAB_TRANSLATIONS); $status = $page->convertXml2Array('status_trunk.xml'); - print("<h2>Translations Status (Trunk)</h2>\n"); + print("<h2>Translations Status (Trunk) "); + $page->printRssFeedLink('status_trunk_rss.php'); + print("</h2>\n"); if (!empty($status)) { printTranslationsStatus($status, 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/trunk/Src/Languages/'); printTranslationsStatusGraphLegend(); Added: trunk/Web/translations/status_trunk_rss.php =================================================================== --- trunk/Web/translations/status_trunk_rss.php (rev 0) +++ trunk/Web/translations/status_trunk_rss.php 2008-01-27 00:31:15 UTC (rev 4962) @@ -0,0 +1,10 @@ +<?php + header('Content-type: application/rss+xml'); + + include('../page.inc'); + include('translations.inc'); + + $page = new Page; + $status = $page->convertXml2Array('status_trunk.xml'); + printTranslationsStatusRSS($status, 'Trunk', 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/trunk/Src/Languages/'); +?> \ No newline at end of file Modified: trunk/Web/translations/translations.inc =================================================================== --- trunk/Web/translations/translations.inc 2008-01-26 11:23:40 UTC (rev 4961) +++ trunk/Web/translations/translations.inc 2008-01-27 00:31:15 UTC (rev 4962) @@ -127,6 +127,53 @@ /** * ... */ + function printTranslationsStatusRSS($xmlarray, $version, $svnurl) { + global $page; + + $update = $xmlarray['TRANSLATIONS'][0]['UPDATE'][0]['VALUE']; + $temp = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"; + $temp .= "<rss version=\"2.0\">\n"; + $temp .= " <channel>\n"; + $temp .= " <title>WinMerge Translations Status (" . $version . ")</title>\n"; + $temp .= " <link>http://winmerge.org/</link>\n"; + $temp .= " <description>...</description>\n"; + $temp .= " <item>\n"; + $temp .= " <title>Status from " . $update . "</title>\n"; + $temp .= " <description>\n"; + $temp .= " <![CDATA[\n"; + + $temp .= "<ul>\n"; + $translations = $xmlarray['TRANSLATIONS'][0]['TRANSLATION']; + $translations = $page->multisortArray($translations, 'LANGUAGE', SORT_ASC); + for ($i = 0; $i < count($translations); $i++) { //For all translations... + $translation = $translations[$i]; + $language_name = $translation['LANGUAGE'][0]['VALUE']; + if ($language_name != 'English') { //If NOT English... + $file_name = $translation['FILE'][0]['VALUE']; + $translation_update = $translation['UPDATE'][0]['VALUE']; + $strings = $translation['STRINGS'][0]; + $strings_untranslated = $strings['UNTRANSLATED'][0]['VALUE']; + + $temp .= " <li>\n"; + $temp .= " <a href=\"" . $svnurl . $file_name . "\">" . $language_name . "</a> (" . $strings_untranslated . " Untranslated)\n"; + $temp .= " </li>\n"; + } + } + $temp .= "</ul>\n"; + + $temp .= " ]]>\n"; + $temp .= " </description>\n"; + $temp .= " <guid>" . $update . "</guid>\n"; + $temp .= " <link>http://" . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "</link>\n"; + $temp .= " </item>\n"; + $temp .= " </channel>\n"; + $temp .= "</rss>\n"; + print($temp); + } + + /** + * ... + */ function printTranslationsTranslators($xmlarray) { global $page; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-01-31 21:32:39
|
Revision: 4984 http://winmerge.svn.sourceforge.net/winmerge/?rev=4984&view=rev Author: gerundt Date: 2008-01-31 13:32:16 -0800 (Thu, 31 Jan 2008) Log Message: ----------- PATCH: [ 1883059 ] Web: Changes for new stable release 2.6.14 Modified Paths: -------------- trunk/Web/2.6/changes.txt trunk/Web/2.6/index.php trunk/Web/WinMergePAD.xml trunk/Web/downloads/index.php trunk/Web/index.php trunk/Web/page.inc trunk/Web/release.inc Modified: trunk/Web/2.6/changes.txt =================================================================== --- trunk/Web/2.6/changes.txt 2008-01-31 21:08:06 UTC (rev 4983) +++ trunk/Web/2.6/changes.txt 2008-01-31 21:32:16 UTC (rev 4984) @@ -1,3 +1,108 @@ +2008-01-17 2.6.14 Stable Release (R4928) + +2008-01-17 Kimmo + Bump ShellExtension version to 1.9.4 and update copyright year to 2008 + ShellExtension: ShellExtension.rc + +2008-01-15 Tim + BUG: [ 1869621 ] xslt support + Submitted by Joel Paula + Filters: XML_html.flt + +2008-01-12 Takashi + BUG: [ 1869821 ] Register.bat doesn't work on W98 and Vista + ShellExtension: Register.bat Unregister.bat + +2008-01-10 Tim + Fix spelling error "succesfully". + Src: Merge.rc MergeDoc.cpp + Src/Languages/Brazilian: MergeBrazilian.rc + Src/Languages/Turkish: MergeTurkish.rc + PATCH: [ 1743504 ] new keywords (cleaned up) + Submitted by Andre Arpin + editlib: batch.cpp + +2008-01-09 Kimmo + Update copyright year for 2008 + Src: Merge.rc + Src/Languages/*: Merge*.rc + PATCH: [ 1864556 ] Update Manual URL for Merge7z + ArchiveSupport/Merge7z: readme.txt + +2008-01-08 Tim + PATCH: [ 1866221 ] PO(T) syntax highlighter + Src: Merge.dsp + editlib: ccrystaltextview.cpp ccrystaltextview.h + editlib new file: po.cpp + +2008-01-05 Takashi + BUG: [ 1864040 ] Crash when using TrackPoint middle-button scrolling + Src/Common: SplitterWndEx.cpp + +2007-12-29 Tim + PATCH: [ 1859657 ] PowerShell syntax highlighter + Src: Merge.dsp + editlib: ccrystaltextview.cpp ccrystaltextview.h + editlib new file: powershell.cpp + +2007-12-10 Tim + BUG: [ 1655577 ] Spanish Translation + Src/Languages/Spanish: MergeSpanish.rc + +2007-12-09 Gal + BUG: [ 1738790 ] Unexpected backspace key handling in rename + Src: DirView.cpp + +2007-12-07 Tim + BUG: [ 1831512 ] Left Date column of CSV Report from "Generate Report.." menu + Src: DirCmpReport.cpp + BUG: [ 1834284 ] "Short Size" columns not rounded in translations + Submitted by Jochen Tucht + Src: locality.cpp + Src/Common: LanguageSelect.cpp + +2007-11-21 Kimmo + BUG: [ 1828930 ] Copy Left To Right with VCS + Src: FileActionScript.cpp + +2007-11-21 Tim + BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3 + Src: MainFrm.cpp + +2007-11-11 Kimmo + PATCH: [ 1811745 ] Do not merge ignored differences (with multi selection) + Src: MergeDoc.cpp + +2007-11-11 Takashi + BUG: [ 1829572 ] Visible area rect on location bar shakes + Src: MergeEditView.cpp + +2007-11-05 Kimmo + BUG: [ 1824734 ] "About..." box still has 2006 copyright. :-( + Src: Merge.rc + Src/Languages/*: Merge*.rc + +2007-11-01 Tim + BUG: [ 1807897 ] Button to small in Dutch version + Src/Languages/Dutch: MergeDutch.rc + +2007-10-24 Kimmo + PATCH: [ 1816220 ] Bugfix: current position in LocationBar "invisible" + Submitted by xurux at sourceforge.net + Src: LocationView.cpp + +2007-10-21 Kimmo + BUG: [ 1815859 ] Still considers Vista as Longhorn + Src: ConfigLog.cpp + +2007-10-11 Kimmo + PATCH: [ 1810171 ] MergeChineseTraditional.rc of 2.6.12 updated + Submitted by Wei-cheng + Src/Languages/ChineseTraditional: MergeChineseTraditional.rc + PATCH: [ 1810539 ] ShellExtensionChineseTraditional.rc for 2.6.12 updated + Submitted by Wei-cheng + ShellExtension/Languages: ShellExtensionChineseTraditional.rc + 2007-09-26 2.6.12 Stable Release (R4567) Fixed uninstalling bug (BUG: [ 1802179 ] Runtime error on uninstalling 2.6.10) Modified: trunk/Web/2.6/index.php =================================================================== --- trunk/Web/2.6/index.php 2008-01-31 21:08:06 UTC (rev 4983) +++ trunk/Web/2.6/index.php 2008-01-31 21:32:16 UTC (rev 4984) @@ -32,8 +32,8 @@ <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> <h2>Installation</h2> -<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe">installer</a> and double-click it.</p> -<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.zip">binary zip package</a> into the desired location, and run +<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-Setup.exe">installer</a> and double-click it.</p> +<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p> Modified: trunk/Web/WinMergePAD.xml =================================================================== --- trunk/Web/WinMergePAD.xml 2008-01-31 21:08:06 UTC (rev 4983) +++ trunk/Web/WinMergePAD.xml 2008-01-31 21:32:16 UTC (rev 4984) @@ -34,10 +34,10 @@ </Company_Info> <Program_Info> <Program_Name>WinMerge</Program_Name> - <Program_Version>2.6.12</Program_Version> - <Program_Release_Month>09</Program_Release_Month> - <Program_Release_Day>26</Program_Release_Day> - <Program_Release_Year>2007</Program_Release_Year> + <Program_Version>2.6.14</Program_Version> + <Program_Release_Month>01</Program_Release_Month> + <Program_Release_Day>17</Program_Release_Day> + <Program_Release_Year>2008</Program_Release_Year> <Program_Cost_Dollars>0</Program_Cost_Dollars> <Program_Cost_Other_Code /> <Program_Cost_Other /> @@ -55,14 +55,14 @@ <Includes_VB_Runtime>N</Includes_VB_Runtime> <Includes_DirectX>N</Includes_DirectX> <File_Info> - <Filename_Versioned>WinMerge-2.6.12-Setup.exe</Filename_Versioned> - <Filename_Previous>WinMerge-2.6.8-Setup.exe</Filename_Previous> + <Filename_Versioned>WinMerge-2.6.14-Setup.exe</Filename_Versioned> + <Filename_Previous>WinMerge-2.6.12-Setup.exe</Filename_Previous> <Filename_Generic>WinMergeSetup.exe</Filename_Generic> <Filename_Long>WinMergeSetup.exe</Filename_Long> - <File_Size_Bytes>3025610</File_Size_Bytes> - <File_Size_K>2955</File_Size_K> - <File_Size_MB>2.89</File_Size_MB> + <File_Size_Bytes>3036206</File_Size_Bytes> + <File_Size_K>2965</File_Size_K> + <File_Size_MB>2.90</File_Size_MB> </File_Info> <Expire_Info> <Has_Expire_Info>N</Has_Expire_Info> @@ -93,7 +93,7 @@ <Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL> </Application_URLs> <Download_URLs> - <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe</Primary_Download_URL> + <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-Setup.exe</Primary_Download_URL> <Secondary_Download_URL /> <Additional_Download_URL_1 /> <Additional_Download_URL_2 /> Modified: trunk/Web/downloads/index.php =================================================================== --- trunk/Web/downloads/index.php 2008-01-31 21:08:06 UTC (rev 4983) +++ trunk/Web/downloads/index.php 2008-01-31 21:32:16 UTC (rev 4984) @@ -15,30 +15,30 @@ </ul> <h3><a name="current">Current Version</a></h3> <?php $page->printDownloadNow(); ?> -<p>The current version is <strong>2.6.12</strong> and was released at <strong>2007-09-26</strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=542344">release notes</a>.</p> +<p>The current version is <strong><?php echo $stablerelease->getVersionNumber();?></strong> and was released at <strong><?php echo $stablerelease->getDate();?></strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=569358">release notes</a>.</p> <div class="downloadmatrix"> <ul> <li><strong>Installer</strong> <ul> - <li><a href="<?php echo $stablerelease->getSetupDownload();?>">Exe-Format (<?php echo $stablerelease->getSetupSizeFormatted('mb');?> MB)</a></li> + <li><a href="<?php echo $stablerelease->getDownload('setup.exe');?>">Exe-Format (<?php echo $stablerelease->getDownloadSizeMb('setup.exe');?> MB)</a></li> </ul> </li> <li><strong>Binaries</strong> <ul> - <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.zip">Zip-Format (5.18 MB)</a></li> - <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.7z">7z-Format (1.68 MB)</a></li> + <li><a href="<?php echo $stablerelease->getDownload('exe.zip');?>">Zip-Format (<?php echo $stablerelease->getDownloadSizeMb('exe.zip');?> MB)</a></li> + <li><a href="<?php echo $stablerelease->getDownload('exe.7z');?>">7z-Format (<?php echo $stablerelease->getDownloadSizeMb('exe.7z');?> MB)</a></li> </ul> </li> <li><strong>Runtimes</strong> <ul> - <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.12.zip">Zip-Format (1.23 MB)</a></li> - <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.12.7z">7z-Format (0.72 MB)</a></li> + <li><a href="<?php echo $stablerelease->getDownload('rt.zip');?>">Zip-Format (<?php echo $stablerelease->getDownloadSizeMb('rt.zip');?> MB)</a></li> + <li><a href="<?php echo $stablerelease->getDownload('rt.7z');?>">7z-Format (<?php echo $stablerelease->getDownloadSizeMb('rt.7z');?> MB)</a></li> </ul> </li> <li><strong>Source Code</strong> <ul> - <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-src.zip">Zip-Format (5.06 MB)</a></li> - <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-src.7z">7z-Format (2.79 MB)</a></li> + <li><a href="<?php echo $stablerelease->getDownload('src.zip');?>">Zip-Format (<?php echo $stablerelease->getDownloadSizeMb('src.zip');?> MB)</a></li> + <li><a href="<?php echo $stablerelease->getDownload('src.7z');?>">7z-Format (<?php echo $stablerelease->getDownloadSizeMb('src.7z');?> MB)</a></li> </ul> </li> </ul> Modified: trunk/Web/index.php =================================================================== --- trunk/Web/index.php 2008-01-31 21:08:06 UTC (rev 4983) +++ trunk/Web/index.php 2008-01-31 21:32:16 UTC (rev 4984) @@ -3,6 +3,7 @@ $page = new Page; $page->printHead('WinMerge', TAB_HOME); + $stablerelease = $page->getStableRelease(); ?> <p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> @@ -31,13 +32,13 @@ <a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p> <p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p> -<h2>WinMerge 2.6.12 - latest stable version</h2> -<p><a href="2.6/index.php">WinMerge 2.6.12</a> is the latest stable version, and is recommended for most users.</p> -<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe">Download WinMerge 2.6.12 Installer</a></p> +<h2>WinMerge <?php echo $stablerelease->getVersionNumber();?> - latest stable version</h2> +<p><a href="2.6/index.php">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p> +<p><a href="<?php echo $stablerelease->getDownload('setup.exe');?>">Download WinMerge <?php echo $stablerelease->getVersionNumber();?> Installer</a></p> <h2>Installation</h2> -<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe">installer</a> and double-click it.</p> -<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.zip">binary zip package</a> into the desired location, and run +<p>Just download the <a href="<?php echo $stablerelease->getDownload('setup.exe');?>">installer</a> and double-click it.</p> +<p>Or you may simply unzip the <a href="<?php echo $stablerelease->getDownload('exe.zip');?>">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p> Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-01-31 21:08:06 UTC (rev 4983) +++ trunk/Web/page.inc 2008-01-31 21:32:16 UTC (rev 4984) @@ -42,9 +42,15 @@ $this->_tab = WINMERGE_2_6; /* _Stable Release */ $this->_stablerelease = new Release; - $this->_stablerelease->setVersionNumber('2.6.12'); - $this->_stablerelease->setSetupDownload('http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe'); - $this->_stablerelease->setSetupSize(3025610); + $this->_stablerelease->setVersionNumber('2.6.14'); + $this->_stablerelease->setDate('2008-01-17'); + $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-Setup.exe', 3036206); + $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-exe.zip', 5439408); + $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-exe.7z', 1768345); + $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.6.14.zip', 1287952); + $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.6.14.7z', 753483); + $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-src.zip', 5318782); + $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-src.7z', 2929765); } /** @@ -151,9 +157,9 @@ * print the "Download Now!" link */ function printDownloadNow() { - $temp = "<p><a class=\"downloadnow\" href=\"" . $this->_stablerelease->getSetupDownload() . "\">"; + $temp = "<p><a class=\"downloadnow\" href=\"" . $this->_stablerelease->getDownload('setup.exe') . "\">"; $temp .= "<strong>Download Now!</strong> "; - $temp .= "<em>Version " . $this->_stablerelease->getVersionNumber() . "; " . $this->_stablerelease->getSetupSizeFormatted('mb') . " MB</em>"; + $temp .= "<em>Version " . $this->_stablerelease->getVersionNumber() . "; " . $this->_stablerelease->getDownloadSizeMb('setup.exe') . " MB</em>"; $temp .= "</a></p>\n"; print($temp); } Modified: trunk/Web/release.inc =================================================================== --- trunk/Web/release.inc 2008-01-31 21:08:06 UTC (rev 4983) +++ trunk/Web/release.inc 2008-01-31 21:32:16 UTC (rev 4984) @@ -14,13 +14,17 @@ */ class Release { var $_versionnumber; - var $_setupdownload, $_setupsize; + var $_date; + var $_downloads, $_downloadsizes; /** * Constructor */ function Release() { $this->_versionnumber = ''; + $this->_date = ''; + $this->_downloads = array(); + $this->_downloadsizes = array(); } /** @@ -38,41 +42,63 @@ } /** - * set the setup download from the release + * set the date from the release */ - function setSetupDownload($setupdownload) { - $this->_setupdownload = $setupdownload; + function setDate($date) { + $this->_date = $date; } /** - * get the setup download from the release + * get the date from the release */ - function getSetupDownload() { - return $this->_setupdownload; + function getDate() { + return $this->_date; } /** - * set the setup size (in bytes) from the release + * add a download from the release */ - function setSetupSize($setupsize) { - $this->_setupsize = $setupsize; + function addDownload($id, $url, $size) { + $this->_downloads[$id] = $url; + $this->_downloadsizes[$id] = $size; } /** - * get the setup size (in bytes) from the release + * get a download from the release */ - function getSetupSize() { - return $this->_setupsize; + function getDownload($id) { + return $this->_downloads[$id]; } /** - * get the formatted setup size from the release + * get a download size (in bytes) from the release */ - function getSetupSizeFormatted($unit = '') { - return $this->formatSize($this->_setupsize, $unit); + function getDownloadSize($id) { + return $this->_downloadsizes[$id]; } /** + * get a download size (in kilobytes) from the release + */ + function getDownloadSizeKb($id) { + return $this->formatSize($this->_downloadsizes[$id], 'kb'); + } + + /** + * get a download size (in megabytes) from the release + */ + function getDownloadSizeMb($id) { + return $this->formatSize($this->_downloadsizes[$id], 'mb'); + } + + /** + * get a formatted download size from the release + */ + function getDownloadSizeFormatted($id, $unit = '') { + return $this->formatSize($this->_downloadsizes[$id], $unit); + } + + /** * format the size */ function formatSize($bytes, $unit = '') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-02-26 19:51:00
|
Revision: 5086 http://winmerge.svn.sourceforge.net/winmerge/?rev=5086&view=rev Author: gerundt Date: 2008-02-26 11:50:32 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Web: Add link to WinMerge Portable Modified Paths: -------------- trunk/Web/downloads/index.php trunk/Web/links.php Modified: trunk/Web/downloads/index.php =================================================================== --- trunk/Web/downloads/index.php 2008-02-26 15:18:15 UTC (rev 5085) +++ trunk/Web/downloads/index.php 2008-02-26 19:50:32 UTC (rev 5086) @@ -49,6 +49,7 @@ <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248">Stable Versions</a></li> <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158">Beta Versions</a></li> <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246">Experimental Builds</a></li> + <li><a href="http://portableapps.com/apps/utilities/winmerge_portable">WinMerge Portable</a> (by PortableApps.com)</li> </ul> <h3><a name="plugins">Plugins</a></h3> <h4>7-Zip Plugin</h4> Modified: trunk/Web/links.php =================================================================== --- trunk/Web/links.php 2008-02-26 15:18:15 UTC (rev 5085) +++ trunk/Web/links.php 2008-02-26 19:50:32 UTC (rev 5086) @@ -38,6 +38,8 @@ <dd>Reviews of popular comparison software. [<a href="http://www.diffutils.com/project-revision-control/winmerge.html">WinMerge Review</a>]</dd> <dt><a href="http://www.betanews.com/">BetaNews.com</a></dt> <dd>Inside informations, unreleased products and articles on various soon-to-be-released software titles.</dd> + <dt><a href="http://portableapps.com/apps/utilities/winmerge_portable">WinMerge Portable</a></dt> + <dd>This is WinMerge packaged with a PortableApps.com Launcher as a <a href="http://portableapps.com/about/what_is_a_portable_app">portable app</a>, so you can compare files on the go.</dd> </dl> <?php $page->printFoot(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-02-26 22:56:49
|
Revision: 5088 http://winmerge.svn.sourceforge.net/winmerge/?rev=5088&view=rev Author: gerundt Date: 2008-02-26 14:55:51 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Web: Add a first version from a WinMerge history list Modified Paths: -------------- trunk/Web/page.inc trunk/Web/sitemap.txt Added Paths: ----------- trunk/Web/history.php Added: trunk/Web/history.php =================================================================== --- trunk/Web/history.php (rev 0) +++ trunk/Web/history.php 2008-02-26 22:55:51 UTC (rev 5088) @@ -0,0 +1,43 @@ +<?php + include('page.inc'); + + $page = new Page; + $page->printHead('WinMerge: History', TAB_HOME); +?> +<h2>History</h2> +<h3>WinMerge 2.6</h3> +<ul> + <li>WinMerge 2.6.14 (2008-01-17)</li> + <li>WinMerge 2.6.12 (2007-09-26)</li> + <li>WinMerge 2.6.8 (2007-06-19)</li> + <li>WinMerge 2.6.6 (2007-03-29)</li> + <li>WinMerge 2.6.4 (2007-01-17)</li> + <li>WinMerge 2.6.2 (2006-12-14)</li> + <li>WinMerge 2.6.0 (2006-10-12)</li> +</ul> +<h3>WinMerge 2.4</h3> +<ul> + <li>WinMerge 2.4.10 (2006-08-10)</li> + <li>WinMerge 2.4.8 (2006-06-13)</li> + <li>WinMerge 2.4.6 (2006-02-28)</li> + <li>WinMerge 2.4.4 (2005-12-15)</li> + <li>WinMerge 2.4.2 (2005-11-10)</li> + <li>WinMerge 2.4.0 (2005-09-29)</li> +</ul> +<h3>WinMerge 2.2</h3> +<ul> + <li>WinMerge 2.2.4 (2005-05-31)</li> + <li>WinMerge 2.2.2 (2005-03-23)</li> + <li>WinMerge 2.2.0 (2004-11-10)</li> +</ul> +<h3>WinMerge 2.0</h3> +<ul> + <li>WinMerge 2.0.2 (2003-12-10)</li> +</ul> +<h3>WinMerge 1.7</h3> +<ul> + <li>WinMerge 1.7.1 (2000-11-03)</li> +</ul> +<?php + $page->printFoot(); +?> \ No newline at end of file Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-02-26 20:15:49 UTC (rev 5087) +++ trunk/Web/page.inc 2008-02-26 22:55:51 UTC (rev 5088) @@ -230,6 +230,7 @@ case TAB_HOME: //if "Home" ... $temp .= "<ul id=\"subtabs\">\n"; $temp .= " <li><a href=\"http://sourceforge.net/projects/winmerge\">Project Page</a></li>\n"; + $temp .= " <li><a href=\"/history.php\">History</a></li>\n"; $temp .= " <li><a href=\"/links.php\">Links</a></li>\n"; $temp .= " <li><a href=\"/WinMergePAD.php\">PAD file</a></li>\n"; $temp .= "</ul>\n"; Modified: trunk/Web/sitemap.txt =================================================================== --- trunk/Web/sitemap.txt 2008-02-26 20:15:49 UTC (rev 5087) +++ trunk/Web/sitemap.txt 2008-02-26 22:55:51 UTC (rev 5088) @@ -1,4 +1,5 @@ http://winmerge.org/index.php +http://winmerge.org/history.php http://winmerge.org/links.php http://winmerge.org/WinMergePAD.php http://winmerge.org/2.4/changes.php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-02-27 22:47:52
|
Revision: 5094 http://winmerge.svn.sourceforge.net/winmerge/?rev=5094&view=rev Author: gerundt Date: 2008-02-27 14:47:48 -0800 (Wed, 27 Feb 2008) Log Message: ----------- Web: Use CSS background for head images (better search engine support) Modified Paths: -------------- trunk/Web/css/screen.css trunk/Web/page.inc Added Paths: ----------- trunk/Web/images/head.gif Modified: trunk/Web/css/screen.css =================================================================== --- trunk/Web/css/screen.css 2008-02-27 22:16:25 UTC (rev 5093) +++ trunk/Web/css/screen.css 2008-02-27 22:47:48 UTC (rev 5094) @@ -24,6 +24,10 @@ float: left; margin: 0; padding: 0; + width: 266px; + height: 50px; + background: url(/images/head.gif) no-repeat; + text-indent: -999em; } #rightcorner { Added: trunk/Web/images/head.gif =================================================================== (Binary files differ) Property changes on: trunk/Web/images/head.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-02-27 22:16:25 UTC (rev 5093) +++ trunk/Web/page.inc 2008-02-27 22:47:48 UTC (rev 5094) @@ -122,7 +122,7 @@ $temp .= "</head>\n\n"; $temp .= "<body>\n"; $temp .= "<div id=\"head\">\n"; - $temp .= "<h1><a href=\"/index.php\"><img src=\"/images/icon.gif\" height=\"48\" width=\"48\" align=\"top\" alt=\"WinMerge logo\" border=\"0\"></a><img src=\"/images/logo.gif\" height=\"50\" width=\"218\" align=\"top\" alt=\"WinMerge\" border=\"0\"></h1>\n"; + $temp .= "<h1>WinMerge</h1>\n"; $temp .= "<p id=\"rightcorner\">\n"; $temp .= " <a href=\"http://sourceforge.net/\"><img src=\"http://sourceforge.net/sflogo.php?group_id=13216\" width=\"88\" height=\"31\" border=\"0\" alt=\"SourceForge\" title=\"SourceForge.net\"></a>\n"; $temp .= " <a href=\"/WinMergePAD.php\"><img src=\"/images/padbutton.gif\" width=\"80\" height=\"31\" border=\"0\" alt=\"PAD Enabled\" title=\"PAD Enabled\"></a>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-03-04 22:32:21
|
Revision: 5132 http://winmerge.svn.sourceforge.net/winmerge/?rev=5132&view=rev Author: gerundt Date: 2008-03-04 14:32:13 -0800 (Tue, 04 Mar 2008) Log Message: ----------- Web: Add Translations Status for Branch (WinMerge 2.8) Modified Paths: -------------- trunk/Web/page.inc trunk/Web/translations/index.php Added Paths: ----------- trunk/Web/translations/status_branch.xml Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-03-04 22:12:50 UTC (rev 5131) +++ trunk/Web/page.inc 2008-03-04 22:32:13 UTC (rev 5132) @@ -287,8 +287,7 @@ case TAB_TRANSLATIONS: //if "Translations" ... $temp .= "<ul id=\"subtabs\">\n"; $temp .= " <li><a href=\"/translations/index.php\" title=\"Index\">Index</a></li>\n"; - $temp .= " <li><a href=\"http://winmerge.org/Wiki/Translations\" title=\"Translations Status (Branch)\">Status (Branch)</a></li>\n"; - //$temp .= " <li><a href=\"/translations/status_branch.php\" title=\"Translations Status (Branch)\">Status (Branch)</a></li>\n"; + $temp .= " <li><a href=\"/translations/status_branch.php\" title=\"Translations Status (Branch)\">Status (Branch)</a></li>\n"; $temp .= " <li><a href=\"/translations/status_trunk.php\" title=\"Translations Status (Trunk)\">Status (Trunk)</a></li>\n"; $temp .= "</ul>\n"; break; Modified: trunk/Web/translations/index.php =================================================================== --- trunk/Web/translations/index.php 2008-03-04 22:12:50 UTC (rev 5131) +++ trunk/Web/translations/index.php 2008-03-04 22:32:13 UTC (rev 5132) @@ -2,7 +2,7 @@ include('../page.inc'); $page = new Page; - //$page->addRssFeed('status_branch_rss.php', 'Translations Status (Branch)'); + $page->addRssFeed('status_branch_rss.php', 'Translations Status (Branch)'); $page->addRssFeed('status_trunk_rss.php', 'Translations Status (Trunk)'); $page->printHead('WinMerge: Translations', TAB_TRANSLATIONS); ?> @@ -27,8 +27,7 @@ <h3>Status</h3> <p>The following two pages inform you about the translations status of the stable and developer version of WinMerge:</p> <ul> - <li><a href="http://winmerge.org/Wiki/Translations">Stable Version (Branch)</a></li> - <!--<li><a href="status_branch.php">Stable Version (Branch)</a> <?php $page->printRssFeedLink('status_branch_rss.php'); ?></li>--> + <li><a href="status_branch.php">Stable Version (Branch)</a> <?php $page->printRssFeedLink('status_branch_rss.php'); ?></li> <li><a href="status_trunk.php">Developer Version (Trunk)</a> <?php $page->printRssFeedLink('status_trunk_rss.php'); ?></li> </ul> <?php Added: trunk/Web/translations/status_branch.xml =================================================================== --- trunk/Web/translations/status_branch.xml (rev 0) +++ trunk/Web/translations/status_branch.xml 2008-03-04 22:32:13 UTC (rev 5132) @@ -0,0 +1,467 @@ +<translations> + <update>2008-03-04</update> + <translation> + <language>Brazilian</language> + <file>Brazilian.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>200</translated> + <fuzzy>2</fuzzy> + <untranslated>839</untranslated> + </strings> + <translators> + <translator> + <name>Wender Firmino</name> + <mail>wender at pta.com.br</mail> + </translator> + </translators> + </translation> + <translation> + <language>Bulgarian</language> + <file>Bulgarian.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>817</translated> + <fuzzy>2</fuzzy> + <untranslated>222</untranslated> + </strings> + <translators> + <translator> + <name>sld</name> + <mail>sld at mail.bg</mail> + </translator> + <translator> + <name>tigertron</name> + <mail>tigertron at dir.bg</mail> + </translator> + </translators> + </translation> + <translation> + <language>Catalan</language> + <file>Catalan.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>900</translated> + <fuzzy>2</fuzzy> + <untranslated>139</untranslated> + </strings> + <translators> + <translator> + <name>Jordi Vilar</name> + <mail>jvilar at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>ChineseSimplified</language> + <file>ChineseSimplified.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>866</translated> + <fuzzy>2</fuzzy> + <untranslated>173</untranslated> + </strings> + <translators> + <translator> + <name>Liaobin</name> + <mail>liaobin at jite. net</mail> + </translator> + <translator> + <name>xmpdhml</name> + <mail>xmpdhml at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>ChineseTraditional</language> + <file>ChineseTraditional.po</file> + <update>2008-03-01</update> + <strings> + <count>1041</count> + <translated>1040</translated> + <fuzzy>0</fuzzy> + <untranslated>1</untranslated> + </strings> + <translators> + <translator> + <name>Koko</name> + <mail>kokokoko at giga.net.tw</mail> + </translator> + <translator> + <name>wck3</name> + <mail>wck3171 at pchome.com.tw</mail> + </translator> + </translators> + </translation> + <translation> + <language>Croatian</language> + <file>Croatian.po</file> + <update>2008-01-23</update> + <strings> + <count>1041</count> + <translated>1006</translated> + <fuzzy>1</fuzzy> + <untranslated>34</untranslated> + </strings> + <translators> + <translator> + <name>Hasan Osmanag\xE6</name> + <mail>hasan.osmanagic at public.carnet.hr</mail> + </translator> + </translators> + </translation> + <translation> + <language>Czech</language> + <file>Czech.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>860</translated> + <fuzzy>2</fuzzy> + <untranslated>179</untranslated> + </strings> + <translators> + <translator> + <name>Jiri Tax</name> + <mail>jt at taxoft.cz</mail> + </translator> + <translator> + <name>Jan Hryz</name> + <mail>janhryz at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Danish</language> + <file>Danish.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>519</translated> + <fuzzy>2</fuzzy> + <untranslated>520</untranslated> + </strings> + <translators> + <translator> + <name>Christian List</name> + <mail>list1974 at hotmail.com</mail> + </translator> + </translators> + </translation> + <translation> + <language>Dutch</language> + <file>Dutch.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>526</translated> + <fuzzy>0</fuzzy> + <untranslated>515</untranslated> + </strings> + <translators> + <translator> + <name>Ronald Schaap</name> + <mail>ronald at schaap.demon.nl</mail> + </translator> + <translator> + <name>Michel Coene</name> + </translator> + </translators> + </translation> + <translation> + <language>French</language> + <file>French.po</file> + <update>2007-09-21</update> + <strings> + <count>1041</count> + <translated>977</translated> + <fuzzy>0</fuzzy> + <untranslated>64</untranslated> + </strings> + <translators> + <translator> + <name>Gil Andre</name> + <mail>gil_andre at compuserve.com</mail> + </translator> + <translator> + <name>Laurent Ganier</name> + <mail>ccganier at club-internet.fr</mail> + </translator> + <translator> + <name>Jean-F Jolin</name> + <mail>jean-f-j at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>German</language> + <file>German.po</file> + <update>2008-02-13</update> + <strings> + <count>1041</count> + <translated>923</translated> + <fuzzy>0</fuzzy> + <untranslated>118</untranslated> + </strings> + <translators> + <translator> + <name>Winfried Peter</name> + <mail>winfried.peter at omicron.at</mail> + </translator> + <translator> + <name>J\xF6rg Schneider</name> + <mail>tonda at users.sourceforge.net</mail> + </translator> + <translator> + <name>Tim Gerundt</name> + <mail>tim at gerundt.de</mail> + </translator> + </translators> + </translation> + <translation> + <language>Hungarian</language> + <file>Hungarian.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>655</translated> + <fuzzy>2</fuzzy> + <untranslated>384</untranslated> + </strings> + <translators> + <translator> + <name>M\xE1rton Bal\xE1zs</name> + <mail>documan at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Italian</language> + <file>Italian.po</file> + <update>2007-09-30</update> + <strings> + <count>1041</count> + <translated>974</translated> + <fuzzy>0</fuzzy> + <untranslated>67</untranslated> + </strings> + <translators> + <translator> + <name>Michele Merega</name> + <mail>michele.merega at ifminfomaster.com</mail> + </translator> + <translator> + <name>Andrea Decorte</name> + <mail>deco1985 at hotmail.com</mail> + </translator> + </translators> + </translation> + <translation> + <language>Japanese</language> + <file>Japanese.po</file> + <update>2008-02-23</update> + <strings> + <count>1041</count> + <translated>1023</translated> + <fuzzy>0</fuzzy> + <untranslated>18</untranslated> + </strings> + <translators> + <translator> + <name>Takashi Sawanaka</name> + <mail>sawanaka at d1.dion.ne.jp</mail> + </translator> + </translators> + </translation> + <translation> + <language>Korean</language> + <file>Korean.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>740</translated> + <fuzzy>2</fuzzy> + <untranslated>299</untranslated> + </strings> + <translators> + <translator> + <name>Hwang Sukjoon</name> + <mail>bbcool at gmail.com</mail> + </translator> + <translator> + <name>Lee Jae-Hong</name> + <mail>pyrasis at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Norwegian</language> + <file>Norwegian.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>552</translated> + <fuzzy>2</fuzzy> + <untranslated>487</untranslated> + </strings> + <translators> + <translator> + <name>Hans Fredrik Nordhaug</name> + <mail>hansfn at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Polish</language> + <file>Polish.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>865</translated> + <fuzzy>2</fuzzy> + <untranslated>174</untranslated> + </strings> + <translators> + <translator> + <name>Pawel Wawrzysko</name> + <mail>traduc at kki.pl</mail> + </translator> + </translators> + </translation> + <translation> + <language>Portuguese</language> + <file>Portuguese.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>848</translated> + <fuzzy>0</fuzzy> + <untranslated>193</untranslated> + </strings> + <translators> + <translator> + <name>Nelson Sim\xE3o</name> + </translator> + </translators> + </translation> + <translation> + <language>Russian</language> + <file>Russian.po</file> + <update>2007-09-23</update> + <strings> + <count>1041</count> + <translated>972</translated> + <fuzzy>5</fuzzy> + <untranslated>64</untranslated> + </strings> + <translators> + <translator> + <name>Dmitriy S. Aleshkowskiy</name> + <mail>wwarlock at mail.ru</mail> + </translator> + <translator> + <name>geek2k</name> + <mail>geek2k at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Slovak</language> + <file>Slovak.po</file> + <update>2008-02-17</update> + <strings> + <count>1041</count> + <translated>1003</translated> + <fuzzy>0</fuzzy> + <untranslated>38</untranslated> + </strings> + <translators> + <translator> + <name>majvan</name> + <mail>vancojur at decef.elf.stuba.sk</mail> + </translator> + <translator> + <name>Ivan Mas\xE1r</name> + <mail>helix84 at centrum.sk</mail> + </translator> + </translators> + </translation> + <translation> + <language>Spanish</language> + <file>Spanish.po</file> + <update>2008-01-08</update> + <strings> + <count>1041</count> + <translated>983</translated> + <fuzzy>0</fuzzy> + <untranslated>58</untranslated> + </strings> + <translators> + <translator> + <name>Dean Grimm</name> + <mail>grimmdp at yahoo.com</mail> + </translator> + <translator> + <name>Jes\xFAs M. Delgado 'MacK'</name> + <mail>nncsoft at yahoo.com</mail> + </translator> + <translator> + <name>Mario Angel</name> + <mail>marioangel70 at gmail.com</mail> + </translator> + </translators> + </translation> + <translation> + <language>Swedish</language> + <file>Swedish.po</file> + <update>2008-02-22</update> + <strings> + <count>1041</count> + <translated>1040</translated> + <fuzzy>0</fuzzy> + <untranslated>1</untranslated> + </strings> + <translators> + <translator> + <name>G\xF6ran H\xE5kansson</name> + <mail>goran.x.hakansson at telia.com</mail> + </translator> + <translator> + <name>Hans Eriksson</name> + <mail>hans.ericson at bredband.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>Turkish</language> + <file>Turkish.po</file> + <update></update> + <strings> + <count>1041</count> + <translated>69</translated> + <fuzzy>0</fuzzy> + <untranslated>972</untranslated> + </strings> + <translators> + <translator> + <name>Ozkan UNVER</name> + <mail>turquaz37915 at users.sourceforge.net</mail> + </translator> + </translators> + </translation> + <translation> + <language>English</language> + <file>English.pot</file> + <update>2008-03-04</update> + <strings> + <count>1041</count> + <translated>1041</translated> + <fuzzy>0</fuzzy> + <untranslated>0</untranslated> + </strings> + </translation> +</translations> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-03-18 21:46:24
|
Revision: 5163 http://winmerge.svn.sourceforge.net/winmerge/?rev=5163&view=rev Author: gerundt Date: 2008-03-18 14:46:14 -0700 (Tue, 18 Mar 2008) Log Message: ----------- PATCH: [ 1917461 ] Web: Include translations instruction into page Modified Paths: -------------- trunk/Web/page.inc trunk/Web/sitemap.txt trunk/Web/translations/index.php Added Paths: ----------- trunk/Web/translations/instructions.php Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-03-18 15:26:32 UTC (rev 5162) +++ trunk/Web/page.inc 2008-03-18 21:46:14 UTC (rev 5163) @@ -287,6 +287,7 @@ case TAB_TRANSLATIONS: //if "Translations" ... $temp .= "<ul id=\"subtabs\">\n"; $temp .= " <li><a href=\"/translations/index.php\" title=\"Index\">Index</a></li>\n"; + $temp .= " <li><a href=\"/translations/instructions.php\" title=\"Translations instructions\">Instructions</a></li>\n"; $temp .= " <li><a href=\"/translations/status_branch.php\" title=\"Translations Status (Branch)\">Status (Branch)</a></li>\n"; $temp .= " <li><a href=\"/translations/status_trunk.php\" title=\"Translations Status (Trunk)\">Status (Trunk)</a></li>\n"; $temp .= "</ul>\n"; @@ -445,6 +446,38 @@ } /** + * get the content (between <body> and </body>) from a HTML file + */ + function getContentFromHtmlFile($filename, $patterns = '', $replacements = '') { + $html = ""; + if (file_exists($filename) == true) { //if the file exists... + $lines = file($filename); + $linescount = sizeof($lines); + + $insidebody = false; + for ($i = 0; $i < $linescount; $i++) { //for all lines... + $line = $lines[$i]; + + if ($insidebody == false) { //if OUTSIDE <body>... + if (preg_match('#\<body#si', $line)) { + $insidebody = true; + } + } + else { //if INSIDE <body>... + if (preg_match('#\</body>#si', $line)) { + break; + } + if (($patterns != '') && ($replacements != '')) { //if text should be replaced... + $line = preg_replace($patterns, $replacements, $line); + } + $html .= $line; + } + } + } + return $html; + } + + /** * convert a changelog file into html code */ function convertChanges2Html($filename) { Modified: trunk/Web/sitemap.txt =================================================================== --- trunk/Web/sitemap.txt 2008-03-18 15:26:32 UTC (rev 5162) +++ trunk/Web/sitemap.txt 2008-03-18 21:46:14 UTC (rev 5163) @@ -61,5 +61,6 @@ http://winmerge.org/support/mailing-lists.php http://winmerge.org/support/tracker-shortcuts.php http://winmerge.org/translations/index.php +http://winmerge.org/translations/instructions.php http://winmerge.org/translations/status_branch.php http://winmerge.org/translations/status_trunk.php Modified: trunk/Web/translations/index.php =================================================================== --- trunk/Web/translations/index.php 2008-03-18 15:26:32 UTC (rev 5162) +++ trunk/Web/translations/index.php 2008-03-18 21:46:14 UTC (rev 5163) @@ -23,7 +23,7 @@ ?> <p>To change languages, select the desired language from the <em>View->Languages</em> menu choice.</p> <h3>Translating</h3> -<p>If you would like to update any of these translations or add another translation, then please follow <a href="http://winmerge.svn.sourceforge.net/viewvc/*checkout*/winmerge/trunk/Docs/Developers/Translations.html">these instructions</a>.</p> +<p>If you would like to update any of these translations or add another translation, then please follow <a href="instructions.php">these instructions</a>.</p> <h3>Status</h3> <p>The following two pages inform you about the translations status of the stable and developer version of WinMerge:</p> <ul> Added: trunk/Web/translations/instructions.php =================================================================== --- trunk/Web/translations/instructions.php (rev 0) +++ trunk/Web/translations/instructions.php 2008-03-18 21:46:14 UTC (rev 5163) @@ -0,0 +1,18 @@ +<?php + include('../page.inc'); + + $page = new Page; + $page->printHead('WinMerge: Translations instructions', TAB_TRANSLATIONS); + $instructions = $page->getContentFromHtmlFile('Translations.html', '#/winmerge/trunk/#si', '/winmerge/branches/R2_8/'); + if ($instructions == '') { + print("<h2>Translations instructions</h2>\n"); + print("<p>The translations instructions are currently not available...</p>\n"); + } + else + print($instructions); +?> +<hr> +<p><em>Source: <a href="http://winmerge.svn.sourceforge.net/viewvc/*checkout*/winmerge/branches/R2_8/Docs/Developers/Translations.html">WinMerge\Docs\Developers\Translations.html</a></em></p> +<?php + $page->printFoot(); +?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-03-19 20:35:41
|
Revision: 5170 http://winmerge.svn.sourceforge.net/winmerge/?rev=5170&view=rev Author: gerundt Date: 2008-03-19 13:35:13 -0700 (Wed, 19 Mar 2008) Log Message: ----------- Web: Init tab for "WinMerge 2.8" without content and hidden for users Modified Paths: -------------- trunk/Web/page.inc trunk/Web/sitemap.txt Added Paths: ----------- trunk/Web/2.8/ trunk/Web/2.8/changelog.php trunk/Web/2.8/index.php trunk/Web/2.8/releasenotes.php trunk/Web/2.8/screenshots.php Added: trunk/Web/2.8/changelog.php =================================================================== --- trunk/Web/2.8/changelog.php (rev 0) +++ trunk/Web/2.8/changelog.php 2008-03-19 20:35:13 UTC (rev 5170) @@ -0,0 +1,13 @@ +<?php + include('../page.inc'); + + $page = new Page; + $page->printHead('WinMerge 2.8: Change Log', WINMERGE_2_8); + print("<h2>Change Log</h2>\n"); + $changelog = $page->convertChangeLog2Html('ChangeLog.txt'); + if ($changelog == '') + print("<p>The change log is currently not available...</p>\n"); + else + print($changelog); + $page->printFoot(); +?> \ No newline at end of file Added: trunk/Web/2.8/index.php =================================================================== --- trunk/Web/2.8/index.php (rev 0) +++ trunk/Web/2.8/index.php 2008-03-19 20:35:13 UTC (rev 5170) @@ -0,0 +1,11 @@ +<?php + include('../page.inc'); + + $page = new Page; + $page->printHead('WinMerge 2.8', WINMERGE_2_8); +?> +<h2>WinMerge 2.8</h2> +<p>Coming soon...</p> +<?php + $page->printFoot(); +?> \ No newline at end of file Added: trunk/Web/2.8/releasenotes.php =================================================================== --- trunk/Web/2.8/releasenotes.php (rev 0) +++ trunk/Web/2.8/releasenotes.php 2008-03-19 20:35:13 UTC (rev 5170) @@ -0,0 +1,14 @@ +<?php + include('../page.inc'); + + $page = new Page; + $page->printHead('WinMerge 2.8: Release Notes', WINMERGE_2_8); + $releasenotes = $page->getContentFromHtmlFile('ReleaseNotes.html', '#href="ChangeLog.txt"#si', 'href="changelog.php"'); + if ($releasenotes == '') { + print("<h2>Release Notes</h2>\n"); + print("<p>The release notes are currently not available...</p>\n"); + } + else + print($releasenotes); + $page->printFoot(); +?> \ No newline at end of file Added: trunk/Web/2.8/screenshots.php =================================================================== --- trunk/Web/2.8/screenshots.php (rev 0) +++ trunk/Web/2.8/screenshots.php 2008-03-19 20:35:13 UTC (rev 5170) @@ -0,0 +1,11 @@ +<?php + include('../page.inc'); + + $page = new Page; + $page->printHead('WinMerge 2.8: Screenshots', WINMERGE_2_8); +?> +<h2>Screenshots</h2> +<p>Coming soon...</p> +<?php + $page->printFoot(); +?> \ No newline at end of file Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-03-19 15:49:51 UTC (rev 5169) +++ trunk/Web/page.inc 2008-03-19 20:35:13 UTC (rev 5170) @@ -15,6 +15,7 @@ define ('WINMERGE_2_2', '2.2'); define ('WINMERGE_2_4', '2.4'); define ('WINMERGE_2_6', '2.6'); + define ('WINMERGE_2_8', '2.8'); define ('TAB_DOWNLOADS', 'downloads'); define ('TAB_SUPPORT', 'support'); define ('TAB_TRANSLATIONS', 'translations'); @@ -187,6 +188,12 @@ else { //if NOT "Home" ... $temp .= " <li><a href=\"/index.php\">Home</a></li>\n"; } + if ($this->_tab == WINMERGE_2_8) { //if WinMerge 2.8 ... + $temp .= " <li><a href=\"/2.8/index.php\" id=\"current\">WinMerge 2.8</a></li>\n"; + } +// else { //if NOT WinMerge 2.8 ... +// $temp .= " <li><a href=\"/2.8/index.php\">WinMerge 2.8</a></li>\n"; +// } if ($this->_tab == WINMERGE_2_6) { //if WinMerge 2.6 ... $temp .= " <li><a href=\"/2.6/index.php\" id=\"current\">WinMerge 2.6</a></li>\n"; } @@ -274,6 +281,15 @@ $temp .= " <li><a href=\"/2.6/manual/Faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n"; $temp .= "</ul>\n"; break; + case WINMERGE_2_8: //if WinMerge 2.8 ... + $temp .= "<ul id=\"subtabs\">\n"; + $temp .= " <li><a href=\"/2.8/manual/index.html\" title=\"Manual\">Manual</a></li>\n"; + $temp .= " <li><a href=\"/2.8/screenshots.php\" title=\"Screenshots\">Screenshots</a></li>\n"; + $temp .= " <li><a href=\"/2.8/releasenotes.php\" title=\"Release Notes\">Release Notes</a> (<a href=\"/2.8/releasenotes.php#issues\" title=\"Known Issues\">Known Issues</a>)</li>\n"; + $temp .= " <li><a href=\"/2.8/changelog.php\" title=\"Change Log\">Change Log</a></li>\n"; + $temp .= " <li><a href=\"/2.8/manual/Faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n"; + $temp .= "</ul>\n"; + break; case TAB_SUPPORT: //if "Support" ... $temp .= "<ul id=\"subtabs\">\n"; $temp .= " <li><a href=\"/support/mailing-lists.php\" title=\"Mailing Lists\">Mailing Lists</a></li>\n"; @@ -478,7 +494,7 @@ } /** - * convert a changelog file into html code + * convert a (old) changelog file into html code */ function convertChanges2Html($filename) { $html = "<pre>\n"; @@ -502,5 +518,30 @@ return $html; } + + /** + * convert a (new) changelog file into html code + */ + function convertChangeLog2Html($filename) { + $html = ""; + if (file_exists($filename) == true) { //if the file exists... + $html .= "<pre>\n"; + + $lines = file($filename); + $linescount = sizeof($lines); + + for ($i = 0; $i < $linescount; $i++) { //for all lines... + $line = $lines[$i]; + + $line = preg_replace('#(WinMerge [0-9]\.[0-9]\.[0-9].*\))#si', '<h3>\\1</h3>', $line); + $line = preg_replace('#\(r([0-9]+)\)#si', '(<a href="http://winmerge.svn.sourceforge.net/viewvc/winmerge?view=rev&revision=\\1" target="_blank">r\\1</a>)', $line); + $line = preg_replace('#\#([0-9]+)#si', '<a href="http://sourceforge.net/support/tracker.php?aid=\\1" target="_blank">#\\1</a>', $line); + + $html .= $line; + } + $html .= "</pre>\n"; + } + return $html; + } } ?> Modified: trunk/Web/sitemap.txt =================================================================== --- trunk/Web/sitemap.txt 2008-03-19 15:49:51 UTC (rev 5169) +++ trunk/Web/sitemap.txt 2008-03-19 20:35:13 UTC (rev 5170) @@ -56,6 +56,32 @@ http://winmerge.org/2.6/manual/TextEncoding.html http://winmerge.org/2.6/manual/VersionControl.html http://winmerge.org/2.6/manual/Whatsnew.html +http://winmerge.org/2.8/changelog.php +http://winmerge.org/2.8/index.php +http://winmerge.org/2.8/releasenotes.php +http://winmerge.org/2.8/screenshots.php +http://winmerge.org/2.8/manual/AboutDoc.html +http://winmerge.org/2.8/manual/art +http://winmerge.org/2.8/manual/CommandLine.html +http://winmerge.org/2.8/manual/CompareDirs.html +http://winmerge.org/2.8/manual/CompareFiles.html +http://winmerge.org/2.8/manual/Configuration.html +http://winmerge.org/2.8/manual/Faq.html +http://winmerge.org/2.8/manual/Filters.html +http://winmerge.org/2.8/manual/images +http://winmerge.org/2.8/manual/index.html +http://winmerge.org/2.8/manual/Installing.html +http://winmerge.org/2.8/manual/IntroDiff.html +http://winmerge.org/2.8/manual/Introduction.html +http://winmerge.org/2.8/manual/ix01.html +http://winmerge.org/2.8/manual/Locales.html +http://winmerge.org/2.8/manual/OpenPaths.html +http://winmerge.org/2.8/manual/Plugins.html +http://winmerge.org/2.8/manual/QuickStart.html +http://winmerge.org/2.8/manual/screenshots +http://winmerge.org/2.8/manual/Shortcuts.html +http://winmerge.org/2.8/manual/TextEncoding.html +http://winmerge.org/2.8/manual/VersionControl.html http://winmerge.org/downloads/index.php http://winmerge.org/support/index.php http://winmerge.org/support/mailing-lists.php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-03-31 20:37:15
|
Revision: 5224 http://winmerge.svn.sourceforge.net/winmerge/?rev=5224&view=rev Author: gerundt Date: 2008-03-31 13:37:13 -0700 (Mon, 31 Mar 2008) Log Message: ----------- PATCH: [ 1930495 ] Web: Nicer mailing lists overview Modified Paths: -------------- trunk/Web/css/screen.css trunk/Web/support/mailing-lists.php Modified: trunk/Web/css/screen.css =================================================================== --- trunk/Web/css/screen.css 2008-03-31 20:13:07 UTC (rev 5223) +++ trunk/Web/css/screen.css 2008-03-31 20:37:13 UTC (rev 5224) @@ -233,6 +233,28 @@ list-style: none; } +/* Mailing list */ +.mailinglist { + width: 40em; + margin: 1em; + padding: 0; + background: #f9f9f9; + border: 1px solid #aaaaaa; +} + +.mailinglist h3 { + margin: 0; + padding: 5px; + background: #f2f2f2; + border-bottom: 1px solid #aaaaaa; +} + +.mailinglist p { + margin: 0; + padding: 5px; + padding-top: 0; +} + /* Translations Status */ .status { border-collapse: collapse; @@ -242,7 +264,7 @@ .status th { padding: 3px; background: #f2f2f2; - border: 1px solid #aaaaaa ; + border: 1px solid #aaaaaa; } .status td { Modified: trunk/Web/support/mailing-lists.php =================================================================== --- trunk/Web/support/mailing-lists.php 2008-03-31 20:13:07 UTC (rev 5223) +++ trunk/Web/support/mailing-lists.php 2008-03-31 20:37:13 UTC (rev 5224) @@ -14,54 +14,66 @@ <li><a href="#svn">SVN List</a></li> </ul> <p>You should read the "<a href="http://sourceforge.net/docman/display_doc.php?docid=12983&group_id=1">Guide to SourceForge.net Mailing List Services</a>" before subscribing and posting to any of the lists below.</p> -<h3><a name="announce">Announce List</a></h3> -<ul> - <li><strong>Low Traffic</strong></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce">Subscribe</a></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce">Unsubscribe</a></li> - <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-announce">Archive</a></li> -</ul> -<p>This list is only for announcing new releases of WinMerge.</p> -<h3><a name="support">Support List</a></h3> -<ul> - <li><strong>Normal Traffic</strong></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support">Subscribe</a></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support">Unsubscribe</a></li> - <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-support">Archive</a></li> -</ul> -<p>You should ask all your support questions on this list.</p> -<h3><a name="user">User List</a></h3> -<ul> - <li><strong>Normal Traffic</strong></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user">Subscribe</a></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user">Unsubscribe</a></li> - <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-user">Archive</a></li> -</ul> -<p>This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own.</p> -<h3><a name="translate">Translate List</a></h3> -<ul> - <li><strong>Low Traffic</strong></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate">Subscribe</a></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate">Unsubscribe</a></li> - <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-translate">Archive</a></li> -</ul> -<p>This list is used for coordinating the translations.</p> -<h3><a name="development">Development List</a></h3> -<ul> - <li><strong>Normal Traffic</strong></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development">Subscribe</a></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development">Unsubscribe</a></li> - <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-development">Archive</a></li> -</ul> -<p>This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc.</p> -<h3><a name="svn">SVN List</a></h3> -<ul> - <li><strong>High Traffic</strong></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn">Subscribe</a></li> - <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn">Unsubscribe</a></li> - <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-svn">Archive</a></li> -</ul> -<p>Subscribers to this list get notices of each and every code change commited to Subversion.</p> +<div class="mailinglist"> + <h3><a name="announce">Announce List</a></h3> + <ul> + <li><strong>Low Traffic</strong></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce">Subscribe</a></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce">Unsubscribe</a></li> + <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-announce">Archive</a></li> + </ul> + <p>This list is only for announcing new releases of WinMerge.</p> +</div> +<div class="mailinglist"> + <h3><a name="support">Support List</a></h3> + <ul> + <li><strong>Normal Traffic</strong></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support">Subscribe</a></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support">Unsubscribe</a></li> + <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-support">Archive</a></li> + </ul> + <p>You should ask all your support questions on this list.</p> +</div> +<div class="mailinglist"> + <h3><a name="user">User List</a></h3> + <ul> + <li><strong>Normal Traffic</strong></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user">Subscribe</a></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user">Unsubscribe</a></li> + <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-user">Archive</a></li> + </ul> + <p>This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own.</p> +</div> +<div class="mailinglist"> + <h3><a name="translate">Translate List</a></h3> + <ul> + <li><strong>Low Traffic</strong></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate">Subscribe</a></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate">Unsubscribe</a></li> + <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-translate">Archive</a></li> + </ul> + <p>This list is used for coordinating the translations.</p> +</div> +<div class="mailinglist"> + <h3><a name="development">Development List</a></h3> + <ul> + <li><strong>Normal Traffic</strong></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development">Subscribe</a></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development">Unsubscribe</a></li> + <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-development">Archive</a></li> + </ul> + <p>This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc.</p> +</div> +<div class="mailinglist"> + <h3><a name="svn">SVN List</a></h3> + <ul> + <li><strong>High Traffic</strong></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn">Subscribe</a></li> + <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn">Unsubscribe</a></li> + <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-svn">Archive</a></li> + </ul> + <p>Subscribers to this list get notices of each and every code change commited to Subversion.</p> +</div> <?php $page->printFoot(); ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-04-03 22:40:43
|
Revision: 5263 http://winmerge.svn.sourceforge.net/winmerge/?rev=5263&view=rev Author: gerundt Date: 2008-04-03 15:40:41 -0700 (Thu, 03 Apr 2008) Log Message: ----------- Web: Change "Win32 platforms" to "Windows" Modified Paths: -------------- trunk/Web/2.0/index.php trunk/Web/2.2/index.php trunk/Web/2.4/index.php trunk/Web/2.6/index.php trunk/Web/index.php Modified: trunk/Web/2.0/index.php =================================================================== --- trunk/Web/2.0/index.php 2008-04-03 22:32:10 UTC (rev 5262) +++ trunk/Web/2.0/index.php 2008-04-03 22:40:41 UTC (rev 5263) @@ -4,7 +4,7 @@ $page = new Page; $page->printHead('WinMerge 2.0', WINMERGE_2_0); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <h2>Features</h2> <ul> <li>Visual differencing of text files</li> Modified: trunk/Web/2.2/index.php =================================================================== --- trunk/Web/2.2/index.php 2008-04-03 22:32:10 UTC (rev 5262) +++ trunk/Web/2.2/index.php 2008-04-03 22:40:41 UTC (rev 5263) @@ -4,7 +4,7 @@ $page = new Page; $page->printHead('WinMerge 2.2', WINMERGE_2_2); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <h2>Features</h2> <ul> <li>Visual differencing and merging of text files</li> Modified: trunk/Web/2.4/index.php =================================================================== --- trunk/Web/2.4/index.php 2008-04-03 22:32:10 UTC (rev 5262) +++ trunk/Web/2.4/index.php 2008-04-03 22:40:41 UTC (rev 5263) @@ -4,7 +4,7 @@ $page = new Page; $page->printHead('WinMerge 2.4', WINMERGE_2_4); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <h2>Features</h2> <ul> <li>Visual differencing and merging of text files</li> Modified: trunk/Web/2.6/index.php =================================================================== --- trunk/Web/2.6/index.php 2008-04-03 22:32:10 UTC (rev 5262) +++ trunk/Web/2.6/index.php 2008-04-03 22:40:41 UTC (rev 5263) @@ -4,7 +4,7 @@ $page = new Page; $page->printHead('WinMerge 2.6', WINMERGE_2_6); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> <h2>Features</h2> <ul> Modified: trunk/Web/index.php =================================================================== --- trunk/Web/index.php 2008-04-03 22:32:10 UTC (rev 5262) +++ trunk/Web/index.php 2008-04-03 22:40:41 UTC (rev 5263) @@ -5,7 +5,7 @@ $page->printHead('WinMerge', TAB_HOME); $stablerelease = $page->getStableRelease(); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> <h2>Features</h2> <ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-04-05 10:24:35
|
Revision: 5265 http://winmerge.svn.sourceforge.net/winmerge/?rev=5265&view=rev Author: gerundt Date: 2008-04-05 03:24:28 -0700 (Sat, 05 Apr 2008) Log Message: ----------- PATCH: [ 1934897 ] Web: Changes for new stable release 2.8.0 Modified Paths: -------------- trunk/Web/2.8/index.php trunk/Web/WinMergePAD.xml trunk/Web/downloads/index.php trunk/Web/history.php trunk/Web/index.php trunk/Web/page.inc Modified: trunk/Web/2.8/index.php =================================================================== --- trunk/Web/2.8/index.php 2008-04-03 22:47:36 UTC (rev 5264) +++ trunk/Web/2.8/index.php 2008-04-05 10:24:28 UTC (rev 5265) @@ -5,7 +5,45 @@ $page->printHead('WinMerge 2.8', WINMERGE_2_8); ?> <h2>WinMerge 2.8</h2> -<p>Coming soon...</p> +<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<?php $page->printDownloadNow(); ?> +<h2>Features</h2> +<ul> + <li>Visual differencing and merging of text files</li> + <li>Flexible editor with syntax highlighting, line numbers and word-wrap</li> + <li>Handles Windows, Unix and Mac text file formats</li> + <li>Unicode support</li> + <li>Difference pane shows current difference in two vertical panes</li> + <li>Location pane shows map of files compared</li> + <li>Highlights differences inside lines in file compare</li> + <li>Regular Expression based file filters in directory compare allow excluding and including items</li> + <li>Moved lines detection in file compare</li> + <li>Creates patch files</li> + <li>Resolve conflict files</li> + <li>Shell Integration (supports 64-bit Windows versions)</li> + <li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li> + <li>Archive file support using 7-Zip</li> + <li>Plugin support</li> + <li>Localizable interface</li> + <li><a href="manual/index.html">Online manual</a> and installed HTML Help manual</li> +</ul> + +<h2>Screenshots</h2> +<p><a href="images/screenshot.png" target="_blank"><img class="thumbnail" src="images/screenshot_small.png" alt="File Comparison" border="0"></a> +<a href="images/foldercmp.png" target="_blank"><img class="thumbnail" src="images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p> +<p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> + +<h2>Installation</h2> +<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe">installer</a> and double-click it.</p> +<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.zip">binary zip package</a> into the desired location, and run +<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> +<p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p> + +<h2>Using WinMerge</h2> +<p>For information on using WinMerge, see our <a href="manual/index.html">online Manual</a>, +or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p> + +<p>Here is the current <a href="changelog.php">change log</a>.</p> <?php $page->printFoot(); ?> \ No newline at end of file Modified: trunk/Web/WinMergePAD.xml =================================================================== --- trunk/Web/WinMergePAD.xml 2008-04-03 22:47:36 UTC (rev 5264) +++ trunk/Web/WinMergePAD.xml 2008-04-05 10:24:28 UTC (rev 5265) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252" ?> <XML_DIZ_INFO> <MASTER_PAD_VERSION_INFO> - <MASTER_PAD_VERSION>2.01</MASTER_PAD_VERSION> + <MASTER_PAD_VERSION>2.02</MASTER_PAD_VERSION> <MASTER_PAD_EDITOR>PADGen 2.0.1.22 http://www.padgen.org</MASTER_PAD_EDITOR> <MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad</MASTER_PAD_INFO> </MASTER_PAD_VERSION_INFO> @@ -34,35 +34,26 @@ </Company_Info> <Program_Info> <Program_Name>WinMerge</Program_Name> - <Program_Version>2.6.14</Program_Version> - <Program_Release_Month>01</Program_Release_Month> - <Program_Release_Day>17</Program_Release_Day> + <Program_Version>2.8.0</Program_Version> + <Program_Release_Month>04</Program_Release_Month> + <Program_Release_Day>02</Program_Release_Day> <Program_Release_Year>2008</Program_Release_Year> <Program_Cost_Dollars>0</Program_Cost_Dollars> <Program_Cost_Other_Code /> <Program_Cost_Other /> <Program_Type>Freeware</Program_Type> - <Program_Release_Status>Minor Update</Program_Release_Status> + <Program_Release_Status>Major Update</Program_Release_Status> <Program_Install_Support>Install and Uninstall</Program_Install_Support> - <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP</Program_OS_Support> - <Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,PortugueseBrazilian,Romanian,Russian,Spanish,Swedish,Turkish</Program_Language> + <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP,Windows2003,Windows Vista Starter,Windows Vista Home Basic,Windows Vista Home Premium,Windows Vista Business,Windows Vista Enterprise,Windows Vista Ultimate,Windows Vista Home Basic x64,Windows Vista Home Premium x64,Windows Vista Business x64,Windows Vista Enterprise x64,Windows Vista Ultimate x64</Program_OS_Support> + <Program_Language>Bulgarian,Catalan,ChineseSimplified,ChineseTraditional,Croatian,Czech,Danish,Dutch,English,French,German,Hungarian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Russian,Slovak,Spanish,Swedish,Turkish</Program_Language> <Program_Change_Info /> <Program_Specific_Category>Utilities</Program_Specific_Category> - <Program_Category_Class>System Utilities::Other</Program_Category_Class> - <Program_Categories>File Syncronizing, Differencing</Program_Categories> + <Program_Category_Class>System Utilities::File Compression</Program_Category_Class> <Program_System_Requirements /> - <Includes_JAVA_VM>N</Includes_JAVA_VM> - <Includes_VB_Runtime>N</Includes_VB_Runtime> - <Includes_DirectX>N</Includes_DirectX> <File_Info> - <Filename_Versioned>WinMerge-2.6.14-Setup.exe</Filename_Versioned> - <Filename_Previous>WinMerge-2.6.12-Setup.exe</Filename_Previous> - <Filename_Generic>WinMergeSetup.exe</Filename_Generic> - <Filename_Long>WinMergeSetup.exe</Filename_Long> - - <File_Size_Bytes>3036206</File_Size_Bytes> - <File_Size_K>2965</File_Size_K> - <File_Size_MB>2.90</File_Size_MB> + <File_Size_Bytes>2972014</File_Size_Bytes> + <File_Size_K>2902</File_Size_K> + <File_Size_MB>3</File_Size_MB> </File_Info> <Expire_Info> <Has_Expire_Info>N</Has_Expire_Info> @@ -86,14 +77,14 @@ </Program_Descriptions> <Web_Info> <Application_URLs> - <Application_Info_URL>http://winmerge.org/2.6/</Application_Info_URL> - <Application_Order_URL>http://winmerge.org/2.6/</Application_Order_URL> - <Application_Screenshot_URL>http://winmerge.org/2.6/images/screenshot.png</Application_Screenshot_URL> - <Application_Icon_URL>http://winmerge.org/2.6/images/icon.gif</Application_Icon_URL> + <Application_Info_URL>http://winmerge.org/2.8/</Application_Info_URL> + <Application_Order_URL>http://winmerge.org/2.8/</Application_Order_URL> + <Application_Screenshot_URL>http://winmerge.org/2.8/images/screenshot.png</Application_Screenshot_URL> + <Application_Icon_URL>http://winmerge.org/2.8/images/icon.gif</Application_Icon_URL> <Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL> </Application_URLs> <Download_URLs> - <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-Setup.exe</Primary_Download_URL> + <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe</Primary_Download_URL> <Secondary_Download_URL /> <Additional_Download_URL_1 /> <Additional_Download_URL_2 /> Modified: trunk/Web/downloads/index.php =================================================================== --- trunk/Web/downloads/index.php 2008-04-03 22:47:36 UTC (rev 5264) +++ trunk/Web/downloads/index.php 2008-04-05 10:24:28 UTC (rev 5265) @@ -15,7 +15,7 @@ </ul> <h3><a name="current">Current Version</a></h3> <?php $page->printDownloadNow(); ?> -<p>The current version is <strong><?php echo $stablerelease->getVersionNumber();?></strong> and was released at <strong><?php echo $stablerelease->getDate();?></strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=569358">release notes</a>.</p> +<p>The current version is <strong><?php echo $stablerelease->getVersionNumber();?></strong> and was released at <strong><?php echo $stablerelease->getDate();?></strong>. For detailed info on what's new, read the <a href="/2.8/changelog.php">change log</a> and the <a href="/2.8/releasenotes.php">release notes</a>.</p> <div class="downloadmatrix"> <ul> <li><strong>Installer</strong> @@ -43,7 +43,7 @@ </li> </ul> </div> -<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p> +<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="2.8/manual/Installing.html">online manual</a> for help using it.</p> <h3><a name="other">Other Versions</a></h3> <ul> <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248">Stable Versions</a></li> @@ -58,12 +58,12 @@ <ul> <li><strong>Installer</strong> <ul> - <li><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0026-432-457.exe">Exe-Format (1.05 MB)</a></li> + <li><a href="http://downloads.sourceforge.net/winmerge/Merge7zInstaller0026-432-457.exe">Exe-Format (1.05 MB)</a></li> </ul> </li> <li><strong>Binaries</strong> <ul> - <li><a href="http://prdownloads.sourceforge.net/winmerge/Merge7z0026-432-457.7z">7z-Format (0.91 MB)</a></li> + <li><a href="http://downloads.sourceforge.net/winmerge/Merge7z0026-432-457.7z">7z-Format (0.91 MB)</a></li> </ul> </li> </ul> @@ -76,8 +76,8 @@ <dl class="headinglist"> <dt>Developer Version</dt> <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk">https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk</a></dd> - <dt>WinMerge 2.6</dt> - <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_6">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_6</a></dd> + <dt>WinMerge 2.8</dt> + <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8</a></dd> </dl> <?php $page->printFoot(); Modified: trunk/Web/history.php =================================================================== --- trunk/Web/history.php 2008-04-03 22:47:36 UTC (rev 5264) +++ trunk/Web/history.php 2008-04-05 10:24:28 UTC (rev 5265) @@ -5,6 +5,14 @@ $page->printHead('WinMerge: History', TAB_HOME); ?> <h2>History</h2> +<h3>WinMerge 2.8</h3> +<ul> + <li>WinMerge 2.8.0 (2008-04-02)</li> +</ul> +<ul class="inline"> + <li><a href="/2.8/manual/index.html">Manual</a></li> + <li><a href="/2.8/changelog.php">Change Log</a></li> +</ul> <h3>WinMerge 2.6</h3> <ul> <li>WinMerge 2.6.14 (2008-01-17)</li> Modified: trunk/Web/index.php =================================================================== --- trunk/Web/index.php 2008-04-03 22:47:36 UTC (rev 5264) +++ trunk/Web/index.php 2008-04-05 10:24:28 UTC (rev 5265) @@ -19,34 +19,35 @@ <li>Regular Expression based file filters in directory compare allow excluding and including items</li> <li>Moved lines detection in file compare</li> <li>Creates patch files</li> + <li>Resolve conflict files</li> <li>Shell Integration (supports 64-bit Windows versions)</li> <li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li> <li>Archive file support using 7-Zip</li> <li>Plugin support</li> - <li>Localizable interface via resource DLL</li> - <li><a href="2.6/manual/index.html">Online manual</a> and installed HTML Help manual</li> + <li>Localizable interface</li> + <li><a href="2.8/manual/index.html">Online manual</a> and installed HTML Help manual</li> </ul> <h2>Screenshots</h2> -<p><a href="2.6/images/screenshot.png" target="_blank"><img class="thumbnail" src="2.6/images/screenshot_small.png" alt="File Comparison" border="0"></a> -<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p> -<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p> +<p><a href="2.8/images/screenshot.png" target="_blank"><img class="thumbnail" src="2.8/images/screenshot_small.png" alt="File Comparison" border="0"></a> +<a href="2.8/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.8/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p> +<p>See the <a href="2.8/screenshots.php">screenshots page</a> for more screenshots.</p> <h2>WinMerge <?php echo $stablerelease->getVersionNumber();?> - latest stable version</h2> -<p><a href="2.6/index.php">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p> +<p><a href="2.8/index.php">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p> <p><a href="<?php echo $stablerelease->getDownload('setup.exe');?>">Download WinMerge <?php echo $stablerelease->getVersionNumber();?> Installer</a></p> <h2>Installation</h2> <p>Just download the <a href="<?php echo $stablerelease->getDownload('setup.exe');?>">installer</a> and double-click it.</p> <p>Or you may simply unzip the <a href="<?php echo $stablerelease->getDownload('exe.zip');?>">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> -<p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p> +<p>For more information, please see the <a href="2.8/manual/Installing.html">Installation section</a> of the <a href="2.8/manual/index.html">Manual</a>.</p> <h2>Using WinMerge</h2> -<p>For information on using WinMerge, see our <a href="2.6/manual/index.html">online Manual</a>, +<p>For information on using WinMerge, see our <a href="2.8/manual/index.html">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p> -<p>Here is the current <a href="2.6/changes.php">change history</a>.</p> +<p>Here is the current <a href="2.8/changelog.php">change log</a>.</p> <h2>Support</h2> <p>If you need support, look at our <a href="support/index.php">support page</a> for more information how you can get it.</p> @@ -55,7 +56,7 @@ <p>WinMerge is an open source project, which means that the program is maintained and developed by volunteers. If you''re interested in contributing work to the project, see our <a href="http://winmerge.org/Wiki/index.php?title=Help_Needed">developer page</a> for further information on how you may contribute.</p> -<p>In addition, WinMerge is translated into a number of different languages. See our <a href="http://winmerge.org/Wiki/index.php?title=Translations">information on translating WinMerge</a> into your own language.</p> +<p>In addition, WinMerge is translated into a number of different languages. See our <a href="/translations">information on translating WinMerge</a> into your own language.</p> <p><a href="http://winmerge.org/Wiki/index.php?title=Developers">The WinMerge Development Team</a></p> <?php $page->printFoot(); Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-04-03 22:47:36 UTC (rev 5264) +++ trunk/Web/page.inc 2008-04-05 10:24:28 UTC (rev 5265) @@ -43,15 +43,15 @@ $this->_tab = WINMERGE_2_6; /* _Stable Release */ $this->_stablerelease = new Release; - $this->_stablerelease->setVersionNumber('2.6.14'); - $this->_stablerelease->setDate('2008-01-17'); - $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-Setup.exe', 3036206); - $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-exe.zip', 5439408); - $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-exe.7z', 1768345); - $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.6.14.zip', 1287952); - $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.6.14.7z', 753483); - $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-src.zip', 5318782); - $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-src.7z', 2929765); + $this->_stablerelease->setVersionNumber('2.8.0'); + $this->_stablerelease->setDate('2008-04-02'); + $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe', 2972014); + $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.zip', 3234729); + $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.7z', 1762030); + $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.0.zip', 1287510); + $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.0.7z', 753830); + $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-src.zip', 8449662); + $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-src.7z', 4299223); } /** @@ -138,6 +138,7 @@ case WINMERGE_2_0: //if WinMerge 2.0 ... case WINMERGE_2_2: //if WinMerge 2.2 ... case WINMERGE_2_4: //if WinMerge 2.4 ... + case WINMERGE_2_6: //if WinMerge 2.6 ... $temp .= "<p class=\"important\">This is an old version of WinMerge, for the latest version go to the <a href=\"/index.php\">main site</a>.</p>\n"; break; } @@ -191,15 +192,12 @@ if ($this->_tab == WINMERGE_2_8) { //if WinMerge 2.8 ... $temp .= " <li><a href=\"/2.8/index.php\" id=\"current\">WinMerge 2.8</a></li>\n"; } -// else { //if NOT WinMerge 2.8 ... -// $temp .= " <li><a href=\"/2.8/index.php\">WinMerge 2.8</a></li>\n"; -// } + else { //if NOT WinMerge 2.8 ... + $temp .= " <li><a href=\"/2.8/index.php\">WinMerge 2.8</a></li>\n"; + } if ($this->_tab == WINMERGE_2_6) { //if WinMerge 2.6 ... $temp .= " <li><a href=\"/2.6/index.php\" id=\"current\">WinMerge 2.6</a></li>\n"; } - else { //if NOT WinMerge 2.6 ... - $temp .= " <li><a href=\"/2.6/index.php\">WinMerge 2.6</a></li>\n"; - } if ($this->_tab == WINMERGE_2_4) { //if WinMerge 2.4 ... $temp .= " <li><a href=\"/2.4/index.php\" id=\"current\">WinMerge 2.4</a></li>\n"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-04-06 22:54:19
|
Revision: 5266 http://winmerge.svn.sourceforge.net/winmerge/?rev=5266&view=rev Author: gerundt Date: 2008-04-06 15:54:14 -0700 (Sun, 06 Apr 2008) Log Message: ----------- PATCH: [ 1934897 ] Web: Changes for new stable release 2.8.0 - fix release date Modified Paths: -------------- trunk/Web/WinMergePAD.xml trunk/Web/history.php trunk/Web/page.inc Modified: trunk/Web/WinMergePAD.xml =================================================================== --- trunk/Web/WinMergePAD.xml 2008-04-05 10:24:28 UTC (rev 5265) +++ trunk/Web/WinMergePAD.xml 2008-04-06 22:54:14 UTC (rev 5266) @@ -36,7 +36,7 @@ <Program_Name>WinMerge</Program_Name> <Program_Version>2.8.0</Program_Version> <Program_Release_Month>04</Program_Release_Month> - <Program_Release_Day>02</Program_Release_Day> + <Program_Release_Day>03</Program_Release_Day> <Program_Release_Year>2008</Program_Release_Year> <Program_Cost_Dollars>0</Program_Cost_Dollars> <Program_Cost_Other_Code /> Modified: trunk/Web/history.php =================================================================== --- trunk/Web/history.php 2008-04-05 10:24:28 UTC (rev 5265) +++ trunk/Web/history.php 2008-04-06 22:54:14 UTC (rev 5266) @@ -7,7 +7,7 @@ <h2>History</h2> <h3>WinMerge 2.8</h3> <ul> - <li>WinMerge 2.8.0 (2008-04-02)</li> + <li>WinMerge 2.8.0 (2008-04-03)</li> </ul> <ul class="inline"> <li><a href="/2.8/manual/index.html">Manual</a></li> Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-04-05 10:24:28 UTC (rev 5265) +++ trunk/Web/page.inc 2008-04-06 22:54:14 UTC (rev 5266) @@ -44,7 +44,7 @@ /* _Stable Release */ $this->_stablerelease = new Release; $this->_stablerelease->setVersionNumber('2.8.0'); - $this->_stablerelease->setDate('2008-04-02'); + $this->_stablerelease->setDate('2008-04-03'); $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe', 2972014); $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.zip', 3234729); $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.7z', 1762030); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-04-15 22:01:03
|
Revision: 5300 http://winmerge.svn.sourceforge.net/winmerge/?rev=5300&view=rev Author: gerundt Date: 2008-04-15 15:00:55 -0700 (Tue, 15 Apr 2008) Log Message: ----------- PATCH: [ 1943384 ] Web: Small facelift for the website Modified Paths: -------------- trunk/Web/css/screen.css trunk/Web/history.php trunk/Web/support/mailing-lists.php Added Paths: ----------- trunk/Web/images/downloadnow-focus.png trunk/Web/images/downloadnow.png Modified: trunk/Web/css/screen.css =================================================================== --- trunk/Web/css/screen.css 2008-04-15 18:31:46 UTC (rev 5299) +++ trunk/Web/css/screen.css 2008-04-15 22:00:55 UTC (rev 5300) @@ -13,6 +13,19 @@ font-size: 1em; } +ul { + list-style-type: square; +} + +/* Default link style */ +a:link { color:#3366CC; text-decoration:underline; } +a:visited { color:#003399; text-decoration:underline; } +a:focus { color:#3366CC; text-decoration:none; } +a:hover { color:#3366CC; text-decoration:none; } +a:active { color:#003399; text-decoration:none; } + +a[name]:hover { color:black; text-decoration:none; } + #head { margin: 0; padding: 5px; @@ -61,6 +74,7 @@ #tabs li a:link { color: black; } #tabs li a:visited { color: black; } +#tabs li a:focus, #tabs li a:hover { color: black; background: white; @@ -113,20 +127,27 @@ padding: 5px; text-align: center; text-decoration: none; - color: black; - background: #00B300; - border: 1px solid black; - -moz-border-radius: 0.5em; + color: white; + background: #006600 url(/images/downloadnow.png) repeat-x top; + border: 1px solid #006600; } +a.downloadnow:link, +a.downloadnow:visited { + text-decoration: none; + color: white; +} + +a.downloadnow:focus, a.downloadnow:hover { - color: black; - background: #00CC00; + text-decoration: none; + color: white; + background: #00CC00 url(/images/downloadnow-focus.png) repeat-x top; } a.downloadnow strong { display: block; - text-decoration: underline; + /*text-decoration: underline;*/ font-size: larger; font-weight: bold; } @@ -161,9 +182,10 @@ border-bottom: 1px solid #FFFFFF; } +.downloadmatrix a:focus, .downloadmatrix a:hover { color: #FFFFFF; - background-color: #336699; + background-color: #3366CC; } .downloadmatrix li li a { @@ -177,6 +199,12 @@ border-bottom: 1px solid #FFFFFF; } +.downloadmatrix li li a:link, +.downloadmatrix li li a:visited { + text-decoration: none; + color: #FFFFFF; +} + /* Heading list */ .headinglist dt { font-weight: bold; @@ -233,8 +261,8 @@ list-style: none; } -/* Mailing list */ -.mailinglist { +/* Info card (Mailing lists, History) */ +.infocard { width: 40em; margin: 1em; padding: 0; @@ -242,14 +270,14 @@ border: 1px solid #aaaaaa; } -.mailinglist h3 { +.infocard h3 { margin: 0; padding: 5px; background: #f2f2f2; border-bottom: 1px solid #aaaaaa; } -.mailinglist p { +.infocard p { margin: 0; padding: 5px; padding-top: 0; Modified: trunk/Web/history.php =================================================================== --- trunk/Web/history.php 2008-04-15 18:31:46 UTC (rev 5299) +++ trunk/Web/history.php 2008-04-15 22:00:55 UTC (rev 5300) @@ -5,69 +5,81 @@ $page->printHead('WinMerge: History', TAB_HOME); ?> <h2>History</h2> -<h3>WinMerge 2.8</h3> -<ul> - <li>WinMerge 2.8.0 (2008-04-03)</li> -</ul> -<ul class="inline"> - <li><a href="/2.8/manual/index.html">Manual</a></li> - <li><a href="/2.8/changelog.php">Change Log</a></li> -</ul> -<h3>WinMerge 2.6</h3> -<ul> - <li>WinMerge 2.6.14 (2008-01-17)</li> - <li>WinMerge 2.6.12 (2007-09-26)</li> - <li><del>WinMerge 2.6.10 (2007-09-25)</del> <em>Withdrawn due to installer bug!</em></li> - <li>WinMerge 2.6.8 (2007-06-19)</li> - <li>WinMerge 2.6.6 (2007-03-29)</li> - <li>WinMerge 2.6.4 (2007-01-17)</li> - <li>WinMerge 2.6.2 (2006-12-14)</li> - <li>WinMerge 2.6.0 (2006-10-12)</li> -</ul> -<ul class="inline"> - <li><a href="/2.6/manual/index.html">Manual</a></li> - <li><a href="/2.6/changes.php">Change History</a></li> -</ul> -<h3>WinMerge 2.4</h3> -<ul> - <li>WinMerge 2.4.10 (2006-08-10)</li> - <li>WinMerge 2.4.8 (2006-06-13)</li> - <li>WinMerge 2.4.6 (2006-02-28)</li> - <li>WinMerge 2.4.4 (2005-12-15)</li> - <li>WinMerge 2.4.2 (2005-11-10)</li> - <li>WinMerge 2.4.0 (2005-09-29)</li> -</ul> -<ul class="inline"> - <li><a href="/2.4/manual/index.html">Manual</a></li> - <li><a href="/2.4/changes.php">Change History</a></li> -</ul> -<h3>WinMerge 2.2</h3> -<ul> - <li>WinMerge 2.2.4 (2005-05-31)</li> - <li>WinMerge 2.2.2 (2005-03-23)</li> - <li>WinMerge 2.2.0 (2004-11-10)</li> -</ul> -<ul class="inline"> - <li><a href="/2.2/manual/index.html">Manual</a></li> - <li><a href="/2.2/changes.php">Change History</a></li> -</ul> -<h3>WinMerge 2.0</h3> -<ul> - <li>WinMerge 2.0.2 (2003-12-10)</li> - <li>WinMerge 2.0.0 (2003-08-04)</li> -</ul> -<ul class="inline"> - <li><a href="/2.0/docs/index.html">User's Guide</a></li> - <li><a href="/2.0/changes.php">Change History</a></li> -</ul> -<h3>WinMerge 1.7</h3> -<ul> - <li>WinMerge 1.7.1 (2000-11-03)</li> -</ul> -<ul class="inline"> - <li><a href="/1.7/docs/index.html">User's Guide</a></li> - <li><a href="/1.7/changes.php">Change History</a></li> -</ul> +<div class="infocard"> + <h3>WinMerge 2.8</h3> + <ul> + <li>WinMerge 2.8.0 (2008-04-03)</li> + </ul> + <ul class="inline"> + <li><a href="/2.8/manual/index.html">Manual</a></li> + <li><a href="/2.8/changelog.php">Change Log</a></li> + </ul> +</div> +<div class="infocard"> + <h3>WinMerge 2.6</h3> + <ul> + <li>WinMerge 2.6.14 (2008-01-17)</li> + <li>WinMerge 2.6.12 (2007-09-26)</li> + <li><del>WinMerge 2.6.10 (2007-09-25)</del> <em>Withdrawn due to installer bug!</em></li> + <li>WinMerge 2.6.8 (2007-06-19)</li> + <li>WinMerge 2.6.6 (2007-03-29)</li> + <li>WinMerge 2.6.4 (2007-01-17)</li> + <li>WinMerge 2.6.2 (2006-12-14)</li> + <li>WinMerge 2.6.0 (2006-10-12)</li> + </ul> + <ul class="inline"> + <li><a href="/2.6/manual/index.html">Manual</a></li> + <li><a href="/2.6/changes.php">Change History</a></li> + </ul> +</div> +<div class="infocard"> + <h3>WinMerge 2.4</h3> + <ul> + <li>WinMerge 2.4.10 (2006-08-10)</li> + <li>WinMerge 2.4.8 (2006-06-13)</li> + <li>WinMerge 2.4.6 (2006-02-28)</li> + <li>WinMerge 2.4.4 (2005-12-15)</li> + <li>WinMerge 2.4.2 (2005-11-10)</li> + <li>WinMerge 2.4.0 (2005-09-29)</li> + </ul> + <ul class="inline"> + <li><a href="/2.4/manual/index.html">Manual</a></li> + <li><a href="/2.4/changes.php">Change History</a></li> + </ul> +</div> +<div class="infocard"> + <h3>WinMerge 2.2</h3> + <ul> + <li>WinMerge 2.2.4 (2005-05-31)</li> + <li>WinMerge 2.2.2 (2005-03-23)</li> + <li>WinMerge 2.2.0 (2004-11-10)</li> + </ul> + <ul class="inline"> + <li><a href="/2.2/manual/index.html">Manual</a></li> + <li><a href="/2.2/changes.php">Change History</a></li> + </ul> +</div> +<div class="infocard"> + <h3>WinMerge 2.0</h3> + <ul> + <li>WinMerge 2.0.2 (2003-12-10)</li> + <li>WinMerge 2.0.0 (2003-08-04)</li> + </ul> + <ul class="inline"> + <li><a href="/2.0/docs/index.html">User's Guide</a></li> + <li><a href="/2.0/changes.php">Change History</a></li> + </ul> +</div> +<div class="infocard"> + <h3>WinMerge 1.7</h3> + <ul> + <li>WinMerge 1.7.1 (2000-11-03)</li> + </ul> + <ul class="inline"> + <li><a href="/1.7/docs/index.html">User's Guide</a></li> + <li><a href="/1.7/changes.php">Change History</a></li> + </ul> +</div> <?php $page->printFoot(); ?> \ No newline at end of file Added: trunk/Web/images/downloadnow-focus.png =================================================================== (Binary files differ) Property changes on: trunk/Web/images/downloadnow-focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Web/images/downloadnow.png =================================================================== (Binary files differ) Property changes on: trunk/Web/images/downloadnow.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/Web/support/mailing-lists.php =================================================================== --- trunk/Web/support/mailing-lists.php 2008-04-15 18:31:46 UTC (rev 5299) +++ trunk/Web/support/mailing-lists.php 2008-04-15 22:00:55 UTC (rev 5300) @@ -14,7 +14,7 @@ <li><a href="#svn">SVN List</a></li> </ul> <p>You should read the "<a href="http://sourceforge.net/docman/display_doc.php?docid=12983&group_id=1">Guide to SourceForge.net Mailing List Services</a>" before subscribing and posting to any of the lists below.</p> -<div class="mailinglist"> +<div class="infocard"> <h3><a name="announce">Announce List</a></h3> <ul> <li><strong>Low Traffic</strong></li> @@ -24,7 +24,7 @@ </ul> <p>This list is only for announcing new releases of WinMerge.</p> </div> -<div class="mailinglist"> +<div class="infocard"> <h3><a name="support">Support List</a></h3> <ul> <li><strong>Normal Traffic</strong></li> @@ -34,7 +34,7 @@ </ul> <p>You should ask all your support questions on this list.</p> </div> -<div class="mailinglist"> +<div class="infocard"> <h3><a name="user">User List</a></h3> <ul> <li><strong>Normal Traffic</strong></li> @@ -44,7 +44,7 @@ </ul> <p>This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own.</p> </div> -<div class="mailinglist"> +<div class="infocard"> <h3><a name="translate">Translate List</a></h3> <ul> <li><strong>Low Traffic</strong></li> @@ -54,7 +54,7 @@ </ul> <p>This list is used for coordinating the translations.</p> </div> -<div class="mailinglist"> +<div class="infocard"> <h3><a name="development">Development List</a></h3> <ul> <li><strong>Normal Traffic</strong></li> @@ -64,7 +64,7 @@ </ul> <p>This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc.</p> </div> -<div class="mailinglist"> +<div class="infocard"> <h3><a name="svn">SVN List</a></h3> <ul> <li><strong>High Traffic</strong></li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-04-17 22:24:36
|
Revision: 5308 http://winmerge.svn.sourceforge.net/winmerge/?rev=5308&view=rev Author: gerundt Date: 2008-04-17 15:24:33 -0700 (Thu, 17 Apr 2008) Log Message: ----------- Web: Use 32x32 pixel icon for PAD file (required since PAD Specification 2.02) Modified Paths: -------------- trunk/Web/2.8/images/icon.gif trunk/Web/images/icon.gif Modified: trunk/Web/2.8/images/icon.gif =================================================================== (Binary files differ) Modified: trunk/Web/images/icon.gif =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-04-24 20:53:15
|
Revision: 5328 http://winmerge.svn.sourceforge.net/winmerge/?rev=5328&view=rev Author: gerundt Date: 2008-04-24 13:53:09 -0700 (Thu, 24 Apr 2008) Log Message: ----------- BUG: [ 1838320 ] Links to download page is wrong Modified Paths: -------------- trunk/Web/2.0/index.php trunk/Web/2.2/index.php trunk/Web/2.4/index.php Modified: trunk/Web/2.0/index.php =================================================================== --- trunk/Web/2.0/index.php 2008-04-23 19:11:35 UTC (rev 5327) +++ trunk/Web/2.0/index.php 2008-04-24 20:53:09 UTC (rev 5328) @@ -27,13 +27,13 @@ <img src="images/screenshot.png" alt="Screenshot of WinMerge"> <h2>Installation</h2> -<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMergeSetup202.exe">installer</a> and double-click it.</p> -<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge202-exe.zip">binary zip package</a> into the desired location, and run +<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMergeSetup202.exe">installer</a> and double-click it.</p> +<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge202-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <h2>Using WinMerge</h2> <p>You can use the <a href="docs/index.html">online User's Guide</a>, or you can -<a href="http://prdownloads.sourceforge.net/winmerge/WinMergeDocs2_0.zip">download</a> a copy.</p> +<a href="http://downloads.sourceforge.net/winmerge/WinMergeDocs2_0.zip">download</a> a copy.</p> <p>Here is the current <a href="changes.php">change history</a>.</p> <?php Modified: trunk/Web/2.2/index.php =================================================================== --- trunk/Web/2.2/index.php 2008-04-23 19:11:35 UTC (rev 5327) +++ trunk/Web/2.2/index.php 2008-04-24 20:53:09 UTC (rev 5328) @@ -29,8 +29,8 @@ <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> <h2>Installation</h2> -<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">installer</a> and double-click it.</p> -<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.zip">binary zip package</a> into the desired location, and run +<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">installer</a> and double-click it.</p> +<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more details please look at the <a href="manual/installing.html">Installation section</a> from the <a href="manual/index.html">Manual</a>.</p> Modified: trunk/Web/2.4/index.php =================================================================== --- trunk/Web/2.4/index.php 2008-04-23 19:11:35 UTC (rev 5327) +++ trunk/Web/2.4/index.php 2008-04-24 20:53:09 UTC (rev 5328) @@ -29,8 +29,8 @@ <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> <h2>Installation</h2> -<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p> -<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run +<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p> +<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more information, please see the <a href="manual/installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-04-29 21:34:39
|
Revision: 5336 http://winmerge.svn.sourceforge.net/winmerge/?rev=5336&view=rev Author: gerundt Date: 2008-04-29 14:34:33 -0700 (Tue, 29 Apr 2008) Log Message: ----------- RFE: [ 1890083 ] Web: Mention / link license in front page Modified Paths: -------------- trunk/Web/2.0/index.php trunk/Web/2.2/index.php trunk/Web/2.4/index.php trunk/Web/2.6/index.php trunk/Web/2.8/index.php trunk/Web/index.php Modified: trunk/Web/2.0/index.php =================================================================== --- trunk/Web/2.0/index.php 2008-04-27 15:44:25 UTC (rev 5335) +++ trunk/Web/2.0/index.php 2008-04-29 21:34:33 UTC (rev 5336) @@ -4,7 +4,7 @@ $page = new Page; $page->printHead('WinMerge 2.0', WINMERGE_2_0); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <h2>Features</h2> <ul> <li>Visual differencing of text files</li> Modified: trunk/Web/2.2/index.php =================================================================== --- trunk/Web/2.2/index.php 2008-04-27 15:44:25 UTC (rev 5335) +++ trunk/Web/2.2/index.php 2008-04-29 21:34:33 UTC (rev 5336) @@ -4,7 +4,7 @@ $page = new Page; $page->printHead('WinMerge 2.2', WINMERGE_2_2); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <h2>Features</h2> <ul> <li>Visual differencing and merging of text files</li> Modified: trunk/Web/2.4/index.php =================================================================== --- trunk/Web/2.4/index.php 2008-04-27 15:44:25 UTC (rev 5335) +++ trunk/Web/2.4/index.php 2008-04-29 21:34:33 UTC (rev 5336) @@ -4,7 +4,7 @@ $page = new Page; $page->printHead('WinMerge 2.4', WINMERGE_2_4); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <h2>Features</h2> <ul> <li>Visual differencing and merging of text files</li> Modified: trunk/Web/2.6/index.php =================================================================== --- trunk/Web/2.6/index.php 2008-04-27 15:44:25 UTC (rev 5335) +++ trunk/Web/2.6/index.php 2008-04-29 21:34:33 UTC (rev 5336) @@ -4,7 +4,7 @@ $page = new Page; $page->printHead('WinMerge 2.6', WINMERGE_2_6); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> <h2>Features</h2> <ul> Modified: trunk/Web/2.8/index.php =================================================================== --- trunk/Web/2.8/index.php 2008-04-27 15:44:25 UTC (rev 5335) +++ trunk/Web/2.8/index.php 2008-04-29 21:34:33 UTC (rev 5336) @@ -5,7 +5,7 @@ $page->printHead('WinMerge 2.8', WINMERGE_2_8); ?> <h2>WinMerge 2.8</h2> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> <h2>Features</h2> <ul> Modified: trunk/Web/index.php =================================================================== --- trunk/Web/index.php 2008-04-27 15:44:25 UTC (rev 5335) +++ trunk/Web/index.php 2008-04-29 21:34:33 UTC (rev 5336) @@ -5,7 +5,7 @@ $page->printHead('WinMerge', TAB_HOME); $stablerelease = $page->getStableRelease(); ?> -<p>WinMerge is an Open Source visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> +<p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> <h2>Features</h2> <ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-05-30 23:36:24
|
Revision: 5402 http://winmerge.svn.sourceforge.net/winmerge/?rev=5402&view=rev Author: gerundt Date: 2008-05-30 16:36:17 -0700 (Fri, 30 May 2008) Log Message: ----------- Web: Add "WinMerge X.Y" heading to index pages Modified Paths: -------------- trunk/Web/1.7/index.php trunk/Web/2.0/index.php trunk/Web/2.2/index.php trunk/Web/2.4/index.php trunk/Web/2.6/index.php trunk/Web/2.8/index.php trunk/Web/index.php Modified: trunk/Web/1.7/index.php =================================================================== --- trunk/Web/1.7/index.php 2008-05-30 12:09:27 UTC (rev 5401) +++ trunk/Web/1.7/index.php 2008-05-30 23:36:17 UTC (rev 5402) @@ -4,13 +4,14 @@ $page = new Page; $page->printHead('WinMerge 1.7', WINMERGE_1_7); ?> +<h2>WinMerge 1.7</h2> <p>WinMerge is the result of my dissatisfaction with existing diff / merge tools available on the web. They always seemed so lacking, and the one that ships with SourceSafe doesn't work in standalone mode. So one day, I bit the bullet, grabbed a copy of the GNU diff code, and wrote a MFC front end for it. Since then, I have added quite a few features, including SourceSafe integration. Note that if you are in search of a directory synchronizing tool only (ie: Briefcase), WinMerge is probably not the right tool for you.</p> -<h2>Features</h2> +<h3>Features</h3> <ul> <li>Visual differencing of text files</li> <li>Diff a single file, or entire directories</li> @@ -22,9 +23,9 @@ <li>Localizable interface via/ resource DLL</li> <li>HTML-based <a href="docs/index.html">User's Guide</a></li> </ul> -<h2>Installation</h2> +<h3>Installation</h3> <p>Just download the <a href="http://download.sourceforge.net/winmerge/WinMergeSetup.exe">installer</a> and double-click it.</p> -<h2>Using WinMerge</h2> +<h3>Using WinMerge</h3> <p>You can use the <a href="docs/index.html">online User's Guide</a>, or you can <a href="http://download.sourceforge.net/winmerge/WinMergeDocs1_7.zip">download</a> a copy.</p> <p>Here is the current <a href="changes.php">change history</a>.</p> Modified: trunk/Web/2.0/index.php =================================================================== --- trunk/Web/2.0/index.php 2008-05-30 12:09:27 UTC (rev 5401) +++ trunk/Web/2.0/index.php 2008-05-30 23:36:17 UTC (rev 5402) @@ -4,8 +4,9 @@ $page = new Page; $page->printHead('WinMerge 2.0', WINMERGE_2_0); ?> +<h2>WinMerge 2.0</h2> <p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> -<h2>Features</h2> +<h3>Features</h3> <ul> <li>Visual differencing of text files</li> <li>Syntax highlighting</li> @@ -23,15 +24,15 @@ <li>HTML-based <a href="docs/index.html">User's Guide</a></li> </ul> -<h2>Screenshot</h2> +<h3>Screenshot</h3> <img src="images/screenshot.png" alt="Screenshot of WinMerge"> -<h2>Installation</h2> +<h3>Installation</h3> <p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMergeSetup202.exe">installer</a> and double-click it.</p> <p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge202-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> -<h2>Using WinMerge</h2> +<h3>Using WinMerge</h3> <p>You can use the <a href="docs/index.html">online User's Guide</a>, or you can <a href="http://downloads.sourceforge.net/winmerge/WinMergeDocs2_0.zip">download</a> a copy.</p> Modified: trunk/Web/2.2/index.php =================================================================== --- trunk/Web/2.2/index.php 2008-05-30 12:09:27 UTC (rev 5401) +++ trunk/Web/2.2/index.php 2008-05-30 23:36:17 UTC (rev 5402) @@ -4,8 +4,9 @@ $page = new Page; $page->printHead('WinMerge 2.2', WINMERGE_2_2); ?> +<h2>WinMerge 2.2</h2> <p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> -<h2>Features</h2> +<h3>Features</h3> <ul> <li>Visual differencing and merging of text files</li> <li>Flexible editor with syntax highlighting</li> @@ -24,17 +25,17 @@ <li>HTML-based <a href="manual/index.html">Manual</a></li> </ul> -<h2>Screenshot</h2> +<h3>Screenshot</h3> <p><img src="images/screenshot.gif" alt="Screenshot of WinMerge"></p> <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> -<h2>Installation</h2> +<h3>Installation</h3> <p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">installer</a> and double-click it.</p> <p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more details please look at the <a href="manual/installing.html">Installation section</a> from the <a href="manual/index.html">Manual</a>.</p> -<h2>Using WinMerge</h2> +<h3>Using WinMerge</h3> <p>You can use the <a href="manual/index.html">online Manual</a>, or you can <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358">download</a> a copy.</p> Modified: trunk/Web/2.4/index.php =================================================================== --- trunk/Web/2.4/index.php 2008-05-30 12:09:27 UTC (rev 5401) +++ trunk/Web/2.4/index.php 2008-05-30 23:36:17 UTC (rev 5402) @@ -4,8 +4,9 @@ $page = new Page; $page->printHead('WinMerge 2.4', WINMERGE_2_4); ?> +<h2>WinMerge 2.4</h2> <p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> -<h2>Features</h2> +<h3>Features</h3> <ul> <li>Visual differencing and merging of text files</li> <li>Flexible editor with syntax highlighting</li> @@ -24,17 +25,17 @@ <li>HTML-based <a href="manual/index.html">Manual</a></li> </ul> -<h2>Screenshot</h2> +<h3>Screenshot</h3> <p><img src="images/screenshot.gif" alt="Screenshot of WinMerge"></p> <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> -<h2>Installation</h2> +<h3>Installation</h3> <p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p> <p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more information, please see the <a href="manual/installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p> -<h2>Using WinMerge</h2> +<h3>Using WinMerge</h3> <p>For information on using WinMerge, see our <a href="manual/index.html">online Manual</a>, or you can <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=438564">download</a> a copy of the documentation for offline use.</p> Modified: trunk/Web/2.6/index.php =================================================================== --- trunk/Web/2.6/index.php 2008-05-30 12:09:27 UTC (rev 5401) +++ trunk/Web/2.6/index.php 2008-05-30 23:36:17 UTC (rev 5402) @@ -4,9 +4,10 @@ $page = new Page; $page->printHead('WinMerge 2.6', WINMERGE_2_6); ?> +<h2>WinMerge 2.6</h2> <p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> -<h2>Features</h2> +<h3>Features</h3> <ul> <li>Visual differencing and merging of text files</li> <li>Flexible editor with syntax highlighting, line numbers and word-wrap</li> @@ -26,18 +27,18 @@ <li><a href="manual/index.html">Online manual</a> and installed HTML Help manual</li> </ul> -<h2>Screenshots</h2> +<h3>Screenshots</h3> <p><a href="images/screenshot.png" target="_blank"><img class="thumbnail" src="images/screenshot_small.png" alt="File Comparison" border="0"></a> <a href="images/foldercmp.png" target="_blank"><img class="thumbnail" src="images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p> <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> -<h2>Installation</h2> +<h3>Installation</h3> <p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-Setup.exe">installer</a> and double-click it.</p> <p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.6.14-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p> -<h2>Using WinMerge</h2> +<h3>Using WinMerge</h3> <p>For information on using WinMerge, see our <a href="manual/index.html">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p> Modified: trunk/Web/2.8/index.php =================================================================== --- trunk/Web/2.8/index.php 2008-05-30 12:09:27 UTC (rev 5401) +++ trunk/Web/2.8/index.php 2008-05-30 23:36:17 UTC (rev 5402) @@ -7,7 +7,7 @@ <h2>WinMerge 2.8</h2> <p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> -<h2>Features</h2> +<h3>Features</h3> <ul> <li>Visual differencing and merging of text files</li> <li>Flexible editor with syntax highlighting, line numbers and word-wrap</li> @@ -28,18 +28,18 @@ <li><a href="manual/index.html">Online manual</a> and installed HTML Help manual</li> </ul> -<h2>Screenshots</h2> +<h3>Screenshots</h3> <p><a href="images/screenshot.png" target="_blank"><img class="thumbnail" src="images/screenshot_small.png" alt="File Comparison" border="0"></a> <a href="images/foldercmp.png" target="_blank"><img class="thumbnail" src="images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p> <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> -<h2>Installation</h2> +<h3>Installation</h3> <p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe">installer</a> and double-click it.</p> <p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p> -<h2>Using WinMerge</h2> +<h3>Using WinMerge</h3> <p>For information on using WinMerge, see our <a href="manual/index.html">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p> Modified: trunk/Web/index.php =================================================================== --- trunk/Web/index.php 2008-05-30 12:09:27 UTC (rev 5401) +++ trunk/Web/index.php 2008-05-30 23:36:17 UTC (rev 5402) @@ -5,9 +5,10 @@ $page->printHead('WinMerge', TAB_HOME); $stablerelease = $page->getStableRelease(); ?> +<h2>WinMerge</h2> <p>WinMerge is an Open Source (<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>) visual text file differencing and merging tool for Windows. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p> <?php $page->printDownloadNow(); ?> -<h2>Features</h2> +<h3>Features</h3> <ul> <li>Visual differencing and merging of text files</li> <li>Flexible editor with syntax highlighting, line numbers and word-wrap</li> @@ -28,31 +29,31 @@ <li><a href="2.8/manual/index.html">Online manual</a> and installed HTML Help manual</li> </ul> -<h2>Screenshots</h2> +<h3>Screenshots</h3> <p><a href="2.8/images/screenshot.png" target="_blank"><img class="thumbnail" src="2.8/images/screenshot_small.png" alt="File Comparison" border="0"></a> <a href="2.8/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.8/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p> <p>See the <a href="2.8/screenshots.php">screenshots page</a> for more screenshots.</p> -<h2>WinMerge <?php echo $stablerelease->getVersionNumber();?> - latest stable version</h2> +<h3>WinMerge <?php echo $stablerelease->getVersionNumber();?> - latest stable version</h3> <p><a href="2.8/index.php">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p> <p><a href="<?php echo $stablerelease->getDownload('setup.exe');?>">Download WinMerge <?php echo $stablerelease->getVersionNumber();?> Installer</a></p> -<h2>Installation</h2> +<h3>Installation</h3> <p>Just download the <a href="<?php echo $stablerelease->getDownload('setup.exe');?>">installer</a> and double-click it.</p> <p>Or you may simply unzip the <a href="<?php echo $stablerelease->getDownload('exe.zip');?>">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more information, please see the <a href="2.8/manual/Installing.html">Installation section</a> of the <a href="2.8/manual/index.html">Manual</a>.</p> -<h2>Using WinMerge</h2> +<h3>Using WinMerge</h3> <p>For information on using WinMerge, see our <a href="2.8/manual/index.html">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p> <p>Here is the current <a href="2.8/changelog.php">change log</a>.</p> -<h2>Support</h2> +<h3>Support</h3> <p>If you need support, look at our <a href="support/index.php">support page</a> for more information how you can get it.</p> -<h2>Developers</h2> +<h3>Developers</h3> <p>WinMerge is an open source project, which means that the program is maintained and developed by volunteers. If you''re interested in contributing work to the project, see our <a href="http://winmerge.org/Wiki/index.php?title=Help_Needed">developer page</a> for further information on how you may contribute.</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-06-23 20:11:46
|
Revision: 5510 http://winmerge.svn.sourceforge.net/winmerge/?rev=5510&view=rev Author: gerundt Date: 2008-06-23 13:11:38 -0700 (Mon, 23 Jun 2008) Log Message: ----------- Web: Add "tracker" tracker shortcut. Modified Paths: -------------- trunk/Web/.htaccess trunk/Web/robots.txt trunk/Web/support/tracker-shortcuts.php Modified: trunk/Web/.htaccess =================================================================== --- trunk/Web/.htaccess 2008-06-23 16:07:02 UTC (rev 5509) +++ trunk/Web/.htaccess 2008-06-23 20:11:38 UTC (rev 5510) @@ -41,6 +41,7 @@ RewriteRule ^support/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R] RewriteRule ^rfe/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R] RewriteRule ^todo/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R] +RewriteRule ^tracker/([0-9]+)$ http://sourceforge.net/support/tracker.php?aid=$1 [R] #Nicer Wiki URLs... RewriteEngine On Modified: trunk/Web/robots.txt =================================================================== --- trunk/Web/robots.txt 2008-06-23 16:07:02 UTC (rev 5509) +++ trunk/Web/robots.txt 2008-06-23 20:11:38 UTC (rev 5510) @@ -4,3 +4,4 @@ Disallow: /support/ Disallow: /rfe/ Disallow: /todo/ +Disallow: /tracker/ Modified: trunk/Web/support/tracker-shortcuts.php =================================================================== --- trunk/Web/support/tracker-shortcuts.php 2008-06-23 16:07:02 UTC (rev 5509) +++ trunk/Web/support/tracker-shortcuts.php 2008-06-23 20:11:38 UTC (rev 5510) @@ -14,6 +14,7 @@ $types['support'] = 'Support Request'; $types['rfe'] = 'Feature Request'; $types['todo'] = 'Todo Item'; + $types['tracker'] = 'Tracker Item'; ?> <form action="tracker-shortcuts.php" method="post"> <table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2008-06-24 21:45:46
|
Revision: 5522 http://winmerge.svn.sourceforge.net/winmerge/?rev=5522&view=rev Author: gerundt Date: 2008-06-24 14:44:47 -0700 (Tue, 24 Jun 2008) Log Message: ----------- PATCH: [ 1992426 ] Web: Changes for new stable release 2.8.4 Modified Paths: -------------- trunk/Web/2.8/index.php trunk/Web/WinMergePAD.xml trunk/Web/history.php trunk/Web/page.inc Modified: trunk/Web/2.8/index.php =================================================================== --- trunk/Web/2.8/index.php 2008-06-24 20:20:59 UTC (rev 5521) +++ trunk/Web/2.8/index.php 2008-06-24 21:44:47 UTC (rev 5522) @@ -34,8 +34,8 @@ <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p> <h3>Installation</h3> -<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe">installer</a> and double-click it.</p> -<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.zip">binary zip package</a> into the desired location, and run +<p>Just download the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.4-Setup.exe">installer</a> and double-click it.</p> +<p>Or you may simply unzip the <a href="http://downloads.sourceforge.net/winmerge/WinMerge-2.8.4-exe.zip">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p> <p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p> Modified: trunk/Web/WinMergePAD.xml =================================================================== --- trunk/Web/WinMergePAD.xml 2008-06-24 20:20:59 UTC (rev 5521) +++ trunk/Web/WinMergePAD.xml 2008-06-24 21:44:47 UTC (rev 5522) @@ -34,25 +34,25 @@ </Company_Info> <Program_Info> <Program_Name>WinMerge</Program_Name> - <Program_Version>2.8.0</Program_Version> - <Program_Release_Month>04</Program_Release_Month> - <Program_Release_Day>03</Program_Release_Day> + <Program_Version>2.8.4</Program_Version> + <Program_Release_Month>06</Program_Release_Month> + <Program_Release_Day>17</Program_Release_Day> <Program_Release_Year>2008</Program_Release_Year> <Program_Cost_Dollars>0</Program_Cost_Dollars> <Program_Cost_Other_Code /> <Program_Cost_Other /> <Program_Type>Freeware</Program_Type> - <Program_Release_Status>Major Update</Program_Release_Status> + <Program_Release_Status>Minor Update</Program_Release_Status> <Program_Install_Support>Install and Uninstall</Program_Install_Support> <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP,Windows2003,Windows Vista Starter,Windows Vista Home Basic,Windows Vista Home Premium,Windows Vista Business,Windows Vista Enterprise,Windows Vista Ultimate,Windows Vista Home Basic x64,Windows Vista Home Premium x64,Windows Vista Business x64,Windows Vista Enterprise x64,Windows Vista Ultimate x64</Program_OS_Support> - <Program_Language>Bulgarian,Catalan,ChineseSimplified,ChineseTraditional,Croatian,Czech,Danish,Dutch,English,French,German,Hungarian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Russian,Slovak,Spanish,Swedish,Turkish</Program_Language> + <Program_Language>Bulgarian,Catalan,ChineseSimplified,ChineseTraditional,Croatian,Czech,Danish,Dutch,English,French,German,Greek,Hungarian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Romanian,Russian,Slovak,Spanish,Swedish,Turkish,Ukrainian</Program_Language> <Program_Change_Info /> <Program_Specific_Category>Utilities</Program_Specific_Category> <Program_Category_Class>System Utilities::File Compression</Program_Category_Class> <Program_System_Requirements /> <File_Info> - <File_Size_Bytes>2972014</File_Size_Bytes> - <File_Size_K>2902</File_Size_K> + <File_Size_Bytes>3034033</File_Size_Bytes> + <File_Size_K>2963</File_Size_K> <File_Size_MB>3</File_Size_MB> </File_Info> <Expire_Info> @@ -84,7 +84,7 @@ <Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL> </Application_URLs> <Download_URLs> - <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe</Primary_Download_URL> + <Primary_Download_URL>http://downloads.sourceforge.net/winmerge/WinMerge-2.8.4-Setup.exe</Primary_Download_URL> <Secondary_Download_URL /> <Additional_Download_URL_1 /> <Additional_Download_URL_2 /> Modified: trunk/Web/history.php =================================================================== --- trunk/Web/history.php 2008-06-24 20:20:59 UTC (rev 5521) +++ trunk/Web/history.php 2008-06-24 21:44:47 UTC (rev 5522) @@ -8,6 +8,8 @@ <div class="infocard"> <h3>WinMerge 2.8</h3> <ul> + <li>WinMerge 2.8.4 (2008-06-17)</li> + <li>WinMerge 2.8.2 (2008-06-12)</li> <li>WinMerge 2.8.0 (2008-04-03)</li> </ul> <ul class="inline"> Modified: trunk/Web/page.inc =================================================================== --- trunk/Web/page.inc 2008-06-24 20:20:59 UTC (rev 5521) +++ trunk/Web/page.inc 2008-06-24 21:44:47 UTC (rev 5522) @@ -35,23 +35,23 @@ * Constructor */ function Page() { - $this->_title = 'WinMerge 2.6'; + $this->_title = 'WinMerge 2.8'; $this->_charset = 'ISO-8859-1'; $this->_description = 'WinMerge HomePage: Visual text file comparison and merging (Open Source software).'; $this->_keywords = 'WinMerge, free, download, Beyond Compare, Scooter Software, DLSuperC, DLSubCF, Component Software Diff, Viff, TreeDiff, FileSync, WMatch, Quick Spot, NTDMatch, windiff, WDIFF, FolderMatch, Merge 99, Merge99, PMdiff, PMDiff, PMDIFF, pmdiff, visual, visually, file, folder, directory, synchronization, comparison, graphical, document, text, compare, diff, difference, revision, Araxis, compare folders, compare files, synchronize folders, merge files, merge folders, Y2K, Year 2000, Year 2K, side-by-side, VFC, GFC, gdiff, CSDiff, OS2GFC, vdiff, ediff, fc'; $this->_rssfeeds = array(); - $this->_tab = WINMERGE_2_6; + $this->_tab = WINMERGE_2_8; /* _Stable Release */ $this->_stablerelease = new Release; - $this->_stablerelease->setVersionNumber('2.8.0'); - $this->_stablerelease->setDate('2008-04-03'); - $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-Setup.exe', 2972014); - $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.zip', 3234729); - $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-exe.7z', 1762030); - $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.0.zip', 1287510); - $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.0.7z', 753830); - $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-src.zip', 8449662); - $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.0-src.7z', 4299223); + $this->_stablerelease->setVersionNumber('2.8.4'); + $this->_stablerelease->setDate('2008-06-17'); + $this->_stablerelease->addDownload('setup.exe', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.4-Setup.exe', 3034028); + $this->_stablerelease->addDownload('exe.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.4-exe.zip', 3321093); + $this->_stablerelease->addDownload('exe.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.4-exe.7z', 1808742); + $this->_stablerelease->addDownload('rt.zip', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.4.zip', 1287510); + $this->_stablerelease->addDownload('rt.7z', 'http://downloads.sourceforge.net/winmerge/Runtimes-2.8.4.7z', 753831); + $this->_stablerelease->addDownload('src.zip', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.4-src.zip', 8571235); + $this->_stablerelease->addDownload('src.7z', 'http://downloads.sourceforge.net/winmerge/WinMerge-2.8.4-src.7z', 4359449); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |