summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--htroot/Connections_p.html2
-rw-r--r--htroot/Network.html4
-rw-r--r--htroot/Network.xml4
-rw-r--r--htroot/Skins_p.html2
-rw-r--r--locales/de.lng2
-rw-r--r--source/de/anomic/plasma/plasmaCrawlStacker.java2
-rw-r--r--source/de/anomic/plasma/plasmaCrawlWorker.java2
-rw-r--r--yacy.logging2
8 files changed, 10 insertions, 10 deletions
diff --git a/htroot/Connections_p.html b/htroot/Connections_p.html
index c964224fd..c7507cff7 100644
--- a/htroot/Connections_p.html
+++ b/htroot/Connections_p.html
@@ -11,7 +11,7 @@
<h2>Connection Tracking</h2>
<p>
<h3>Incoming Connections</h3>
-Showing #[numActiveRunning]# active connections, #[numActivePending]# pending connections from a max. of #[numMax]# allowed incoming connections.<br>
+Showing #[numActiveRunning]# active, #[numActivePending]# pending connections from a max. of #[numMax]# allowed incoming connections.<br>
<table border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader" valign="bottom">
<td class="small">Protocol</td>
diff --git a/htroot/Network.html b/htroot/Network.html
index 529fb8ce4..46e219d4a 100644
--- a/htroot/Network.html
+++ b/htroot/Network.html
@@ -211,10 +211,10 @@ YaCy Cluster Indexing Speed: #[gppm]# Pages Per Minute (Accumulated PPM over Act
<p>
#(comment)#
::
-You are in online mode, but probably no internet resource is available. Please check you internet connection.
+You are in online mode, but probably no internet resource is available. Please check your internet connection.
::
You are either not in online mode or you do not use the proxy option.
-To get connection to the YACY network, you must use the proxy by setting your browsers settings
+To get connection to the YaCy network, you must use the proxy by setting your browser's settings
('on-demand - mode', see <a href="http://www.yacy.net/yacy/Installation.html#wininst">here</a>
for an installation guide) or you can go online by activating the permanent online mode.
To do this, press this button:
diff --git a/htroot/Network.xml b/htroot/Network.xml
index 9a5888c7c..b5b1d25c3 100644
--- a/htroot/Network.xml
+++ b/htroot/Network.xml
@@ -44,8 +44,8 @@
<status>#[comment]#</status>
<!--
0 - nothing
- 1 - online Mode, but no Internet availible
- 2 - not in online Mode
+ 1 - online mode, but no Internet available
+ 2 - not in online mode
-->
</peers>
#(/table)# \ No newline at end of file
diff --git a/htroot/Skins_p.html b/htroot/Skins_p.html
index a4c5cc45f..e7e7b5d1a 100644
--- a/htroot/Skins_p.html
+++ b/htroot/Skins_p.html
@@ -27,7 +27,7 @@ Skins:<br>
</form>
<form action="Skins_p.html">
-Install new Skin from URL:<br>
+Install new skin from URL:<br>
<input type="text" name="url" size="30"><br><input type="checkbox" name="use_skin" value="on" checked="true">Use this skin<br><br>
<input type="submit" value="install">
</form>
diff --git a/locales/de.lng b/locales/de.lng
index 9cb4bbf2e..7f4b5809f 100644
--- a/locales/de.lng
+++ b/locales/de.lng
@@ -975,7 +975,7 @@ Current skin:==Verwendeter Skin:
Skins:==Skins:
"Use"=="Benutzen"
"Delete"=="L&ouml;schen"
-Install new Skin from URL:==Installiere einen neuen Skin von folgender URL:
+Install new skin from URL:==Installiere einen neuen Skin von folgender URL:
Use this skin==Benutze diesen Skin
"install"=="Installieren"
Unable to get URL:==Nicht m&ouml;glich die angegebene Datei von folgender URL zu installieren:
diff --git a/source/de/anomic/plasma/plasmaCrawlStacker.java b/source/de/anomic/plasma/plasmaCrawlStacker.java
index 9eac20cef..9bdef67d7 100644
--- a/source/de/anomic/plasma/plasmaCrawlStacker.java
+++ b/source/de/anomic/plasma/plasmaCrawlStacker.java
@@ -316,7 +316,7 @@ public final class plasmaCrawlStacker {
/*
urlPool.errorURL.newEntry(nexturl, referrerHash, initiatorHash, yacyCore.seedDB.mySeed.hash,
name, reason, new bitfield(plasmaURL.urlFlagLength), false);*/
- this.log.logFine("Crawling of URL '" + nexturlString + "' disallowed by robots.txt." +
+ this.log.logFine("Crawling of URL '" + nexturlString + "' disallowed by robots.txt. " +
"Stack processing time: " + (System.currentTimeMillis()-startTime));
return reason;
}
diff --git a/source/de/anomic/plasma/plasmaCrawlWorker.java b/source/de/anomic/plasma/plasmaCrawlWorker.java
index 903df9a01..112b47767 100644
--- a/source/de/anomic/plasma/plasmaCrawlWorker.java
+++ b/source/de/anomic/plasma/plasmaCrawlWorker.java
@@ -418,7 +418,7 @@ public final class plasmaCrawlWorker extends Thread {
redirectionUrlString = redirectionUrlString.trim();
if (redirectionUrlString.length() == 0) {
- log.logWarning("CRAWLER Recirection of URL=" + url.toString() + " aborted. Location header is empty.");
+ log.logWarning("CRAWLER Redirection of URL=" + url.toString() + " aborted. Location header is empty.");
return;
}
diff --git a/yacy.logging b/yacy.logging
index 8ff8b6141..8b4c78f78 100644
--- a/yacy.logging
+++ b/yacy.logging
@@ -5,7 +5,7 @@
# setting logging levels vor individual classes
# possible values are:
# OFF no output at all
-# SEVERE system-level error, internal cause, critical and not fixeable (i.e. inconsistency)
+# SEVERE system-level error, internal cause, critical and not fixable (i.e. inconsistency)
# WARNING uncritical service failure, may require user activity (i.e. input required, wrong authorization)
# INFO regular action information (i.e. any httpd request URL)
# CONFIG regular system status information (i.e. start-up messages)