From 0eeeda70360ed06507163ab0d9468d2707c0ffe7 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Mon, 6 Nov 2006 06:16:00 +0000
Subject: [PATCH] added: language file specification updated according to new
 "link" feature of messages added: some AdviceMessages

---
 pythonrewrite/lang/de.hdf                     |  2 +-
 pythonrewrite/lang/en.hdf                     | 37 +++++++++----------
 pythonrewrite/lang/fr.hdf                     |  2 +-
 pythonrewrite/lang/language_specification.txt | 12 +++++-
 pythonrewrite/lang/si.hdf                     |  2 +-
 5 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/pythonrewrite/lang/de.hdf b/pythonrewrite/lang/de.hdf
index 7fc0407..a1c1960 100644
--- a/pythonrewrite/lang/de.hdf
+++ b/pythonrewrite/lang/de.hdf
@@ -1,4 +1,4 @@
-Name	= deutsch
+Name	= Deutsch
 
 Status	= $Id$
 
diff --git a/pythonrewrite/lang/en.hdf b/pythonrewrite/lang/en.hdf
index 0da1457..b06631b 100644
--- a/pythonrewrite/lang/en.hdf
+++ b/pythonrewrite/lang/en.hdf
@@ -1,4 +1,4 @@
-Name	= english
+Name	= English
 
 Status	= $Id$
 
@@ -119,24 +119,6 @@ WarningMessage {
 		Title	= The container is mounted
 		Text	= This action is not available while the container is active. Please turn it off first.
 	}
-
-	ReadOnlyConfig {
-		Title	= Settings can not be stored
-		Text	= If you want to store your settings permanently, then you should create a configuration partition. Go to "Preferences -> Disk Partitioning" in order to do this.
-		Link {
-			Text	= Create configuration partition
-			Link	= BASE_LINK/plugins/partition
-		}
-	}
-
-	NoSSL {
-		Title	= Unencrypted connection
-		Text	= You should use https instead of http to connect to the CryptoBox. Otherwise your passwords are open to other users of your network.
-		Link {
-			Text	= Use encrypted connection
-			Link	= https://CURRENT_LINK
-		}
-	}
 }
 
 
@@ -163,6 +145,23 @@ SuccessMessage {
 }
 
 
+EnvironmentWarning {
+
+	ReadOnlyConfig {
+		Text	= Read-only setup detected - probably you should create a configuration partition.
+		Link.Text	= Initialize partition
+		Link.Rel	= partition
+	}
+
+	NoSSL {
+		Text	= The connection is not encrypted - passwords can be easily intercepted.
+		Link.Text	= Use encrypted connection
+		Link.Prot	= https
+		}
+	}
+}
+
+
 ErrorMessage {
 
 	UnknownAction {
diff --git a/pythonrewrite/lang/fr.hdf b/pythonrewrite/lang/fr.hdf
index 68c299c..e6241ee 100644
--- a/pythonrewrite/lang/fr.hdf
+++ b/pythonrewrite/lang/fr.hdf
@@ -1,4 +1,4 @@
-Name	= francais
+Name	= Francais
 
 Status	= $Id$
 
diff --git a/pythonrewrite/lang/language_specification.txt b/pythonrewrite/lang/language_specification.txt
index e053dc5..7cfaf44 100644
--- a/pythonrewrite/lang/language_specification.txt
+++ b/pythonrewrite/lang/language_specification.txt
@@ -11,6 +11,14 @@ the language (e.g.: English, German, French, ...).
 Attributes:
 	Title	- title of the message
 	Text	- text of the message
-	Link.Text	- (optional) textual representation of a link
-	Lint.Link	- (optional) href of a link
+	Link.Text	- textual representation of a link
+	Link.Abs	- absolute URL e.g. http://cryptobox.org/trac
+	Link.Prot	- http|https
+	Link.Rel	- relative url (based on the cgi root)
+
+	All values are optional, but you should follow these rules:
+		- at least one of "Title" and "Text" should be defined
+		- if there are "Link" attributes, then you should also define "Link.Text"
+		- "Link.Abs" can not be combined with "Link.Prot" or "Link.Rel"
+		- "Link.Rel" and "Link.Prot" may be used together
 
diff --git a/pythonrewrite/lang/si.hdf b/pythonrewrite/lang/si.hdf
index 235b87e..802cd8e 100644
--- a/pythonrewrite/lang/si.hdf
+++ b/pythonrewrite/lang/si.hdf
@@ -1,4 +1,4 @@
-Name	= slovenščina
+Name	= Slovenščina
 
 Status	= $Id$