From b52ebbe6940484a7c8cf64f53ccfc10afb053f78 Mon Sep 17 00:00:00 2001
From: koldo <koldo@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 30 Mar 2010 19:50:06 +0000
Subject: [PATCH] .uppweb: Added space between texts in footer. Better Russian
 translation

git-svn-id: svn://ultimatepp.org/upp/trunk@2287 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppbox/uppweb/uppweb.upp |  1 +
 uppbox/uppweb/www.cpp    | 12 ++++++------
 uppbox/uppweb/www.t      | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/uppbox/uppweb/uppweb.upp b/uppbox/uppweb/uppweb.upp
index 7046ccafc..50a57f877 100644
--- a/uppbox/uppweb/uppweb.upp
+++ b/uppbox/uppweb/uppweb.upp
@@ -20,6 +20,7 @@ file
 	topictree.cpp,
 	cpp.cpp,
 	www.cpp,
+	gsoc.tpp,
 	www.tpp charset "UTF-8",
 	testing.tpp,
 	article.tpp,
diff --git a/uppbox/uppweb/www.cpp b/uppbox/uppweb/www.cpp
index 0dee98aca..fe72a1749 100644
--- a/uppbox/uppweb/www.cpp
+++ b/uppbox/uppweb/www.cpp
@@ -465,9 +465,11 @@ void ExportPage(int i)
 		}
 	}
 	if (!strlang.IsEmpty())
-		qtflangs += Format(String("[2 ") + t_("This page is also in %s") + ".]", strlang);
-	String help = "topic://uppweb/www/contribweb$" + ToLower(LNGAsText(languages[ilang]));
-	qtflangs += String("[^") + help + "^ [<A2 " + t_("Do you want to contribute?") + "]]";
+		qtflangs += Format(String("[2  ") + t_("This page is also in %s") + ".]", strlang);
+	if (tt[i].title.Find("How to contribute. Web page") < 0) {
+		String help = "topic://uppweb/www/contribweb$" + ToLower(LNGAsText(languages[ilang]));
+		qtflangs += " " + String("[^") + help + "^ [<A2 " + t_("Do you want to contribute?") + "]]";
+	}
 	String langs = QtfAsHtml(qtflangs, css, links, labels, targetdir, links[i]);
 	String page = QtfAsHtml(tt[i], css, links, labels, targetdir, links[i]);
 	Color paper = SWhite;
@@ -629,8 +631,6 @@ GUI_APP_MAIN
 			cfgloaded = true;
 		}
 	}
-	doSvn = true;
-	cfgloaded = false;
 	if (!cfgloaded) {
 		data.rootdir   = rootdir;
 		data.targetdir = targetdir;
@@ -640,7 +640,7 @@ GUI_APP_MAIN
 		data.outPdf    = outPdf;
 		data.doSvn	   = doSvn;
 		StoreAsXMLFile(data, NULL, configFile);
-	}	
+	}
 	if (!DirectoryExists(rootdir)) {
 		Exclamation ("Directory " + DeQtf(rootdir) + " does not exist");
 		return;
diff --git a/uppbox/uppweb/www.t b/uppbox/uppweb/www.t
index 22ec38d25..915b62989 100644
--- a/uppbox/uppweb/www.t
+++ b/uppbox/uppweb/www.t
@@ -4,19 +4,19 @@
 // topictree.cpp
 
 T_("This page has not been translated yet")
-ruRU("\320\255\321\202\320\260 \321\201\321\202\321\200\320\260\320\275\320\270\321\206\320\260 \320\265\321\211\320\265 \320\275\320\265 \320\277\320\265\321\200\320\265\320\262\320\265\320\264\320\265\320\275\320\260 \320\265\321\211\320\265")
+ruRU("\320\255\321\202\320\260 \321\201\321\202\321\200\320\260\320\275\320\270\321\206\320\260 \320\265\321\211\320\265 \320\275\320\265 \320\277\320\265\321\200\320\265\320\262\320\265\320\264\320\265\320\275\320\260")
 
 T_("Do you want to translate it?")
-ruRU("\320\222\321\213 \321\205\320\276\321\202\320\270\321\202\320\265 \320\277\320\265\321\200\320\265\320\262\320\265\321\201\321\202\320\270 \320\265\320\263\320\276?")
+ruRU("\320\222\321\213 \321\205\320\276\321\202\320\270\321\202\320\265 \320\277\320\265\321\200\320\265\320\262\320\265\321\201\321\202\320\270?")
 
 
 // www.cpp
 
 T_("Using %s")
-ruRU("Using %s")
+ruRU("\320\230\321\201\320\277\320\276\320\273\321\214\320\267\320\276\320\262\320\260\320\275 %s")
 
 T_("%s reference")
-ruRU("%s \321\201\321\201\321\213\320\273\320\272\320\270")
+ruRU("%s \321\201\321\201\321\213\320\273\320\272\320\260")
 
 T_("Last edit by %s on %s")
 ruRU("\320\237\320\276\321\201\320\273\320\265\320\264\320\275\320\265\320\265 \320\270\320\267\320\274\320\265\320\275\320\265\320\275\320\270\320\265 %s \320\262 %s")
@@ -25,7 +25,7 @@ T_("This page is also in %s")
 ruRU("\320\241\321\202\321\200\320\260\320\275\320\270\321\206\320\260 \320\264\320\276\321\201\321\202\321\203\320\277\320\275\320\260 \320\275\320\260 %s \321\217\320\267\321\213\320\272\320\265")
 
 T_("Do you want to contribute?")
-ruRU("\320\222\321\213 \321\205\320\276\321\202\320\270\321\202\320\265 \320\262\320\275\320\265\321\201\321\202\320\270 \321\201\320\262\320\276\320\271 \320\262\320\272\320\273\320\260\320\264?")
+ruRU("\320\222\321\213 \321\205\320\276\321\202\320\270\321\202\320\265 \320\262\320\275\320\265\321\201\321\202\320\270 \320\262\320\272\320\273\320\260\320\264?")
 
 T_("Overview")
 ruRU("\320\236\320\261\320\267\320\276\321\200")