Merge branch 'testing'

Conflicts:
	web/html/pkgsubmit.php

Signed-off-by: Loui Chang <louipc.ist@gmail.com>

3 files changed, 1 insertions, 28 deletions

diff --git a/web/lang/ca/index_po.inc b/web/lang/ca/index_po.inc
index cd930a2..ca6c1ac 100644
--- a/web/lang/ca/index_po.inc
+++ b/web/lang/ca/index_po.inc
@@ -39,7 +39,7 @@ $_t["ca"]["Error trying to generate session id."] = "S'ha produït un error en i
 
 $_t["ca"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information."] = "Benvingut a l'AUR! Si us plau llegiu la %hGuia d'usuari de l'AUR%h i la %hGuia de TU de l'AUR%h per a més informació.";
 
-$_t["ca"]["Contributed PKGBUILDs <b>must</b> conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "Els PKGBUILDs enviats han de seguir els %hEstàndards d'empaquetament d'Arch%h sinó seran esborrats!";
+$_t["ca"]["Contributed PKGBUILDs %hmust%h conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "Els PKGBUILDs enviats %hhan%h de seguir els %hEstàndards d'empaquetament d'Arch%h sinó seran esborrats!";
 
 $_t["ca"]["Login"] = "Entra";
 
@@ -55,4 +55,3 @@ $_t["ca"]["Logged-in as: %h%s%h"] = "Identificat com: %h%s%h";
 
 $_t["ca"]["Incorrect password for username, %s."] = "Contrasenya incorrecta per a l'usuari, %s.";
 
-?>
diff --git a/web/lang/ca/template_po.inc b/web/lang/ca/template_po.inc
deleted file mode 100644
index 5ea5ee6..0000000
--- a/web/lang/ca/template_po.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-# Catalan (Català) translation
-# Translator: Sergio Jovani Guzman <moret.sjg@gmail.com>
-
-include_once("translator.inc");
-global $_t;
-
-$_t["ca"]["Hi, this is worth reading!"] = "Hola, val la pena llegir açò!";
-
-?>
\ No newline at end of file
diff --git a/web/lang/ca/test_po.inc b/web/lang/ca/test_po.inc
deleted file mode 100644
index 3f5ddad..0000000
--- a/web/lang/ca/test_po.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Catalan (Català) translation
-# Translator: Sergio Jovani Guzman <moret.sjg@gmail.com>
-
-include_once("translator.inc");
-global $_t;
-
-$_t["ca"]["Select your language here: %h%s%h, %h%s%h, %h%s%h, %h%s%h."] = "Seleccioneu el vostre idioma ací: %h%s%h, %h%s%h, %h%s%h, %h%s%h";
-
-$_t["ca"]["Hello, world!"] = "Hola, món!";
-
-$_t["ca"]["Hello, again!"] = "Hola, altre cop!";
-
-$_t["ca"]["My current language tag is: '%s'."] = "La meua etiqueta actual d'idioma és: '%s'.";
-
-?>
\ No newline at end of file