Merge branch 'testing'

Conflicts:
	web/html/pkgsubmit.php

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

3 files changed, 2 insertions, 38 deletions

diff --git a/web/lang/en/index_po.inc b/web/lang/en/index_po.inc
index bdeb87fb..eb626eb9 100644
--- a/web/lang/en/index_po.inc
+++ b/web/lang/en/index_po.inc
@@ -25,6 +25,8 @@ $_t["en"]["Password:"] = "Password:";
 
 $_t["en"]["Username:"] = "Username:";
 
+$_t["en"]["Remember me"] = "Remember me";
+
 $_t["en"]["Welcome to the AUR! If you're a newcomer, you may want to read the %hGuidelines%h."] = "Welcome to the AUR! If you're a newcomer, you may want to read the %hGuidelines%h.";
 
 $_t["en"]["This is where the intro text will go."] = "This is where the intro text will go.";
diff --git a/web/lang/en/template_po.inc b/web/lang/en/template_po.inc
deleted file mode 100644
index db437be1..00000000
--- a/web/lang/en/template_po.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# INSTRUCTIONS TO TRANSLATORS
-#
-# This file contains the i18n translations for a subset of the
-# Arch Linux User-community Repository (AUR).  This is a PHP
-# script, and as such, you MUST pay great attention to the syntax.
-# If your text contains any double-quotes ("), you MUST escape
-# them with the backslash character (\).
-#
-
-include_once("translator.inc");
-global $_t;
-
-$_t["en"]["Hi, this is worth reading!"] = "Hi, this is worth reading!";
-
-?>
\ No newline at end of file
diff --git a/web/lang/en/test_po.inc b/web/lang/en/test_po.inc
deleted file mode 100644
index 28c0e104..00000000
--- a/web/lang/en/test_po.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-# INSTRUCTIONS TO TRANSLATORS
-#
-# This file contains the i18n translations for a subset of the
-# Arch Linux User-community Repository (AUR).  This is a PHP
-# script, and as such, you MUST pay great attention to the syntax.
-# If your text contains any double-quotes ("), you MUST escape
-# them with the backslash character (\).
-#
-
-include_once("translator.inc");
-global $_t;
-
-$_t["en"]["Select your language here: %h%s%h, %h%s%h, %h%s%h, %h%s%h."] = "Select your language here: %h%s%h, %h%s%h, %h%s%h, %h%s%h.";
-
-$_t["en"]["Hello, world!"] = "Hello, world!";
-
-$_t["en"]["Hello, again!"] = "Hello, again!";
-
-$_t["en"]["My current language tag is: '%s'."] = "My current language tag is: '%s'.";
-
-?>
\ No newline at end of file