Merge branch 'testing'

Conflicts:
	web/html/pkgsubmit.php

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

3 files changed, 1 insertions, 42 deletions

diff --git a/web/lang/pt/index_po.inc b/web/lang/pt/index_po.inc
index 7fe4283..66de424 100644
--- a/web/lang/pt/index_po.inc
+++ b/web/lang/pt/index_po.inc
@@ -53,8 +53,6 @@ $_t["pt"]["Email discussion about the AUR takes place on the %sTUR Users List%s.
 
 $_t["pt"]["Recent Updates"] = "Atualizações Recentes";
 
-$_t["pt"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information. Contributed PKGBUILDs <b>must</b> conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "Bem-vindo ao AUR! Por favor leia as %hregras de usuário do AUR%h e as %hregras de TU do AUR%h para maiores informações.PKGBUILDs contribuídos <b>devem</b> seguir os %hpadrões Arch de Empacotamento%h caso contrário, eles serão excluídos!";
-
 $_t["pt"]["Community"] = "Comunidade";
 
 $_t["pt"]["Package Counts"] = "Contagem de Pacotes";
@@ -63,7 +61,7 @@ $_t["pt"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR
 
 $_t["pt"]["Unsupported"] = "Sem Suporte";
 
-$_t["pt"]["Contributed PKGBUILDs <b>must</b> conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "PKGBUILDs contribuídos <b>devem</b> seguir os %hpadrões Arch de Empacotamento%h caso contrário, eles serão excluídos!";
+$_t["pt"]["Contributed PKGBUILDs %hmust%h conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "PKGBUILDs contribuídos %hdevem%h seguir os %hpadrões Arch de Empacotamento%h caso contrário, eles serão excluídos!";
 
 $_t["pt"]["Statistics"] = "Estatísticas";
 
@@ -93,4 +91,3 @@ $_t["pt"]["My Statistics"] = "Minhas Estatísticas";
 
 $_t["pt"]["Flagged as safe by me"] = "Pacotes que marquei como seguros";
 
-?>
\ No newline at end of file
diff --git a/web/lang/pt/template_po.inc b/web/lang/pt/template_po.inc
deleted file mode 100644
index ed4a1d0..0000000
--- a/web/lang/pt/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["pt"]["Hi, this is worth reading!"] = "Olá, vale a pena ler isso!";
-
-?>
\ No newline at end of file
diff --git a/web/lang/pt/test_po.inc b/web/lang/pt/test_po.inc
deleted file mode 100644
index 040e736..0000000
--- a/web/lang/pt/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["pt"]["Select your language here: %h%s%h, %h%s%h, %h%s%h, %h%s%h."] = "Selecione seu idioma aqui: %h%s%h, %h%s%h, %h%s%h, %h%s%h.";
-
-$_t["pt"]["Hello, world!"] = "Olá, mundo!";
-
-$_t["pt"]["Hello, again!"] = "Olá, novamente!";
-
-$_t["pt"]["My current language tag is: '%s'."] = "Meu identificador atual de idioma é: '%s'.";
-
-?>
\ No newline at end of file