Merge remote-tracking branch 'upstream/master'

6 files changed, 23 insertions, 2 deletions

diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index 40c3f5452..f9f6ceb65 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -137,8 +137,8 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
                 .($this->helper->isAutosubmitEnabled() ? 'checked' : '' )
                 .'/>' . $this->getLang('autosubmit') .'<br />'
                 .'</label>'
-                .'<input type="hidden" name="do" value="admin">'
-                .'<input type="hidden" name="page" value="popularity">';
+                .'<input type="hidden" name="do" value="admin" />'
+                .'<input type="hidden" name="page" value="popularity" />';
         }
         $form .= '<input type="submit" class="button" value="'.$this->getLang('submit').'"/>'
             .'</fieldset>'
diff --git a/lib/plugins/popularity/lang/eo/lang.php b/lib/plugins/popularity/lang/eo/lang.php
index 9326cc741..a7c124f51 100644
--- a/lib/plugins/popularity/lang/eo/lang.php
+++ b/lib/plugins/popularity/lang/eo/lang.php
@@ -12,3 +12,8 @@
  */
 $lang['name']                  = 'Populareca enketo (eble la ŝargo prokrastos iomete)';
 $lang['submit']                = 'Sendi datenaron';
+$lang['autosubmit']            = 'Aŭtomate sendi datumaron monate';
+$lang['submissionFailed']      = 'La datumaro ne povis esti sendata pro la jena eraro:';
+$lang['submitDirectly']        = 'Vi povas sendi vi mem la datumaron per la sekva informilo.';
+$lang['autosubmitError']       = 'La lasta aŭtomata sendo malsukcesis, pro la jena eraro:';
+$lang['lastSent']              = 'La datumaro estas sendita';
diff --git a/lib/plugins/popularity/lang/fi/lang.php b/lib/plugins/popularity/lang/fi/lang.php
index 3aa5dc23b..a73f63501 100644
--- a/lib/plugins/popularity/lang/fi/lang.php
+++ b/lib/plugins/popularity/lang/fi/lang.php
@@ -7,3 +7,8 @@
  */
 $lang['name']                  = 'Suosion palaute (voi kestää jonkun aikaa latautua)';
 $lang['submit']                = 'Lähetä tiedot';
+$lang['autosubmit']            = 'Lähetä tiedot automaattisesti kerran kuussa';
+$lang['submissionFailed']      = 'Tietoja ei voitu lähettää seuraavan virheen vuoksi:';
+$lang['submitDirectly']        = 'Voit lähettää tiedot käsin seuraavan kaavakkeen avulla';
+$lang['autosubmitError']       = 'Edellinen automaattilähetys epäonnistui seuraavan virheen vuoksi:';
+$lang['lastSent']              = 'Tiedot on lähetetty';
diff --git a/lib/plugins/popularity/lang/fi/submitted.txt b/lib/plugins/popularity/lang/fi/submitted.txt
new file mode 100644
index 000000000..31059c880
--- /dev/null
+++ b/lib/plugins/popularity/lang/fi/submitted.txt
@@ -0,0 +1,3 @@
+====== Suosion palaute ======
+
+Tiedot lähetettiin onnistuneesti.
\ No newline at end of file
diff --git a/lib/plugins/popularity/lang/ja/lang.php b/lib/plugins/popularity/lang/ja/lang.php
index 1e0dbdc3f..736924bb1 100644
--- a/lib/plugins/popularity/lang/ja/lang.php
+++ b/lib/plugins/popularity/lang/ja/lang.php
@@ -9,3 +9,8 @@
  */
 $lang['name']                  = '利用状況調査（ロードに少し時間が掛かります）';
 $lang['submit']                = 'データ送信';
+$lang['autosubmit']            = '月に一度は自動的にデータを送付';
+$lang['submissionFailed']      = '次のエラーによりデータが送信できませんでした：';
+$lang['submitDirectly']        = '次のフォームを使ってデータを手動で送信することができます。';
+$lang['autosubmitError']       = '以下のエラーにより最後の自動送信に失敗しました：';
+$lang['lastSent']              = 'データを送信しました。';
diff --git a/lib/plugins/popularity/lang/ja/submitted.txt b/lib/plugins/popularity/lang/ja/submitted.txt
new file mode 100644
index 000000000..604f8e55f
--- /dev/null
+++ b/lib/plugins/popularity/lang/ja/submitted.txt
@@ -0,0 +1,3 @@
+====== 利用状況調査 ======
+
+データの送信に成功しました。
\ No newline at end of file