summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreger <reger18@arcor.de>2017-03-21 01:16:16 +0100
committerreger <reger18@arcor.de>2017-03-21 01:16:16 +0100
commitbdadbda5fa5bdc9fbae1a08753c3a11b75a36fd4 (patch)
tree86860748542140f3447e7a88d7b96b85c3fb7bb6
parentc55d526cb8c8a25778e62748fe4e518a8c58d844 (diff)
Update master lng file with added text in Settings_ServerAccess
remove outdated file entry in fr.lng & sk.lng
-rw-r--r--README.md2
-rw-r--r--locales/fr.lng9
-rw-r--r--locales/master.lng.xlf24
-rw-r--r--locales/sk.lng8
4 files changed, 25 insertions, 18 deletions
diff --git a/README.md b/README.md
index 39cde3f3b..d70ce2664 100644
--- a/README.md
+++ b/README.md
@@ -185,7 +185,7 @@ Compiling YaCy:
because the servlet pages are not compiled by the eclipse build process
after the dist prodecure, the release can be found in the RELEASE subdirectory
-Build with Maven
+Build with Maven:
- for the first time goto subdirectory libbuild (which contains the maven parent pom)
- compile with "mvn clean install -DskipTests", this will create all needed modules
- after above you can use just the pom in the main directory to build YaCy with maven
diff --git a/locales/fr.lng b/locales/fr.lng
index dfca82a41..55a5872b2 100644
--- a/locales/fr.lng
+++ b/locales/fr.lng
@@ -2003,15 +2003,6 @@ Password (repeat same as above):==mot de passe (bitte zur Sicherheit erneut eing
#value="submit">==value="Speichern">
#-----------------------------
-#File: Settings_SystemBehaviour.inc
-#---------------------------
-#System Behaviour Settings==System Einstellungen
-#Auto pop-up of status page on start-up:==Automatisches Pop-Up der Status-Seite beim Start von YaCy:
-#"enable"=="Aktivieren"
-#"disable"=="Deaktivieren"
-
-#-----------------------------
-
#File: Status.html
#---------------------------
Console Status==&Eacute;tat de la console
diff --git a/locales/master.lng.xlf b/locales/master.lng.xlf
index 6a003dbd8..a0b6865c1 100644
--- a/locales/master.lng.xlf
+++ b/locales/master.lng.xlf
@@ -7868,6 +7868,30 @@
<trans-unit id="3c6c4174" xml:space="preserve" approved="no" translate="yes">
<source>value="Submit"</source>
</trans-unit>
+ <trans-unit id="f2f1bee5" xml:space="preserve" approved="no" translate="yes">
+ <source>Server Port Settings</source>
+ </trans-unit>
+ <trans-unit id="246950dc" xml:space="preserve" approved="no" translate="yes">
+ <source>Server port:</source>
+ </trans-unit>
+ <trans-unit id="11ba0b94" xml:space="preserve" approved="no" translate="yes">
+ <source>This is the main port for all http communication (default is 8090).</source>
+ </trans-unit>
+ <trans-unit id="995db35f" xml:space="preserve" approved="no" translate="yes">
+ <source>A change requires a restart.</source>
+ </trans-unit>
+ <trans-unit id="ce203048" xml:space="preserve" approved="no" translate="yes">
+ <source>Server ssl port:</source>
+ </trans-unit>
+ <trans-unit id="7960e3f5" xml:space="preserve" approved="no" translate="yes">
+ <source>This is the port to connect via https (default is 8443).</source>
+ </trans-unit>
+ <trans-unit id="13e3c5af" xml:space="preserve" approved="no" translate="yes">
+ <source>Shutdown port:</source>
+ </trans-unit>
+ <trans-unit id="b2287092" xml:space="preserve" approved="no" translate="yes">
+ <source>This is the local port on the loopback address (127.0.0.1 or :1) to listen for a shutdown signal to stop the YaCy server (-1 disables the shutdown port, recommended default is 8005).</source>
+ </trans-unit>
</body>
</file>
diff --git a/locales/sk.lng b/locales/sk.lng
index 125e8acb0..d8afb3105 100644
--- a/locales/sk.lng
+++ b/locales/sk.lng
@@ -1652,14 +1652,6 @@ Password (repeat same as above):==Heslo (zopakujte prosim):
value="submit">==value="Uloz">
#-----------------------------
-#File: Settings_SystemBehaviour.inc
-#---------------------------
-System Behaviour Settings==Systemove nastavenia
-Auto pop-up of status page on start-up:==Automaticky pop-up stranky stavu pri starte YaCy:
-"enable"=="aktivuj"
-"disable"=="deaktivuj"
-#-----------------------------
-
#File: simple_search.html
#---------------------------
YaCy '#[clientname]#': Search Page==YaCy '#[clientname]#': Vyhladavacia stranka