Synced help files.

12 files changed, 83 insertions, 32 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7c8d668..d93cd59 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,10 @@ changelog.txt - What has been done to WinDirStat (newest top)
 Last modified: $Date$
 =============================================================
 
+2004-12-25	bseifert
+	* Documented Attributes column in helpfiles.
+	* Documented Junction points in helpfiles.
+	
 2004-12-24	bseifert
 	* setup: included Polish translation (thanks to Darek).
 	* wdsh0415: Polish help file complete! (Thanks to Darek).
@@ -143,8 +147,7 @@ Last modified: $Date$
 	  added items.
 
 2004-01-22	bseifert
-	* Release of 1.1.0 with unknown changes by Bernhard.
-      [This entry was added as late as 2004-11-06]
+	* Release of 1.1.0. (Decided to call it 1.1.0 instead of 1.0.2)
 
 2004-01-20	bseifert
 	* Temporarily removed French translation from setup and Aboutbox for release 1.0.2.
diff --git a/TODO.txt b/TODO.txt
index e7bbe0f..f4fd466 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,19 +2,24 @@ TODO.txt - What still has to been done to WinDirStat
 Last modified: $Date$
 =============================================================
 
-- Translate IDS_ABOUT_AUTHORS and IDS_ABOUT_AUTHORSTEXTs
+- Polish helpfile: 
+	translate "Attributes" section in directorytree.htm
+	translate "Junction Points" section in configuration.htm
+
+- Polish windirstat.rc: translate "Use this language for date/time and number formatting",
+  translate IDS_TREECOL_ATTRIBUTES.
+
+- Russian resource: abbreviate IDS_USERDEFINEDCLEANUPd 
+
+- Polish, French, Russian: translate IDS_ABOUT_AUTHORS and IDS_ABOUT_AUTHORSTEXTs
+
+- Increment RESOURCEVERSION.
 
-- Setup: Translate IDS_CREATEINGSENDTOSHORTCUT, IDC_SHORTCUTSENDTO and
-  IDS_TREECOL_ATTRIBUTES.
-  
 - Sync testplan.
   
-- Sync Online help. 
-
 - Execute testplan.
 
 - Unicode file releases
-  => bseifert
 
 - Sync Website
 
diff --git a/common/version.h b/common/version.h
index 0c10469..db5c871 100644
--- a/common/version.h
+++ b/common/version.h
@@ -44,7 +44,7 @@
 // Format: #define blank LINKCOUNT blanks decimal
 // Reset this to zero only when you increment VERNUM_MAJOR/MINOR/REVISION.
 
-#define LINKCOUNT  443
+#define LINKCOUNT  456
 
 //-------------------------------------------------------------------
 // Release candidate number. Relevant for BC_RELEASECANDIDATE.
@@ -114,6 +114,9 @@
 
 
 // $Log$
+// Revision 1.23  2004/12/25 13:41:46  bseifert
+// Synced help files.
+//
 // Revision 1.22  2004/12/24 10:39:27  bseifert
 // Added Polish setup and  Polish help file.
 //
diff --git a/wdsh0407/configuration.htm b/wdsh0407/configuration.htm
index 750525a..4914618 100644
--- a/wdsh0407/configuration.htm
+++ b/wdsh0407/configuration.htm
@@ -14,6 +14,14 @@
 			Festplatte an. Hier können Sie dieses Verhalten ändern. (Mountpoints auf 
 			UNC-Laufwerken werden nicht erkannt.)
 		</p>
+		<p><u>Symbolischen Verzeichnislinks folgen (außer Volume Mount Points) (nur NT und höher)</u>.
+			Unter NTFS können Zielverzeichnisse in ein anderes Verzeichnis eingepfropft werden
+			(Junction Points). 
+			(Sie brauchen ein Produkt wie z.B. awxlink, downloadbar von 
+			<a href="http://www.arniworld.de/">http://www.arniworld.de/</a>, um Junction points anzulegen.)
+			Standardmäßig stoppt WinDirStat mit dem Einlesen an diesen Punkten.
+			Hier können Sie dieses Verhalten ändern.
+		</p>
 		<p><u>Listenstil</u>. Diese Optionen, Raster und Streifen, gelten für alle Listen
 		in WinDirStat.
 		</p>
diff --git a/wdsh0407/directorytree.htm b/wdsh0407/directorytree.htm
index 63a4874..5babc28 100644
--- a/wdsh0407/directorytree.htm
+++ b/wdsh0407/directorytree.htm
@@ -45,6 +45,11 @@
 					"Verzeichnisse".</li>
 				<li>
 					<u>Letzte Änderung</u>. Datum der letzten im Teilbaum erfolgten Änderung.</li>
+				<li>
+					<u>Attribute</u>. Datei-/Verzeichnisattribute. R = schreibgeschützt (read-only), 
+					H = versteckt (hidden), S = System, A = archivierbar, C = komprimiert (compressed), 
+					E = verschlüsselt (encrypted).</li>
+
 			</ul>
 		</p>
 		<h3>Bedienung</h3>
diff --git a/wdsh0415/configuration.htm b/wdsh0415/configuration.htm
index 277904d..cddc249 100755
--- a/wdsh0415/configuration.htm
+++ b/wdsh0415/configuration.htm
@@ -8,27 +8,37 @@
 	<BODY>
 		<h2>Konfiguracja</h2>
 		<h3>Ogólne</h3>
-		<p><u>Ograniczenia krzy¿owych systemów plików (NT lub wy¿szy)</u>. W systemie NTFS mo¿na
-			montowaæ katalogi. Domy¶lnie WinDirStat przestaje skanowaæ po napotkaniu takiego
-			punktu montowania, tzn. pokazuje u¿ycie tylko w <i>jednym</i> systemie plików.
-			Mo¿na tutaj zmieniæ domy¶lne ustawienia programu. (Punkty montowania nie s±
-			rozpoznawane dla dysków UNC.)
+		<p><u>Ograniczenia krzy¿owych systemów plików (NT lub wy¿szy)</u>. W systemie NTFS 
+			mo¿na montowaæ katalogi. Domy¶lnie WinDirStat przestaje skanowaæ po napotkaniu 
+			takiego punktu montowania, tzn. pokazuje u¿ycie tylko w <i>jednym</i> systemie 
+			plików. Mo¿na tutaj zmieniæ domy¶lne ustawienia programu. (Punkty montowania 
+			nie s± rozpoznawane dla dysków UNC.)
 		</p>
-		<p><u>Styl listy</u>. Opcje maj± zastosowanie do wszystkich list w programie WinDirStat.
+		<p><u>Follow Junction Points (except Volume Mount Points) (only NT and higher)</u>. 
+			Under NTFS target folders can be grafted onto another folder by using junction 
+			points. 
+			(You need a third-party tool, e.g. awxlink, downloadable from 
+			<a href="http://www.arniworld.de/">http://www.arniworld.de/</a>, to create junction points.)
+			By default WinDirStat stops reading at these junction points. Here you 
+			can change this behavior.
 		</p>
-		<p><u>Jêzyk</u>. Oprócz wbudowanego jêzyka angielskiego, za pomoc± tej opcji mo¿na
-			zmieniæ jêzyk na inny, spo¶ród oferowanych przez program WinDirStat (patrz
-			dostêpno¶æ biblioteki wdsrxxxx.dll). Zmiana jêzyka jest widoczna,
-			po restarcie programu.</p>
+		<p><u>Styl listy</u>. Opcje maj± zastosowanie do wszystkich list w programie 
+			WinDirStat.
+		</p>
+		<p><u>Jêzyk</u>. Oprócz wbudowanego jêzyka angielskiego, za pomoc± tej opcji mo¿na 
+			zmieniæ jêzyk na inny, spo¶ród oferowanych przez program WinDirStat (patrz 
+			dostêpno¶æ biblioteki wdsrxxxx.dll). Zmiana jêzyka jest widoczna, po restarcie 
+			programu.</p>
 		<h3>Lista katalogów</h3>
-		<p>Dwie opcje kontroluj±ce kolumny 'Poddrzewo procentowo' i 'Procentowo' wy¶wietlane
-		w czasie skanowania. Mo¿na wybraæ kolory wy¶wietlane dla procentowej prezentacji
-		poddrzewa.</p>
+		<p>Dwie opcje kontroluj±ce kolumny 'Poddrzewo procentowo' i 'Procentowo' 
+			wy¶wietlane w czasie skanowania. Mo¿na wybraæ kolory wy¶wietlane dla 
+			procentowej prezentacji poddrzewa.</p>
 		<h3>Mapa drzewa</h3>
-		<p>Opcje do zarz±dzania wygl±dem mapy drzewa; cieniowaniem, liniami siatki, kolorem
-		wybranego prostok±ta.</p>
+		<p>Opcje do zarz±dzania wygl±dem mapy drzewa; cieniowaniem, liniami siatki, kolorem 
+			wybranego prostok±ta.</p>
 		<h3>Porz±dkowanie</h3>
-		<p>Mo¿esz tutaj zdefiniowaæ <a href="userdefinedcleanups.htm">swoje w³asne porz±dkowania</a>.
+		<p>Mo¿esz tutaj zdefiniowaæ <a href="userdefinedcleanups.htm">swoje w³asne 
+				porz±dkowania</a>.
 		</p>
 		<h3>Raport</h3>
 		<p>Administratorzy mog± okre¶liæ wygl±d wysy³anego raportu.</p>
diff --git a/wdsh0415/directorytree.htm b/wdsh0415/directorytree.htm
index 4b2aca6..44d306e 100755
--- a/wdsh0415/directorytree.htm
+++ b/wdsh0415/directorytree.htm
@@ -45,6 +45,9 @@
 					<u>Elementy</u>. Liczba elementów w poddrzewie. Suma ilo¶ci "Plików" i "Podkatalogów".</li>
 				<li>
 					<u>Ostatnia modyfikacja</u>. Data ostatniej modyfikacji w poddrzewie.</li>
+				<li>
+					<u>Attributes</u>. File/folder attributes. R = read-only, H = hidden, S = system,
+					A = archive, C = compressed, E = encrypted.</li>
 			</ul>
 		</p>
 		<h3>Operacje</h3>
diff --git a/wdsh0415/toc.hhc b/wdsh0415/toc.hhc
index 37ca743..dfe722a 100755
--- a/wdsh0415/toc.hhc
+++ b/wdsh0415/toc.hhc
@@ -2,6 +2,7 @@
 <HTML>
 <HEAD>
 <meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1">
+<META http-equiv="Content-Type" content="text/html; charset=iso-8859-2">
 <!-- Sitemap 1.0 -->
 </HEAD><BODY>
 <OBJECT type="text/site properties">
@@ -37,11 +38,11 @@
 		<param name="Local" value="selectdrivesdialog.htm">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="Porz±dkowania">
+		<param name="Name" value="Porzadkowania">
 		<param name="Local" value="actions.htm">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
-		<param name="Name" value="Porz±dkowania u¿ytkownika">
+		<param name="Name" value="Porzadkowania u¿ytkownika">
 		<param name="Local" value="userdefinedcleanups.htm">
 		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
diff --git a/wdshelp/configuration.htm b/wdshelp/configuration.htm
index eb9e26a..23ccb78 100644
--- a/wdshelp/configuration.htm
+++ b/wdshelp/configuration.htm
@@ -13,6 +13,13 @@
 			points, i.e. it shows only the usage of <i>one</i> file system. Here you can 
 			change this behavior. (No mount points are recognized on UNC drives.)
 		</p>
+		<p><u>Follow Junction Points (except Volume Mount Points) (only NT and higher)</u>.
+			Under NTFS target folders can be grafted onto another folder by using junction points.
+			(You need a third-party tool, e.g. awxlink, downloadable from 
+			<a href="http://www.arniworld.de/">http://www.arniworld.de/</a>, to create junction points.)
+			By default WinDirStat stops reading at these junction points. Here you can
+			change this behavior.
+		</p>
 		<p><u>List Style</u>. These options, grid and stripes, apply to all lists in WinDirStat.
 		</p>
 		<p><u>Language</u>. In addition to the built-in language English, this combo box 
diff --git a/wdshelp/directorytree.htm b/wdshelp/directorytree.htm
index b72a2f5..b52ba0b 100644
--- a/wdshelp/directorytree.htm
+++ b/wdshelp/directorytree.htm
@@ -43,6 +43,9 @@
 					<u>Items</u>. Number of items in the subtree. Sum of "Files" and "Subdirs".</li>
 				<li>
 					<u>Last Change</u>. Date of the last modification in the subtree.</li>
+				<li>
+					<u>Attributes</u>. File/folder attributes. R = read-only, H = hidden, S = system,
+					A = archive, C = compressed, E = encrypted.</li>
 			</ul>
 		</p>
 		<h3>Operation</h3>
diff --git a/wdsr0419/windirstat.rc b/wdsr0419/windirstat.rc
index d89c920..9296e7f 100644
--- a/wdsr0419/windirstat.rc
+++ b/wdsr0419/windirstat.rc
@@ -427,7 +427,7 @@ BEGIN
                     TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,347,17,16,104
     RTEXT           "Èñòî÷íèê ñâåòà",IDC_STATIC,246,147,59,8
     LTEXT           "Static",IDC_LIGHTSOURCE,313,146,58,48,WS_TABSTOP
-    PUSHBUTTON      "",IDC_RESET,242,167,55,22,BS_MULTILINE
+    PUSHBUTTON      "",IDC_RESET,242,160,60,29,BS_MULTILINE
     GROUPBOX        "Ñòèëü",IDC_STATIC,7,146,63,49
     CONTROL         "&KDirStat",IDC_KDIRSTAT,"Button",BS_AUTORADIOBUTTON | 
                     WS_GROUP | WS_TABSTOP,12,159,42,10
@@ -497,7 +497,7 @@ BEGIN
     DEFPUSHBUTTON   "ÎÊ",IDOK,154,212,50,14
     PUSHBUTTON      "Îòìåíà",IDCANCEL,303,212,50,14
     LTEXT           "Îò:",IDC_STATIC,7,7,20,8
-    LTEXT           "Êîìó:",IDC_STATIC_TO,177,7,19,8
+    LTEXT           "Êîìó:",IDC_STATIC_TO,172,7,19,8
     LTEXT           "<from>",IDC_FROM,53,7,120,8
     LTEXT           "<to>",IDC_TO,214,7,139,8
     GROUPBOX        "Âàæíîñòü",IDC_STATIC_SEVERITY,7,33,346,24,0,
@@ -507,7 +507,7 @@ BEGIN
                     IDC_STATIC,7,79,346,17
     LTEXT           "Ïðèëîæåíèå:",IDC_STATIC,7,18,43,8
     LTEXT           "<application>",IDC_APPLICATION,53,18,120,8
-    LTEXT           "Ïëàòôîðìà:",IDC_STATIC_PLATFORM,177,18,34,8
+    LTEXT           "Ïëàòôîðìà:",IDC_STATIC_PLATFORM,172,18,41,8
     LTEXT           "<platform>",IDC_PLATFORM,214,18,139,8
     LTEXT           "Äëÿ ñîîáùåíèÿ îá îøèáêå, áûëî áû èäåàëüíî, åñëè áû âû îïèñàëè ñèìïòîì, äîñëîâíî ïðèâåëè òåêñò îøèáêè, è, ïðè âîçìîæíîñòè, øàãè ÷òîáû âîñïðîèçâåñòè ïîâäåíèå.",
                     IDC_HINT,7,99,346,19
diff --git a/windirstat/ReportBugDlg.cpp b/windirstat/ReportBugDlg.cpp
index e717fc3..c4b7916 100644
--- a/windirstat/ReportBugDlg.cpp
+++ b/windirstat/ReportBugDlg.cpp
@@ -53,7 +53,7 @@ CReportBugDlg::CReportBugDlg(CWnd* pParent /*=NULL*/)
 	, m_application(_T(""))
 	, m_platform(_T(""))
 	, m_hint(_T(""))
-	, m_severity(SEV_NORMAL)
+	, m_severity(SEV_FEEDBACK)
 	, m_inAWord(_T(""))
 	, m_text(_T(""))
 	, m_layout(this, _T("rbdlg"))
@@ -241,6 +241,9 @@ void CReportBugDlg::OnDestroy()
 }
 
 // $Log$
+// Revision 1.7  2004/12/25 13:41:47  bseifert
+// Synced help files.
+//
 // Revision 1.6  2004/12/19 10:52:39  bseifert
 // Minor fixes.
 //