Merge branch 'master' into stable

Conflicts:
	doku.php

10 files changed, 35 insertions, 0 deletions

diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php
index c992ec4c6..b0dc4d1a8 100644
--- a/lib/plugins/popularity/lang/cs/lang.php
+++ b/lib/plugins/popularity/lang/cs/lang.php
@@ -6,6 +6,12 @@
  * @author tomas@valenta.cz
  * @author Marek Sacha <sachamar@fel.cvut.cz>
  * @author Lefty <lefty@multihost.cz>
+ * @author Vojta Beran <xmamut@email.cz>
  */
 $lang['name']                  = 'Průzkum používání (může chviličku trvat, než se natáhne)';
 $lang['submit']                = 'Odeslat data';
+$lang['autosubmit']            = 'Automaticky odesílat data jednou měsíčně';
+$lang['submissionFailed']      = 'Data nemohla být odeslána kvůli následující chybě:';
+$lang['submitDirectly']        = 'Data můžete odeslat ručně zasláním následujícího formuláře.';
+$lang['autosubmitError']       = 'Poslední automatické odeslání selhalo kvůli následující chybě:';
+$lang['lastSent']              = 'Data byla odeslána.';
diff --git a/lib/plugins/popularity/lang/cs/submitted.txt b/lib/plugins/popularity/lang/cs/submitted.txt
new file mode 100644
index 000000000..ff1f41c9f
--- /dev/null
+++ b/lib/plugins/popularity/lang/cs/submitted.txt
@@ -0,0 +1,3 @@
+===== Průzkum používání =====
+
+Data byla úspěšně odeslána.
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php
index 6aa9a823d..5e42cd45c 100644
--- a/lib/plugins/popularity/lang/es/lang.php
+++ b/lib/plugins/popularity/lang/es/lang.php
@@ -16,6 +16,7 @@
  * @author Victor Castelan <victorcastelan@gmail.com>
  * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  * @author Oscar M. Lage <r0sk10@gmail.com>
+ * @author emezeta <emezeta@infoprimo.com>
  */
 $lang['name']                  = 'Retroinformación (Feedback) plugin Popularity';
 $lang['submit']                = 'Enviar datos';
diff --git a/lib/plugins/popularity/lang/eu/lang.php b/lib/plugins/popularity/lang/eu/lang.php
index a4d16c020..05e4262de 100644
--- a/lib/plugins/popularity/lang/eu/lang.php
+++ b/lib/plugins/popularity/lang/eu/lang.php
@@ -6,3 +6,8 @@
  */
 $lang['name']                  = 'Popularitate Feedback-a (denbora dezente iraun dezake kargatzen)';
 $lang['submit']                = 'Datuak Bidali';
+$lang['autosubmit']            = 'Automatikoki bidali informazioa hilabetean behin';
+$lang['submissionFailed']      = 'Informazioa ezin izan da bidali ondorengo errorea dela eta:';
+$lang['submitDirectly']        = 'Informazioa eskuz bidali dezakezu ondorengo formularioa bidaliz.';
+$lang['autosubmitError']       = 'Azken bidalketa automatikoak huts egin zuen ondorengo errorea dela eta:';
+$lang['lastSent']              = 'Informazioa bidalia izan da';
diff --git a/lib/plugins/popularity/lang/eu/submitted.txt b/lib/plugins/popularity/lang/eu/submitted.txt
new file mode 100644
index 000000000..94c81a528
--- /dev/null
+++ b/lib/plugins/popularity/lang/eu/submitted.txt
@@ -0,0 +1,3 @@
+====== Popularitate Feedback-a ======
+
+Informazioa arrakastaz bidalia izan da.
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php
index 91d798a5f..0f1442d53 100644
--- a/lib/plugins/popularity/lang/ko/lang.php
+++ b/lib/plugins/popularity/lang/ko/lang.php
@@ -10,3 +10,8 @@
  */
 $lang['name']                  = '인기도 조사 (불러오는데 시간이 걸릴 수 있습니다.)';
 $lang['submit']                = '자료 보내기';
+$lang['autosubmit']            = '자료를 자동으로 매달 한번씩 보내기';
+$lang['submissionFailed']      = '다음과 같은 이유로 자료 전송에 실패했습니다 :';
+$lang['submitDirectly']        = '아래의 양식에 맞춰 수동으로 작성된 자료를 보낼 수 있습니다';
+$lang['autosubmitError']       = '다음과 같은 이유로 자동 자료 전송에 실패했습니다 :';
+$lang['lastSent']              = '자료가 전송되었습니다';
diff --git a/lib/plugins/popularity/lang/ko/submitted.txt b/lib/plugins/popularity/lang/ko/submitted.txt
new file mode 100644
index 000000000..e8b434dc5
--- /dev/null
+++ b/lib/plugins/popularity/lang/ko/submitted.txt
@@ -0,0 +1,3 @@
+====== 인기도 조사 ======
+
+자료 전송이 성공적으로 완료되었습니다
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/pt-br/lang.php b/lib/plugins/popularity/lang/pt-br/lang.php
index 907b4db5d..67a3abd7e 100644
--- a/lib/plugins/popularity/lang/pt-br/lang.php
+++ b/lib/plugins/popularity/lang/pt-br/lang.php
@@ -17,3 +17,8 @@
  */
 $lang['name']                  = 'Retorno de popularidade (pode demorar um pouco para carregar)';
 $lang['submit']                = 'Enviar dados';
+$lang['autosubmit']            = 'Enviar os dados automaticamente uma vez por mês';
+$lang['submissionFailed']      = 'Os dados não puderam ser enviados devido ao seguinte erro:';
+$lang['submitDirectly']        = 'Você pode enviar os dados manualmente, submetendo o formulário baixo.';
+$lang['autosubmitError']       = 'Ocorreu uma falha na última submissão automática, devido ao seguinte erro:';
+$lang['lastSent']              = 'Os dados foram enviados';
diff --git a/lib/plugins/popularity/lang/pt-br/submitted.txt b/lib/plugins/popularity/lang/pt-br/submitted.txt
new file mode 100644
index 000000000..7c0cea8c1
--- /dev/null
+++ b/lib/plugins/popularity/lang/pt-br/submitted.txt
@@ -0,0 +1,3 @@
+====== Retorno de popularidade ======
+
+Os dados foram enviados com sucesso.
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php
index 371a8fddb..a2464762d 100644
--- a/lib/plugins/popularity/lang/zh/lang.php
+++ b/lib/plugins/popularity/lang/zh/lang.php
@@ -11,6 +11,7 @@
  * @author lainme <lainme993@gmail.com>
  * @author caii <zhoucaiqi@gmail.com>
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
+ * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  */
 $lang['name']                  = '人气反馈（载入可能需要一些时间）';
 $lang['submit']                = '发送数据';