BUG: [ 1552149 ] Web: CVS link in sidebar

diff --git a/Web/Changes.txt b/Web/Changes.txt
index 9d50ce4..8027e69 100644 (file)
--- a/Web/Changes.txt
+++ b/Web/Changes.txt
@@ -1,3 +1,9 @@
+2006-09-05 Tim
+ BUG: [ 1552149 ] Web: CVS link in sidebar
+  Web: links.php page.inc
+  Web\developer: index.php
+  Web\developer\l10n: instructions.php
+
 2006-09-04 Tim
  PATCH: [ 1552144 ] Web: Fixes to developers-needed -page
   Web\developer: needed.php

diff --git a/Web/developer/index.php b/Web/developer/index.php
index 9148fba..5320409 100644 (file)
--- a/Web/developer/index.php
+++ b/Web/developer/index.php
@@ -37,8 +37,7 @@
   print("</ul>\n");
 ?>
 <p>Look here for more information on how to <a href="needed.php">develop</a> and/or 
-<a href="l10n/index.php">translate</a> WinMerge, 
-and read how to use <a href="wincvs.php">WinCVS</a> with our project.</p>
+<a href="l10n/index.php">translate</a> WinMerge.</p>
 <?php
   $page->printFoot();
 ?>
\ No newline at end of file

diff --git a/Web/developer/l10n/instructions.php b/Web/developer/l10n/instructions.php
index 85ecbbd..d514366 100644 (file)
--- a/Web/developer/l10n/instructions.php
+++ b/Web/developer/l10n/instructions.php
@@ -8,7 +8,7 @@
 <h2>Translations instructions</h2>
 <ul>
   <li><a href="#translate">I want to translate into my own language</a></li>
-  <li><a href="#developer">Instructions for those who know CVS and Visual C++</a></li>
+  <li><a href="#developer">Instructions for those who know Subversion and Visual C++</a></li>
   <li><a href="#everybody">Instructions for everybody else</a></li>
   <li><a href="#shellextension">ShellExtension</a></li>
   <li><a href="#installer">Translating Installer</a></li>
@@ -24,10 +24,10 @@
 
 <p class="important">Please remember WinMerge is an Open Source project. Send translation updates to us as <code>.rc</code> file source patches. We WON't accept modified <code>.lang</code> binary files. We need the sources.</p>
 
-<h3><a name="developer">Instructions for those who know CVS and Visual C++</a></h3>
-<p>Grab a copy of the source from CVS (<a href="../wincvs.php">WinCVS Hints</a>).</p>
+<h3><a name="developer">Instructions for those who know Subversion and Visual C++</a></h3>
+<p>Grab a copy of the source from <a href="http://sourceforge.net/svn/?group_id=13216">Subversion</a>.</p>
 <p>You will need to translate all the strings in <code>Merge.rc</code> to your language. Make a <code>MergeYourLanguage.rc</code> and upload it to SF.net as a patch <a href="http://sourceforge.net/tracker/?group_id=13216&amp;atid=313216">here</a>.
-<p>Then one of the developers will commit it to CVS and it will be released with the next release.</p>
+<p>Then one of the developers will commit it to Subversion and it will be released with the next release.</p>
 <p class="note">Please try to avoid changing dialog layout when translating.
 The layout should be shared by all translations as much as possible, to make merging (and future translation changes) easier.
 You can of course make controls wider to fit longer texts, but you should not move buttons and other controls if not really necessary.<br /><br />
@@ -83,11 +83,11 @@ If you want to improve dialog layout (we welcome UI improvements) you should sub
 
 <h3><a name="shellextension">ShellExtension</a></h3>
 <p>ShellExtension can be translated by translating <code>.rc</code> resource file similarly to WinMerge executable.
-ShellExtension resource files are in <code><a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/ShellExtension/Languages/">WinMerge\ShellExtension\Languages\</a></code> folder.
+ShellExtension resource files are in <code><a href="http://svn.sourceforge.net/winmerge/trunk/ShellExtension/Languages/">WinMerge\ShellExtension\Languages\</a></code> folder.
 There are only few strings to translate so it should be fast to do.</p>
 
 <h3><a name="installer">Translating Installer</a></h3>
-<p>Installer translation files are in <code><a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/InnoSetup/Languages/">WinMerge\InnoSetup\Languages\</a></code> folder.
+<p>Installer translation files are in <code><a href="http://svn.sourceforge.net/winmerge/trunk/Installer/InnoSetup/Languages/">WinMerge\Installer\InnoSetup\Languages\</a></code> folder.
 Look for a file named by your language. If one does not yet exist, you should look for InnoSetup translations in <a href="http://www.jrsoftware.org/files/istrans/">http://www.jrsoftware.org/files/istrans/</a>.</p>
 
 <p>After you open the file, scroll to end of it, there are few custom strings you
@@ -101,8 +101,8 @@ from your improvements. We'll pick those updates then also.</p>
 <h3><a name="readme">Translating ReadMe.txt</a></h3>
 <p>Please consider translating also <code>ReadMe.txt</code> file - it is shown in end of installer
 and is added to Start-menu. Translated versions of <code>ReadMe.txt</code> are
-in <code><a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/Docs/Users/Languages/">WinMerge\Docs\Users\Languages\</a></code> folder. And master <code>ReadMe.txt</code> is
-in <code><a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/Docs/Users/ReadMe.txt">WinMerge\Docs\Users\ReadMe.txt</a></code>.</p>
+in <code><a href="http://svn.sourceforge.net/winmerge/trunk/Docs/Users/Languages/">WinMerge\Docs\Users\Languages\</a></code> folder. And master <code>ReadMe.txt</code> is
+in <code><a href="http://svn.sourceforge.net/winmerge/trunk/Docs/Users/ReadMe.txt">WinMerge\Docs\Users\ReadMe.txt</a></code>.</p>
 
 <?php
   $page->printFoot();

diff --git a/Web/links.php b/Web/links.php
index 6aaecde..4da2615 100644 (file)
--- a/Web/links.php
+++ b/Web/links.php
@@ -15,13 +15,8 @@
   <dd><b>GnuWin32</b> provides Win32 ports of tools with a <a href="http://www.gnu.org/">GNU</a> or similar <a href="http://opensource.org/licenses/">open source license</a>.</dd>
   <dt><a href="https://sourceforge.net/projects/externaldiff">External diff Tool</a></dt>
   <dd><b>External diff Tool</b> is an <a href="http://www.eclipse.org/">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool.</dd>
-</dl>
-<h3>CVS</h3>
-<dl>
-  <dt><a href="http://cvsgui.sourceforge.net/">WinCVS</a></dt>
-  <dd><b>WinCVS</b> is a GUI front-end for <acronym title="Concurrent Versions System">CVS</acronym>.</dd>
-  <dt><a href="http://www.tortoisecvs.org/">TortoiseCVS</a></dt>
-  <dd><b>TortoiseCVS</b> lets you work with files under <acronym title="Concurrent Versions System">CVS</acronym> version control directly from Windows Explorer.</dd>
+  <dt><a href="http://tortoisesvn.tigris.org/">TortoiseSVN</a></dt>
+  <dd><b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer.</dd>
 </dl>
 <h3>Regular expressions</h3>
 <dl>

diff --git a/Web/page.inc b/Web/page.inc
index 22df6ec..31bd222 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -232,10 +232,10 @@
           $temp .= "<h2><a href=\"/developer/index.php\">Developers</a></h2>\n";
           $temp .= "<ul>\n";
           $temp .= "  <li><a href=\"http://sourceforge.net/projects/winmerge/\">Project Home</a></li>\n";
-          $temp .= "  <li>CVS\n";
+          $temp .= "  <li>Subversion\n";
           $temp .= "    <ul>\n";
-          $temp .= "      <li><a href=\"http://winmerge.cvs.sourceforge.net/winmerge/\">Browse CVS Tree</a></li>\n";
-          $temp .= "      <li><a href=\"http://sourceforge.net/cvs/?group_id=13216\">CVS Client Access</a></li>\n";
+          $temp .= "      <li><a href=\"http://svn.sourceforge.net/winmerge\">Browse Subversion Tree</a></li>\n";
+          $temp .= "      <li><a href=\"http://sourceforge.net/svn/?group_id=13216\">Subversion Access</a></li>\n";
           $temp .= "    </ul>\n";
           $temp .= "  </li>\n";
           $temp .= "  <li><a href=\"/developer/l10n/index.php\">Translations</a>\n";