Merge with master fixes

forms/cms/home/ui.xml

@@ -14,6 +14,7 @@
 		<htk-repeater form-id="new">
 			<db-model property="model">
 				SELECT title, date_time, text, image, id FROM news
+					WHERE tag != 'course'
 					ORDER BY priority, date_time DESC
 			</db-model>
 			<custom>

forms/news/new/locale/ca.json

@@ -4,6 +4,7 @@
 	,"Title": "Títol"
 	,"NewBody": "Cos"
 	,"Tag": "Etiqueta"
+	,"Priority": "Prioritat"
 
 	,"Return": "Tornar"
 	,"Accept": "Acceptar"

forms/news/new/locale/en.json

@@ -4,6 +4,7 @@
 	,"Title": "Title"
 	,"NewBody": "New body"
 	,"Tag": "Tag"
+	,"Priority": "Priority"
 
 	,"Return": "Return"
 	,"Accept": "Accept"

forms/news/new/locale/es.json

@@ -4,6 +4,7 @@
 	,"Title": "Título"
 	,"NewBody": "Cuerpo"
 	,"Tag": "Etiqueta"
+	,"Priority": "Prioridad"
 
 	,"Return": "Volver"
 	,"Accept": "Aceptar"

forms/news/new/locale/fr.json

@@ -4,6 +4,7 @@
 	,"Title": "Titre"
 	,"NewBody": "Corps"
 	,"Tag": "Tag"
+	,"Priority": "Priorité"
 
 	,"Return": "Reviens"
 	,"Accept": "Accepter"

forms/news/new/locale/mn.json

@@ -4,6 +4,7 @@
 	,"Title": "Title"
 	,"NewBody": "New body"
 	,"Tag": "Tag"
+	,"Priority": "Priority"
 
 	,"Return": "Return"
 	,"Accept": "Accept"

forms/news/new/locale/pt.json

@@ -4,6 +4,7 @@
 	,"Title": "Título"
 	,"NewBody": "Corpo"
 	,"Tag": "Etiqueta"
+	,"Priority": "Prioridade"
 
 	,"Return": "Voltar"
 	,"Accept": "Aceitar"

forms/news/new/ui.xml

@@ -7,7 +7,7 @@
 			updatable="true"
 			lot="hash"
 			on-operations-done="onOperationsDone">
-			SELECT id, title, text, tag
+			SELECT id, title, text, tag, priority
 				FROM news WHERE id = #new
 		</db-model>
 	</db-form>
@@ -41,6 +41,10 @@
 				</db-model>
 			</htk-combo>
 		</div>
+		<div>
+			<label><t>Priority</t></label>
+			<htk-entry form="iter" column="priority"/>
+		</div>
 		<div>
 			<label><t>NewBody</t></label>
 			<textarea id="html-editor"/>

js/hedera/locale/ca.json

@@ -3,7 +3,7 @@
 	,"Password": "Contrasenya"
 	,"Beta": "Beta"
 	,"Do not sign out": "No tancar sessió"
-	,"I want to know more": "Vull saber-ne més!"
+	,"Log in as guest": "Accedir com a convidat"
 	,"Enter": "Entrar"
 	,"Login mail": "clientes@verdnatura.es"
 	,"Login phone": "+34 607 562 391"

js/hedera/locale/en.json

@@ -3,7 +3,7 @@
 	,"Password": "Password"
 	,"Beta": "Beta"
 	,"Do not sign out": "Do not sign out"
-	,"I want to know more": "I want to know more"
+	,"Log in as guest": "Log in as guest"
 	,"Enter": "Enter"
 	,"Login mail": "clientes@verdnatura.es"
 	,"Login phone": "+34 607 562 391"

js/hedera/locale/es.json

@@ -3,7 +3,7 @@
 	,"Password": "Contraseña"
 	,"Beta": "Beta"
 	,"Do not sign out": "No cerrar sesión"
-	,"I want to know more": "¡Quiero saber más!"
+	,"Log in as guest": "Entrar como invitado"
 	,"Enter": "Entrar"
 	,"Login mail": "clientes@verdnatura.es"
 	,"Login phone": "+34 963 242 100"

js/hedera/locale/fr.json

@@ -3,7 +3,7 @@
 	,"Password": "Mot de passe"
 	,"Beta": "Beta"
 	,"Do not sign out": "Garder ma session active"
-	,"I want to know more": "En savoir plus!"
+	,"Log in as guest": "Entrez en tant qu'invité"
 	,"Enter": "Entrer"
 	,"Login mail": "ruben@verdnatura.es"
 	,"Login phone": "+33 781 533 900"

js/hedera/locale/mn.json

@@ -3,7 +3,7 @@
 	,"Password": "нууц үг"
 	,"Beta": "Бета"
 	,"Do not sign out": "Гаргаж гарын үсэг зураагүй байна"
-	,"I want to know more": "Би илүү ихийг мэдэхийг хүсч байна"
+	,"Log in as guest": "Зочин байдлаар оруулна уу"
 	,"Enter": "энд бичнэ үү"
 	,"Login mail": "clientes@verdnatura.es"
 	,"Login phone": "+34 607 562 391"

js/hedera/locale/pt.json

@@ -3,7 +3,7 @@
 	,"Password": "Palavra-Passe"
 	,"Beta": "Beta"
 	,"Do not sign out": "Não finalizar Sessão"
-	,"I want to know more": "Quero saber mais..."
+	,"Log in as guest": "Digite como convidado"
 	,"Enter": "Entrar"
 	,"Login mail": "clientes@verdnatura.es"
 	,"Login phone": "+34 963 242 100"

js/hedera/login.xml

@@ -3,7 +3,7 @@
 	<div class="navbar">
 		<div>
 		<a href="#!form=cms/about&amp;guest=true">
-			<t>I want to know more</t>
+			<t>Log in as guest</t>
 		</a>
 		</div>
 	</div>