From 7482f2d6e43ea5768b2de40d89c7e7ea836a60df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= <aranet100@gmail.com>
Date: Fri, 7 Jun 2013 11:30:39 +0200
Subject: Korean language update

---
 lib/plugins/popularity/lang/ko/intro.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index 2513b77b4..c75c57ba5 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -2,7 +2,7 @@
 
 설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
-설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이타는 익명 ID로 구별되어집니다.
+설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
 보내려는 데이터는 설치 DokuWiki 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
 
-- 
cgit v1.2.3


From 81ee3b1c4ea669b4278fc1160162c686b82e559c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 16 Jun 2013 18:09:34 +0200
Subject: Swedish language update

---
 lib/plugins/popularity/lang/sv/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/sv/lang.php b/lib/plugins/popularity/lang/sv/lang.php
index 8be542e7f..90d820ba0 100644
--- a/lib/plugins/popularity/lang/sv/lang.php
+++ b/lib/plugins/popularity/lang/sv/lang.php
@@ -13,6 +13,7 @@
  * @author Peter Åström <eaustreum@gmail.com>
  * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
  */
 $lang['name']                  = 'Popularitets-feedback (det kan ta en stund att ladda sidan)';
 $lang['submit']                = 'Sänd data';
-- 
cgit v1.2.3


From b243b168571b08a674d34701cfbb7ac0a03239e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Volker=20B=C3=B6dker?= <volker@boedker.de>
Date: Fri, 12 Jul 2013 17:04:41 +0200
Subject: Informal German language update

---
 lib/plugins/popularity/lang/de-informal/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/de-informal/lang.php b/lib/plugins/popularity/lang/de-informal/lang.php
index 513a1b6e1..0abf90b0b 100644
--- a/lib/plugins/popularity/lang/de-informal/lang.php
+++ b/lib/plugins/popularity/lang/de-informal/lang.php
@@ -9,6 +9,7 @@
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
  * @author Frank Loizzi <contact@software.bacal.de>
+ * @author Volker Bödker <volker@boedker.de>
  */
 $lang['name']                  = 'Popularitätsrückmeldung (kann eine Weile dauern, bis es fertig geladen wurde)';
 $lang['submit']                = 'Sende Daten';
-- 
cgit v1.2.3


From b3fd863955b2c6c1987f36b9206b806da6e487c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= <aranet100@gmail.com>
Date: Sun, 28 Jul 2013 02:00:10 +0200
Subject: Korean language update

---
 lib/plugins/popularity/lang/ko/intro.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index c75c57ba5..0c884546a 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,6 +1,6 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
-- 
cgit v1.2.3


From 22064dd98283bc61e1b444e45707c1c51230eb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Seb=C5=91k?= <sebokmarton@gmail.com>
Date: Sun, 28 Jul 2013 02:12:20 +0200
Subject: Hungarian language update

---
 lib/plugins/popularity/lang/hu/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/hu/lang.php b/lib/plugins/popularity/lang/hu/lang.php
index 5dcd1adf0..5ee40eacc 100644
--- a/lib/plugins/popularity/lang/hu/lang.php
+++ b/lib/plugins/popularity/lang/hu/lang.php
@@ -8,6 +8,7 @@
  * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  * @author Sándor TIHANYI <stihanyi+dw@gmail.com>
  * @author David Szabo <szabo.david@gyumolcstarhely.hu>
+ * @author Marton Sebok <sebokmarton@gmail.com>
  */
 $lang['name']                  = 'Visszajelzés a DokuWiki használatáról (sok időt vehet igénybe a betöltése)';
 $lang['submit']                = 'Adatok elküldése';
-- 
cgit v1.2.3


From 7d8a6abbb21979fd77dca10275ebb8e01a04b6e4 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 29 Jul 2013 16:33:44 +0200
Subject: Fix popularity data submission in the backend FS#2808

The POST data contained the raw data instead of an array with the data
that should be submitted like in the requests from the browser. The
server backend has been fixed to be able to process both versions.
---
 lib/plugins/popularity/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 5bbeddba0..0e38bcb88 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -85,7 +85,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
     function sendData($data){
         $error = '';
         $httpClient = new DokuHTTPClient();
-        $status = $httpClient->sendRequest($this->submitUrl, $data, 'POST');
+        $status = $httpClient->sendRequest($this->submitUrl, array('data' => $data), 'POST');
         if ( ! $status ){
             $error = $httpClient->error;
         }
-- 
cgit v1.2.3


From dc0680528a593198449a846d9f1acdd25c51e873 Mon Sep 17 00:00:00 2001
From: Matthias Schulte <post@lupo49.de>
Date: Fri, 2 Aug 2013 16:11:40 +0200
Subject: de/de-informal updates: Replace "Nutzer" with more common word
 "Benutzer" / fix several typos / Fixes FS#2821

---
 lib/plugins/popularity/lang/de-informal/intro.txt | 2 +-
 lib/plugins/popularity/lang/de/intro.txt          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/de-informal/intro.txt b/lib/plugins/popularity/lang/de-informal/intro.txt
index ddae9347d..a414b6687 100644
--- a/lib/plugins/popularity/lang/de-informal/intro.txt
+++ b/lib/plugins/popularity/lang/de-informal/intro.txt
@@ -1,6 +1,6 @@
 ===== Rückmeldung zur Zufriedenheit =====
 
-Dieses Werkzeug sammelt anonym Daten über dein Wiki und erlaubt es dir diese an die Entwickler von DokuWiki zu senden. Dies hilft ihnen zu verstehen, wie DokuWiki von den Nutzern verwendet wird und stellt somit sicher, dass Entscheidungen für zukünftige Entwicklungen mit reellen Nutzungsstatistiken belegbar sind.
+Dieses Werkzeug sammelt anonym Daten über dein Wiki und erlaubt es dir diese an die Entwickler von DokuWiki zu senden. Dies hilft ihnen zu verstehen, wie DokuWiki von den Benutzern verwendet wird und stellt somit sicher, dass Entscheidungen für zukünftige Entwicklungen mit reellen Nutzungsstatistiken belegbar sind.
 
 Bitte wiederhole diesen Schritt von Zeit zu Zeit, um die Entwickler zu informieren wenn dein Wiki wächst. Deine aktuelleren Datensätze werden anhand einer anonymen Identifikationsnummer zugeordnet.
 
diff --git a/lib/plugins/popularity/lang/de/intro.txt b/lib/plugins/popularity/lang/de/intro.txt
index dc014e029..ba88ce270 100644
--- a/lib/plugins/popularity/lang/de/intro.txt
+++ b/lib/plugins/popularity/lang/de/intro.txt
@@ -1,6 +1,6 @@
 ====== Popularitäts-Feedback ======
 
-Dieses [[doku>popularity|Werkzeug]] sammelt verschiedene anonyme Daten über Ihr Wiki und erlaubt es Ihnen, diese an die DokuWiki-Entwickler zurückzusenden. Diese Daten helfen den Entwicklern besser zu verstehen, wie DokuWiki eingesetzt wird und stellt sicher, dass zukünftige, die Weiterentwicklung von DokuWiki betreffende, Entscheidungen auf Basis echter Nutzerdaten getroffen werden.
+Dieses [[doku>popularity|Werkzeug]] sammelt verschiedene anonyme Daten über Ihr Wiki und erlaubt es Ihnen, diese an die DokuWiki-Entwickler zurückzusenden. Diese Daten helfen den Entwicklern besser zu verstehen, wie DokuWiki eingesetzt wird und stellt sicher, dass zukünftige, die Weiterentwicklung von DokuWiki betreffende, Entscheidungen auf Basis echter Benutzerdaten getroffen werden.
 
 Bitte wiederholen Sie das Versenden der Daten von Zeit zu Zeit, um die Entwickler über das Wachstum Ihres Wikis auf dem Laufenden zu halten. Ihre wiederholten Dateneinsendungen werden über eine anonyme ID identifiziert.
 
-- 
cgit v1.2.3


From 6a8cbb12e8b5d489c3abef4676de0dbee82994c3 Mon Sep 17 00:00:00 2001
From: Henrik <henrik@idealis.se>
Date: Sat, 3 Aug 2013 05:45:55 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/sv/lang.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/sv/lang.php b/lib/plugins/popularity/lang/sv/lang.php
index 90d820ba0..942a708c4 100644
--- a/lib/plugins/popularity/lang/sv/lang.php
+++ b/lib/plugins/popularity/lang/sv/lang.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
- * Swedish language file
- *
- * @author Håkan Sandell <hakan.sandell[at]mydata.se>
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
+ * @author Håkan Sandell <hakan.sandell@home.se>
  * @author Dennis Karlsson
  * @author Tormod Otter Johansson <tormod@latast.se>
  * @author emil@sys.nu
@@ -11,7 +12,6 @@
  * @author Emil Lind <emil@sys.nu>
  * @author Bogge Bogge <bogge@bogge.com>
  * @author Peter Åström <eaustreum@gmail.com>
- * @author Håkan Sandell <hakan.sandell@home.se>
  * @author mikael@mallander.net
  * @author Smorkster Andersson smorkster@gmail.com
  */
-- 
cgit v1.2.3


From 5d92c7d222f614c23229a455bc6738bbaaf0a6ce Mon Sep 17 00:00:00 2001
From: mprins <mprins@users.sf.net>
Date: Sun, 4 Aug 2013 10:50:57 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/nl/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php
index b32ad9eb6..dda4a1d7f 100644
--- a/lib/plugins/popularity/lang/nl/lang.php
+++ b/lib/plugins/popularity/lang/nl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Wouter Schoot <wouter@schoot.org>
  * @author Niels Schoot <niels.schoot@quintiq.com>
  * @author Dion Nicolaas <dion@nicolaas.net>
-- 
cgit v1.2.3


From d5808163ba1734a45356b87153595c69205f0756 Mon Sep 17 00:00:00 2001
From: Sven <Svenluecke48@gmx.d>
Date: Sun, 4 Aug 2013 16:55:57 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/de/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/de/lang.php b/lib/plugins/popularity/lang/de/lang.php
index 42bdc14d5..a86fce50d 100644
--- a/lib/plugins/popularity/lang/de/lang.php
+++ b/lib/plugins/popularity/lang/de/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Leo Moll <leo@yeasoft.com>
  * @author Florian Anderiasch <fa@art-core.org>
  * @author Robin Kluth <commi1993@gmail.com>
-- 
cgit v1.2.3


From 72a0f401d75ff021ae5dc3b3739f008ff4220d80 Mon Sep 17 00:00:00 2001
From: Constantinos Xanthopoulos <conx@xanthopoulos.info>
Date: Sun, 4 Aug 2013 21:05:53 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/el/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/el/lang.php b/lib/plugins/popularity/lang/el/lang.php
index 10268a4c3..37a036930 100644
--- a/lib/plugins/popularity/lang/el/lang.php
+++ b/lib/plugins/popularity/lang/el/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Greek language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Konstantinos Koryllos <koryllos@gmail.com>
  * @author George Petsagourakis <petsagouris@gmail.com>
  * @author Petros Vidalis <pvidalis@gmail.com>
-- 
cgit v1.2.3


From 024914eb509865786ac98b9999cffacb1ebeaeb6 Mon Sep 17 00:00:00 2001
From: Pavel <ivanovtsk@mail.ru>
Date: Mon, 5 Aug 2013 07:55:56 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/ru/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ru/lang.php b/lib/plugins/popularity/lang/ru/lang.php
index a7f33156f..9c03ccda6 100644
--- a/lib/plugins/popularity/lang/ru/lang.php
+++ b/lib/plugins/popularity/lang/ru/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Russian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Змей Этерийский evil_snake@eternion.ru
  * @author Hikaru Nakajima <jisatsu@mail.ru>
  * @author Alexei Tereschenko <alexeitlex@yahoo.com>
-- 
cgit v1.2.3


From 544130397f3b68808f74d98f8681a07448c25899 Mon Sep 17 00:00:00 2001
From: tsangho <ou4222@gmail.com>
Date: Mon, 5 Aug 2013 20:15:57 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/zh-tw/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php
index b34efe995..252c606a9 100644
--- a/lib/plugins/popularity/lang/zh-tw/lang.php
+++ b/lib/plugins/popularity/lang/zh-tw/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
-- 
cgit v1.2.3


From f829a311ed69ff8e4de0673517ca191be36dab4a Mon Sep 17 00:00:00 2001
From: Edmondo Di Tucci <snarchio@gmail.com>
Date: Mon, 5 Aug 2013 21:26:34 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/it/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/it/lang.php b/lib/plugins/popularity/lang/it/lang.php
index a0cf274aa..9edefba84 100644
--- a/lib/plugins/popularity/lang/it/lang.php
+++ b/lib/plugins/popularity/lang/it/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Italian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Diego Pierotto ita.translations@tiscali.it
  * @author ita.translations@tiscali.it
  * @author Lorenzo Breda <lbreda@gmail.com>
-- 
cgit v1.2.3


From 7e45525650fd98a7cfd14c3484eb5add715c24a5 Mon Sep 17 00:00:00 2001
From: Rachel <rzhang0802@gmail.com>
Date: Tue, 6 Aug 2013 09:11:09 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/zh/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php
index 9c916c2a5..532abb890 100644
--- a/lib/plugins/popularity/lang/zh/lang.php
+++ b/lib/plugins/popularity/lang/zh/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author ZDYX <zhangduyixiong@gmail.com>
  * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
  * @author George Sheraton guxd@163.com
-- 
cgit v1.2.3


From dba5f66fc1f3f8bd61cdda736dd1a2d00b628164 Mon Sep 17 00:00:00 2001
From: Emmanuel <seedfloyd@gmail.com>
Date: Thu, 8 Aug 2013 20:15:57 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/fr/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php
index b7e053197..7603b2a08 100644
--- a/lib/plugins/popularity/lang/fr/lang.php
+++ b/lib/plugins/popularity/lang/fr/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Guy Brand <gb@unistra.fr>
  * @author stephane.gully@gmail.com
  * @author Guillaume Turri <guillaume.turri@gmail.com>
-- 
cgit v1.2.3


From 931cef44059fa4b9a596d9247048388310313009 Mon Sep 17 00:00:00 2001
From: Egor Smkv <egorsmkv@gmail.com>
Date: Thu, 8 Aug 2013 20:20:53 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/uk/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/uk/lang.php b/lib/plugins/popularity/lang/uk/lang.php
index 584641482..9d67c1151 100644
--- a/lib/plugins/popularity/lang/uk/lang.php
+++ b/lib/plugins/popularity/lang/uk/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Ukrainian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author serg_stetsuk@ukr.net
  * @author okunia@gmail.com
  * @author Oleksandr Kunytsia <okunia@gmail.com>
-- 
cgit v1.2.3


From 1306d063bc48af5df32e884a0a166dc34376b5b3 Mon Sep 17 00:00:00 2001
From: r0sk <r0sk10@gmail.com>
Date: Sun, 11 Aug 2013 04:15:54 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/es/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php
index e46735782..337a8ea3a 100644
--- a/lib/plugins/popularity/lang/es/lang.php
+++ b/lib/plugins/popularity/lang/es/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Spanish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author oliver@samera.com.py
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Manuel Meco <manuel.meco@gmail.com>
-- 
cgit v1.2.3


From fe37a6515e213f6a0f1302a5a0807033205ffee5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 11 Aug 2013 12:28:16 +0200
Subject: improved bundled plugin descriptions

---
 lib/plugins/popularity/plugin.info.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt
index 17f3110c4..4dc971d3a 100644
--- a/lib/plugins/popularity/plugin.info.txt
+++ b/lib/plugins/popularity/plugin.info.txt
@@ -3,5 +3,5 @@ author  Andreas Gohr
 email   andi@splitbrain.org
 date    2012-11-29
 name    Popularity Feedback Plugin
-desc    Send anonymous data about your wiki to the developers.
+desc    Send anonymous data about your wiki to the DokuWiki developers
 url     http://www.dokuwiki.org/plugin:popularity
-- 
cgit v1.2.3


From 5a8121ba0505fea1c4af1b9dbfcc2cc27e3c7888 Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@gmail.com>
Date: Sun, 11 Aug 2013 19:40:56 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/ru/intro.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ru/intro.txt b/lib/plugins/popularity/lang/ru/intro.txt
index e8118e4eb..52f5a0ae2 100644
--- a/lib/plugins/popularity/lang/ru/intro.txt
+++ b/lib/plugins/popularity/lang/ru/intro.txt
@@ -1,6 +1,6 @@
 ====== Сбор информации о популярности ======
 
-Этот инструмент собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «ДокуВики». Эти данные помогут им понять, как именно используется «ДокуВики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям.
+Этот [[doku>popularity|инструмент]] собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «ДокуВики». Эти данные помогут им понять, как именно используется «ДокуВики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям.
 
 Отправляйте данные время от времени для того, чтобы сообщать разработчикам о том, что ваша вики «подросла». Отправленные вами данные будут идентифицированы по анонимному ID.
 
-- 
cgit v1.2.3


From 9b864f22ffb017242eb721f9b3de4fc1094ba8bc Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Mon, 12 Aug 2013 16:05:58 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/ko/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php
index 3463f4f8e..e9bcc7dcc 100644
--- a/lib/plugins/popularity/lang/ko/lang.php
+++ b/lib/plugins/popularity/lang/ko/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Korean language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author jk Lee
  * @author dongnak@gmail.com
  * @author Song Younghwan <purluno@gmail.com>
-- 
cgit v1.2.3


From 3199997341e3c54459d4ab0505d6a820536d3335 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Tue, 13 Aug 2013 18:26:22 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/ko/intro.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index 0c884546a..16475ce95 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,9 +1,9 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 도쿠위키 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지  도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
-보내려는 데이터는 설치 DokuWiki 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
+보내려는 데이터는 설치 도쿠위키 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
 
 실제 보내질 자료는 아래와 같습니다. 정보를 보내려면 "자료 보내기" 버튼을 클릭하세요.
\ No newline at end of file
-- 
cgit v1.2.3


From 25a7457ca09e648a58f9a5db5aa595253ce8a885 Mon Sep 17 00:00:00 2001
From: Saroj Dhakal <lotusnagarkot@gmail.com>
Date: Thu, 15 Aug 2013 05:36:08 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/ne/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ne/lang.php b/lib/plugins/popularity/lang/ne/lang.php
index d6aa56eb7..c0d925a46 100644
--- a/lib/plugins/popularity/lang/ne/lang.php
+++ b/lib/plugins/popularity/lang/ne/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Nepali language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
  * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
  * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
-- 
cgit v1.2.3


From c92968d1297188120d60b9de773b7c19915bc088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederico=20Gon=C3=A7alves=20Guimar=C3=A3es?=
 <frederico@teia.bio.br>
Date: Thu, 15 Aug 2013 11:36:04 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/pt-br/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/pt-br/lang.php b/lib/plugins/popularity/lang/pt-br/lang.php
index c2ec36145..280f072b8 100644
--- a/lib/plugins/popularity/lang/pt-br/lang.php
+++ b/lib/plugins/popularity/lang/pt-br/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  * @author Lucien Raven <lucienraven@yahoo.com.br>
  * @author Enrico Nicoletto <liverig@gmail.com>
-- 
cgit v1.2.3


From ab090718d52f2360b769f039b1bf5f496f23097f Mon Sep 17 00:00:00 2001
From: Felipe Castro <fefcas@yahoo.com.br>
Date: Thu, 15 Aug 2013 13:56:24 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/eo/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/eo/lang.php b/lib/plugins/popularity/lang/eo/lang.php
index c2bca23b1..5e67e5bdb 100644
--- a/lib/plugins/popularity/lang/eo/lang.php
+++ b/lib/plugins/popularity/lang/eo/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Esperanto language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Felipo Kastro <fefcas@gmail.com>
  * @author Felipe Castro <fefcas@gmail.com>
  * @author Robert Bogenschneider <robog@gmx.de>
-- 
cgit v1.2.3


From f0ee5aeb8e64276eee9beab496d611a28bb0a013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20K=C5=99ivka?= <krivka@fit.vutbr.cz>
Date: Thu, 15 Aug 2013 22:20:59 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/cs/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/cs/lang.php b/lib/plugins/popularity/lang/cs/lang.php
index ee090a131..4ab5916db 100644
--- a/lib/plugins/popularity/lang/cs/lang.php
+++ b/lib/plugins/popularity/lang/cs/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Czech language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
  * @author tomas@valenta.cz
  * @author Marek Sacha <sachamar@fel.cvut.cz>
-- 
cgit v1.2.3


From 68389009e322909ba9f85af41320c4886ca27309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Neves?= <drakferion@gmail.com>
Date: Fri, 16 Aug 2013 04:11:01 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/pt/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/pt/lang.php b/lib/plugins/popularity/lang/pt/lang.php
index ac27dc8c0..e30b9d62b 100644
--- a/lib/plugins/popularity/lang/pt/lang.php
+++ b/lib/plugins/popularity/lang/pt/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Portuguese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Enrico Nicoletto <liverig@gmail.com>
  * @author Fil <fil@meteopt.com>
  * @author André Neves <drakferion@gmail.com>
-- 
cgit v1.2.3


From 9fb553c08c19ca0ce9d63813af849413410a0b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Pl=C3=B6ger?= <develop@dieploegers.de>
Date: Mon, 19 Aug 2013 13:35:59 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/de-informal/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/de-informal/lang.php b/lib/plugins/popularity/lang/de-informal/lang.php
index 0abf90b0b..69efa7470 100644
--- a/lib/plugins/popularity/lang/de-informal/lang.php
+++ b/lib/plugins/popularity/lang/de-informal/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * German (informal) language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
-- 
cgit v1.2.3


From bcc165558b4d58baab4ccc85d9066f0c4ba7de2a Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@gmail.com>
Date: Tue, 20 Aug 2013 23:05:58 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/ru/submitted.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ru/submitted.txt b/lib/plugins/popularity/lang/ru/submitted.txt
index a239943a4..845410171 100644
--- a/lib/plugins/popularity/lang/ru/submitted.txt
+++ b/lib/plugins/popularity/lang/ru/submitted.txt
@@ -1,2 +1,3 @@
-====== Общественная обратная связь ======
+====== Сбор информации о популярности ======
+
 Данные были успешно отправлены.
\ No newline at end of file
-- 
cgit v1.2.3


From 6c954d25e8444996a43caaca6b96040f02628dea Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Wed, 21 Aug 2013 09:50:58 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/ko/intro.txt | 2 +-
 lib/plugins/popularity/lang/ko/lang.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index 16475ce95..bc9bb9dd0 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,6 +1,6 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 도쿠위키 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지  도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 도쿠위키 개발자에게 보냅니다. 이 [[doku>ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지 도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
 
diff --git a/lib/plugins/popularity/lang/ko/lang.php b/lib/plugins/popularity/lang/ko/lang.php
index e9bcc7dcc..f52e0007a 100644
--- a/lib/plugins/popularity/lang/ko/lang.php
+++ b/lib/plugins/popularity/lang/ko/lang.php
@@ -12,7 +12,7 @@
  */
 $lang['name']                  = '인기도 조사 (불러오는 데 시간이 걸릴 수 있습니다)';
 $lang['submit']                = '자료 보내기';
-$lang['autosubmit']            = '자료를 자동으로 매달 한번씩 보내기';
+$lang['autosubmit']            = '자료를 자동으로 한 달에 한 번씩 보내기';
 $lang['submissionFailed']      = '다음과 같은 이유로 자료 보내기에 실패했습니다:';
 $lang['submitDirectly']        = '아래의 양식에 맞춰 수동으로 작성된 자료를 보낼 수 있습니다.';
 $lang['autosubmitError']       = '다음과 같은 이유로 자동 자료 보내기에 실패했습니다:';
-- 
cgit v1.2.3


From f9f54ce2bb33d8bd5881929e1dea07520f704600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Urban=C4=8Di=C4=8D?= <mateju@svn.gnome.org>
Date: Mon, 26 Aug 2013 23:31:40 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/sl/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/sl/lang.php b/lib/plugins/popularity/lang/sl/lang.php
index 5c92dd7c4..abde6555b 100644
--- a/lib/plugins/popularity/lang/sl/lang.php
+++ b/lib/plugins/popularity/lang/sl/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Slovenian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matej Urbančič (mateju@svn.gnome.org)
  */
 $lang['name']                  = 'Poročilo o uporabi (nalaganje strani je lahko dolgotrajno)';
-- 
cgit v1.2.3


From 2f7a0e94cadfbc1ece3bd1d3ff23483b845cd420 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 10 Sep 2013 22:17:43 -0700
Subject: Fix CodeSniffer whitespace violoations

Removed extraneous whitespace to eliminate errors reported by the
Squiz.WhiteSpace.SuperfluousWhitespace sniff.
---
 lib/plugins/popularity/action.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/action.php b/lib/plugins/popularity/action.php
index f0cbb771b..9e2e78d11 100644
--- a/lib/plugins/popularity/action.php
+++ b/lib/plugins/popularity/action.php
@@ -35,7 +35,6 @@ class action_plugin_popularity extends Dokuwiki_Action_Plugin {
         //Actually send it
         $status = $this->helper->sendData( $this->helper->gatherAsString() );
 
-
         if ( $status !== '' ){
             //If an error occured, log it
             io_saveFile( $this->helper->autosubmitErrorFile, $status );
-- 
cgit v1.2.3


From 3daf9b20cab478b0c91d02f47cc3e0de195961ae Mon Sep 17 00:00:00 2001
From: Hideaki SAWADA <chuno@live.jp>
Date: Thu, 12 Sep 2013 14:16:01 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/ja/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/ja/lang.php b/lib/plugins/popularity/lang/ja/lang.php
index 774785511..50346c7ee 100644
--- a/lib/plugins/popularity/lang/ja/lang.php
+++ b/lib/plugins/popularity/lang/ja/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Japanese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Ikuo Obataya <i.obataya@gmail.com>
  * @author Daniel Dupriest <kououken@gmail.com>
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
-- 
cgit v1.2.3


From a1f2b5a3ca0af3e89bd77a5c68fd24b02416e60a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 19 Sep 2013 22:57:17 +0200
Subject: Fixed gathering of version of popularity plugin

---
 lib/plugins/popularity/admin.php  | 3 +--
 lib/plugins/popularity/helper.php | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index deb8048f4..f90f844e1 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -13,7 +13,6 @@ if(!defined('DOKU_INC')) die();
  * need to inherit from this class
  */
 class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
-    var $version;
 
     /**
      * @var helper_plugin_popularity
@@ -25,7 +24,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
         $this->helper = $this->loadHelper('popularity', false);
 
         $pluginInfo = $this->getInfo();
-        $this->version = $pluginInfo['date'];
+        $this->helper->setVersion($pluginInfo['date']);
     }
 
     /**
diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 0e38bcb88..9220d6b6d 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -69,6 +69,15 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
     }
 
+    /**
+     * Sets plugin version
+     *
+     * @param string $pluginversion
+     */
+    public function setVersion($pluginversion) {
+        $this->version = $pluginversion;
+    }
+
     /**
      * Check if autosubmit is enabled
      * @return boolean TRUE if we should send data once a month, FALSE otherwise
-- 
cgit v1.2.3


From 0da02e4da30749eeeec74b09658d8aac595a4fb7 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Tue, 1 Oct 2013 23:45:59 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/sk/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/sk/lang.php b/lib/plugins/popularity/lang/sk/lang.php
index bc46b03c5..ab7accf0c 100644
--- a/lib/plugins/popularity/lang/sk/lang.php
+++ b/lib/plugins/popularity/lang/sk/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Slovak language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Michal Mesko <michal.mesko@gmail.com>
  * @author exusik@gmail.com
  * @author Martin Michalek <michalek.dev@gmail.com>
-- 
cgit v1.2.3


From 844d8067502e44b64cfc7120b159fbb5f5f9b3e2 Mon Sep 17 00:00:00 2001
From: mehrdad <mehrdad.jafari.bojd@gmail.com>
Date: Fri, 4 Oct 2013 09:55:56 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/fa/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/fa/lang.php b/lib/plugins/popularity/lang/fa/lang.php
index 6a0529891..d2f071b07 100644
--- a/lib/plugins/popularity/lang/fa/lang.php
+++ b/lib/plugins/popularity/lang/fa/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Persian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author behrad eslamifar <behrad_es@yahoo.com)
  * @author Mohsen Firoozmandan <info@mambolearn.com>
  * @author omidmr@gmail.com
-- 
cgit v1.2.3


From e12412a22fc56a88b5c40cfc0d15a718dbba425e Mon Sep 17 00:00:00 2001
From: Santosh Joshi <sanjujoshhi@gmail.com>
Date: Sun, 6 Oct 2013 19:05:08 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/hi/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/hi/lang.php b/lib/plugins/popularity/lang/hi/lang.php
index c0085d72a..c818c7a1e 100644
--- a/lib/plugins/popularity/lang/hi/lang.php
+++ b/lib/plugins/popularity/lang/hi/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Hindi language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
  * @author yndesai@gmail.com
  */
-- 
cgit v1.2.3


From 30d21b979563135c12048a582ef5877368ef3d95 Mon Sep 17 00:00:00 2001
From: Serenity87HUN <anikototh87@gmail.com>
Date: Mon, 7 Oct 2013 15:16:34 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/hu/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/hu/lang.php b/lib/plugins/popularity/lang/hu/lang.php
index 5ee40eacc..213d22655 100644
--- a/lib/plugins/popularity/lang/hu/lang.php
+++ b/lib/plugins/popularity/lang/hu/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Hungarian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Sandor TIHANYI <stihanyi+dw@gmail.com>
  * @author Siaynoq Mage <siaynoqmage@gmail.com>
  * @author schilling.janos@gmail.com
-- 
cgit v1.2.3


From f119fb202b56acf8966f17b1ae4525c678b34865 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 14 Oct 2013 16:32:35 +0200
Subject: get version popularity plugin direct from plugin info

---
 lib/plugins/popularity/admin.php  |  3 ---
 lib/plugins/popularity/helper.php | 14 ++------------
 2 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index f90f844e1..bd2d090e1 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -22,9 +22,6 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
 
     function admin_plugin_popularity(){
         $this->helper = $this->loadHelper('popularity', false);
-
-        $pluginInfo = $this->getInfo();
-        $this->helper->setVersion($pluginInfo['date']);
     }
 
     /**
diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 9220d6b6d..9b092f2be 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -29,8 +29,6 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
      */
     var $popularityLastSubmitFile;
 
-    var $version;
-
 
     function helper_plugin_popularity(){
         global $conf;
@@ -69,15 +67,6 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
     }
 
-    /**
-     * Sets plugin version
-     *
-     * @param string $pluginversion
-     */
-    public function setVersion($pluginversion) {
-        $this->version = $pluginversion;
-    }
-
     /**
      * Check if autosubmit is enabled
      * @return boolean TRUE if we should send data once a month, FALSE otherwise
@@ -138,11 +127,12 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
         $data = array();
         $phptime = ini_get('max_execution_time');
         @set_time_limit(0);
+        $pluginInfo = $this->getInfo();
 
         // version
         $data['anon_id'] = md5(auth_cookiesalt());
         $data['version'] = getVersion();
-        $data['popversion'] = $this->version;
+        $data['popversion'] = $pluginInfo['date'];
         $data['language'] = $conf['lang'];
         $data['now']      = time();
         $data['popauto']  = (int) $this->isAutoSubmitEnabled();
-- 
cgit v1.2.3


From 36013a6f5c54847cc4a474853d502ad99ae84be6 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Mon, 14 Oct 2013 16:44:41 +0200
Subject: add PHPDocs to popularity plugin helper

---
 lib/plugins/popularity/helper.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index 9b092f2be..eacde06d0 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -37,6 +37,11 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
         $this->popularityLastSubmitFile = $conf['cachedir'].'/lastSubmitTime.txt';
     }
 
+    /**
+     * Return methods of this helper
+     *
+     * @return array with methods description
+     */
     function getMethods(){
         $result = array();
         $result[] = array(
@@ -123,6 +128,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
      */
     function _gather(){
         global $conf;
+        /** @var $auth DokuWiki_Auth_Plugin */
         global $auth;
         $data = array();
         $phptime = ini_get('max_execution_time');
@@ -244,6 +250,17 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
         return $data;
     }
 
+    /**
+     * Callback to search and count the content of directories in DokuWiki
+     *
+     * @param array &$data  Reference to the result data structure
+     * @param string $base  Base usually $conf['datadir']
+     * @param string $file  current file or directory relative to $base
+     * @param string $type  Type either 'd' for directory or 'f' for file
+     * @param int    $lvl   Current recursion depht
+     * @param array  $opts  option array as given to search()
+     * @return bool
+     */
     function _search_count(&$data,$base,$file,$type,$lvl,$opts){
         // traverse
         if($type == 'd'){
-- 
cgit v1.2.3


From 7b4ce9b0b6af9a1faa35049f96663febad344302 Mon Sep 17 00:00:00 2001
From: Soren Birk <soer9648@hotmail.com>
Date: Thu, 17 Oct 2013 13:30:54 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/da/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/da/lang.php b/lib/plugins/popularity/lang/da/lang.php
index bbf2a1ab4..78c447197 100644
--- a/lib/plugins/popularity/lang/da/lang.php
+++ b/lib/plugins/popularity/lang/da/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Danish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Kalle Sommer Nielsen <kalle@php.net>
  * @author Esben Laursen <hyber@hyber.dk>
  * @author Harith <haj@berlingske.dk>
-- 
cgit v1.2.3


From e4e504c4188ebbe344ed3b6b316137e99f98f642 Mon Sep 17 00:00:00 2001
From: Roy Zahor <roy.zahor@gmail.com>
Date: Mon, 21 Oct 2013 14:30:49 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/he/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/he/lang.php b/lib/plugins/popularity/lang/he/lang.php
index f619127cd..54341636b 100644
--- a/lib/plugins/popularity/lang/he/lang.php
+++ b/lib/plugins/popularity/lang/he/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Hebrew language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Dotan Kamber <kamberd@yahoo.com>
  * @author Moshe Kaplan <mokplan@gmail.com>
  * @author Yaron Yogev <yaronyogev@gmail.com>
-- 
cgit v1.2.3


From bbae9436b433e627e9b4f68fdc946357d214b40f Mon Sep 17 00:00:00 2001
From: Jens Hyllegaard <jens.hyllegaard@gmail.com>
Date: Mon, 21 Oct 2013 15:00:55 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/da/submitted.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/da/submitted.txt b/lib/plugins/popularity/lang/da/submitted.txt
index 7d7d5429c..88e9ba060 100644
--- a/lib/plugins/popularity/lang/da/submitted.txt
+++ b/lib/plugins/popularity/lang/da/submitted.txt
@@ -1,3 +1,3 @@
-====== Popularitetsfeeback ======
+====== Popularitetsfeedback ======
 
 Dataene er blevet sendt.
\ No newline at end of file
-- 
cgit v1.2.3


From af2e0360182d7eae880fe2d8804044043e5b8b46 Mon Sep 17 00:00:00 2001
From: Mustafa Aslan <maslan@hotmail.com>
Date: Tue, 22 Oct 2013 14:25:48 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/tr/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/tr/lang.php b/lib/plugins/popularity/lang/tr/lang.php
index 5339176bc..696ee38dc 100644
--- a/lib/plugins/popularity/lang/tr/lang.php
+++ b/lib/plugins/popularity/lang/tr/lang.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Turkish language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Aydın Coşkuner <aydinweb@gmail.com>
  * @author Cihan Kahveci <kahvecicihan@gmail.com>
  * @author Yavuz Selim <yavuzselim@gmail.com>
-- 
cgit v1.2.3


From 269e961b5d395674d18eb2bd82814b2620c05c19 Mon Sep 17 00:00:00 2001
From: Remon <no@email.local>
Date: Fri, 25 Oct 2013 14:00:59 +0200
Subject: translation update

---
 lib/plugins/popularity/lang/nl/lang.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/popularity')

diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php
index dda4a1d7f..6ffa71e82 100644
--- a/lib/plugins/popularity/lang/nl/lang.php
+++ b/lib/plugins/popularity/lang/nl/lang.php
@@ -14,11 +14,12 @@
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
  * @author Gerrit <klapinklapin@gmail.com>
+ * @author Remon <no@email.local>
  */
 $lang['name']                  = 'Populariteitsfeedback (kan even duren om in te laden)';
-$lang['submit']                = 'Verstuur';
+$lang['submit']                = 'Verstuur gegevens';
 $lang['autosubmit']            = 'Gegevens automatisch maandelijks verzenden';
-$lang['submissionFailed']      = 'De gegevens konden niet verstuurd worden vanwege de volgende fouten:';
+$lang['submissionFailed']      = 'De gegevens konden niet verstuurd worden vanwege de volgende fout:';
 $lang['submitDirectly']        = 'Je kan de gegevens handmatig sturen door het onderstaande formulier te verzenden.';
 $lang['autosubmitError']       = 'De laatste automatische verzending is mislukt vanwege de volgende fout:';
 $lang['lastSent']              = 'De gegevens zijn verstuurd.';
-- 
cgit v1.2.3