From 046b9316244c7a3a19446b2425d2370a26246af0 Mon Sep 17 00:00:00 2001 From: tcit Date: Fri, 25 Jul 2014 08:42:03 +0200 Subject: [PATCH 1/5] added email field --- inc/poche/Database.class.php | 4 ++-- inc/poche/Poche.class.php | 5 +++-- inc/poche/Routing.class.php | 2 +- install/index.php | 4 +++- themes/baggy/config.twig | 8 ++++++-- themes/baggy/css/main.css | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 2c80b64b5..8b52a9df8 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -113,10 +113,10 @@ class Database { $query = $this->executeQuery($sql, array()); } - public function install($login, $password) + public function install($login, $password, $email = '') { $sql = 'INSERT INTO users ( username, password, name, email) VALUES (?, ?, ?, ?)'; - $params = array($login, $password, $login, ' '); + $params = array($login, $password, $login, $email); $query = $this->executeQuery($sql, $params); $sequence = ''; diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index a49413f23..c8a09f30b 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -74,12 +74,13 @@ class Poche /** * Creates a new user */ - public function createNewUser($username, $password) + public function createNewUser($username, $password, $email = "") { if (!empty($username) && !empty($password)){ $newUsername = filter_var($username, FILTER_SANITIZE_STRING); + $email = filter_var($email, FILTER_SANITIZE_STRING); if (!$this->store->userExists($newUsername)){ - if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername))) { + if ($this->store->install($newUsername, Tools::encodeString($password . $newUsername), $email)) { Tools::logm('The new user ' . $newUsername . ' has been installed'); $this->messages->add('s', sprintf(_('The new user %s has been installed. Do you want to logout ?'), $newUsername)); Tools::redirect(); diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 2db57d127..6643397a0 100644 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@ -107,7 +107,7 @@ class Routing // update password $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); } elseif (isset($_GET['newuser'])) { - $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']); + $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']); } elseif (isset($_GET['deluser'])) { $this->wallabag->deleteUser($_POST['password4deletinguser']); } elseif (isset($_GET['epub'])) { diff --git a/install/index.php b/install/index.php index 1ae782a2b..9ed62de17 100755 --- a/install/index.php +++ b/install/index.php @@ -292,9 +292,11 @@ php composer.phar install

+

- + +

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 46735f074..ccdd2273d 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -138,11 +138,15 @@
- +
- + +
+
+ +
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 6d320cd2d..ad68c7b5b 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -89,7 +89,7 @@ form fieldset { margin: 0; } -form input[type="text"], select, form input[type="password"], form input[type="url"] { +form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] { border: 1px solid #999; padding: 0.5em 1em; min-width: 12em; From 9f3477a279d8a72a56000a956c940046d3645ff5 Mon Sep 17 00:00:00 2001 From: tcit Date: Fri, 25 Jul 2014 08:42:30 +0200 Subject: [PATCH 2/5] precision --- themes/baggy/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index ccdd2273d..0ae67bc32 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -145,7 +145,7 @@
- +
From 200c758ff411c013391d4c84bce24e0df9cfbac1 Mon Sep 17 00:00:00 2001 From: tcit Date: Sat, 26 Jul 2014 12:42:48 +0200 Subject: [PATCH 3/5] Translations --- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 11884 -> 12996 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 100 ++++++++++++++++---- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 16343 -> 16505 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 13 ++- themes/baggy/config.twig | 4 +- themes/courgette/config.twig | 2 +- themes/default/config.twig | 2 +- 7 files changed, 95 insertions(+), 26 deletions(-) diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index bf5f69e7286a149f8f2646d2fba934698e3d5ce3..24747ffa202f91e98a674a97070fd7abbae89bbc 100644 GIT binary patch literal 12996 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 P?z7e0XRH4=pRN8I5D)<& delta 3776 zcmbW&drZ}39LMp8AXJ3pB1S24K$NQ}iYACkDx!EvKn)eslOm#A0s%p@lNpJonEbq^ zrWlp6dByB9ot0MRG|gJ0+GH!OR&4f1R@1F|f6n=_wf^iG-}8EYx99SGp5KoPg`EYi z8^Jz145fwWN2K3xOa~VD@k413FvbVJ#wfgjvFP=HF+(sO<8dDPV?73A6ZXW{a1@@v zQ2ZI`!kAvhP<0t!D!n-lwT;Ihj>n$2zJL$kPgf> z`+5iJ`CHfrJ29C4jd!3i4|1XpY9L9NiW9IKu0;)~9@XJ4)C`+ZGdhJDz$Mgu*HD@K z4waF=Q5o~+q6R(!NursJ!SrtyQ_%owFd7?CGibvpcm}i3mtHla8K{{qKn-{mD%G2j zNtxZKfgeWQe;mE>9BL`gqcU+3U0S=VRP^9o3_(ABG^75QgwYs=d8m#`Py?(*HM9RR1ZB)CzqXrhj22y5RVN`S?67{+bvM(f~8c0LU zFb9?5xyXJrh4%3()N|`m_chwrccMBtjB5V`DwC%%0ncEp-v6JdL~|nOVLHc=$fV5z z%*AT#ix-hM$=pQ#%pHD|(m*b1^CqD--B?sdxu}`vqXxbZb>9j+hHEfU?|%Y$AuA>y zQ?LTn(Ces8_#VdKE$oj0^s1#uL}e%yTfB^!iJIvhZqk?XE;2(C&P%UNJqgub4eI%3 zbie;csc3{B;3&L;T3cU-XD0nn?{O6J=9pyLNvNfmk6MCKB$=ibHS;E4(seQZ^ zHPfA_J#q|{iH}j4xNKj)hg!1UtZO$+MD2|fq+OR8OT~v1nW%=ckvGXW(Y@yAUUMY- zrWGCd8EWs`#zgdw^GqZaHM7T1&llL|%TdqQqXXZ>IKBUusHo%LP&4gGKGkqAYG6aK zJEqvjW6+P|@%H)YsORUPW>|_^s%q3OUuPd%=*RH^)P1cOME~X_6?Jd{)!`LXDz9S# zwj+}?J{+(;%wS|WO)e@kb(o9WkdKZpv0W?qFo zaSiIm4R{Q9A%7-ouxHJyFookSsD?g7#%R7mmfLu-0raJeLw}r%%Ft}|LfxYQ4b}RS zb$8jruNoagOeA&^Dw^3iVkI%2m`h9`{#zz<;yFSYdcwZ=ylp)$B`WOW(fFdfPX4!1 zX(pV+)9#a=pH)yx>?58b^tx#SsVpS41Wecz5Q~Umgi0APm6%P;Ahg7riA+MTxHs`E z@haiIs5MfVMCje`DphtxYdp`c@5kZ9qr^I*kWkUGsrV2Fh-EsUDDA~W4?;_!Z-L5s z5AOcmRqcZaLa&U<6r#mlGv=VJ*7Ox3ho~V|6Za7+Ylvz>`{)6pt5j0aX4L+fLs-N# zqMUf#Gk\n" +"Last-Translator: tcit \n" "Language-Team: \n" -"Language: \n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" -"X-Poedit-Language: English\n" +"X-Generator: Poedit 1.6.4\n" "X-Poedit-Basepath: .\n" -"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" +"testing\n" msgid "wallabag, a read it later open source system" msgstr "wallabag, a read it later open source system" @@ -84,8 +83,12 @@ msgstr "A more recent development version is available." msgid "Feeds" msgstr "Feeds" -msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -msgstr "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgid "" +"Your feed token is currently empty and must first be generated to enable " +"feeds. Click here to generate it." +msgstr "" +"Your feed token is currently empty and must first be generated to enable " +"feeds. Click here to generate it." msgid "Unread feed" msgstr "Unread feed" @@ -102,8 +105,12 @@ msgstr "Your token:" msgid "Your user id:" msgstr "Your user id:" -msgid "You can regenerate your token: generate!." -msgstr "You can regenerate your token: generate!." +msgid "" +"You can regenerate your token: generate!" +"." +msgstr "" +"You can regenerate your token: generate!" +"." msgid "Change your theme" msgstr "Change your theme" @@ -135,8 +142,10 @@ msgstr "Repeat your new password:" msgid "Import" msgstr "Import" -msgid "Please execute the import script locally as it can take a very long time." -msgstr "Please execute the import script locally as it can take a very long time." +msgid "" +"Please execute the import script locally as it can take a very long time." +msgstr "" +"Please execute the import script locally as it can take a very long time." msgid "More info in the official documentation:" msgstr "More info in the official documentation:" @@ -184,8 +193,12 @@ msgstr "return to article" msgid "plop" msgstr "plop" -msgid "You can check your configuration here." -msgstr "You can check your configuration here." +msgid "" +"You can check your configuration " +"here." +msgstr "" +"You can check your configuration " +"here." msgid "favoris" msgstr "favoris" @@ -247,8 +260,14 @@ msgstr "installation" msgid "install your wallabag" msgstr "install your wallabag" -msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgid "" +"wallabag is still not installed. Please fill the below form to install it. " +"Don't hesitate to read the documentation " +"on wallabag website." +msgstr "" +"wallabag is still not installed. Please fill the below form to install it. " +"Don't hesitate to read the documentation " +"on wallabag website." msgid "Login" msgstr "Login" @@ -401,7 +420,8 @@ msgid "a more recent development version is available." msgstr "a more recent development version is available." msgid "Please execute the import script locally, it can take a very long time." -msgstr "Please execute the import script locally, it can take a very long time." +msgstr "" +"Please execute the import script locally, it can take a very long time." msgid "More infos in the official doc:" msgstr "More infos in the official doc:" @@ -448,8 +468,12 @@ msgstr "in demo mode, you can't update your password" msgid "your password has been updated" msgstr "your password has been updated" -msgid "the two fields have to be filled & the password must be the same in the two fields" -msgstr "the two fields have to be filled & the password must be the same in the two fields" +msgid "" +"the two fields have to be filled & the password must be the same in the two " +"fields" +msgstr "" +"the two fields have to be filled & the password must be the same in the two " +"fields" msgid "still using the \"" msgstr "still using the \"" @@ -505,6 +529,46 @@ msgstr "Cache deleted." msgid "Oops, it seems you don't have PHP 5." msgstr "Oops, it seems you don't have PHP 5." +msgid "Add user" +msgstr "Add user" + +msgid "Add a new user :" +msgstr "Add a new user :" + +msgid "Login for new user" +msgstr "Login for new user" + +msgid "Password for new user" +msgstr "Password for new user" + +msgid "Email for new user (not required)" +msgstr "Email for new user (not required)" + +msgid "Send" +msgstr "Send" + +msgid "Delete account" +msgstr "Delete account" + +msgid "You can delete your account by entering your password and validating." +msgstr "You can delete your account by entering your password and validating." + +msgid "Be careful, data will be erased forever (that is a very long time)." +msgstr "Be careful, data will be erased forever (that is a very long time)." + +msgid "Type here your password" +msgstr "Type here your password" + +msgid "You are the only user, you cannot delete your own account." +msgstr "You are the only user, you cannot delete your own account." + +msgid "" +"To completely remove wallabag, delete the wallabag folder on your web server " +"(and eventual databases)." +msgstr "" +"To completely remove wallabag, delete the wallabag folder on your web server " +"(and eventual databases)." + #~ msgid "poche it!" #~ msgstr "poche it!" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index b625e346c7ea82c3760705371100a4d25a5d10ac..d0f04615734e8a49cde94c00774842b22a5644b8 100644 GIT binary patch delta 4437 zcmYk;3vg7`9mnw#6ATG?K(K@)Law}$m;{Vb5(q*7fncCPjMWrVSjdK~-E7Ea7kRWS zsIgk1C=W&O5l|aKYb=D9Vrw8}m<~8~1Z&f&)G4)XLZz)$rZu(p`@4IX@yz`9bMDE# z_nh-T=Un(8@}G?{k&9_@I}PO&aU)T1y)p4I#!O36t1K>y|n6?O1$yb1q@y3t{HMOcD*fe&Zk z6PSU&Le1b<|gSo}Dh{OiU(8t%p`s27xv zjBcWNSkHA3)j=Ai6x&Uv%O*j(|;T-%7wO6KQv9r;Sn$YiX8y2u$8qnLQB|3{b zExi#cIxY#LqN%zKwItI}YrELCFU3->SK8|~)C>2c?mLWn?j&jgAK3Pf(A^WLO+A3h zK-%c&W{+f0Q9~J$O*0F1;}TSggQ(Q5v43wzrMw%pw!cNC{3FzR`cX^zPt<#^qEemA z2GDa37GNnd;E3^3(G1q3ZhSoY2eSvqa(xgTd>`}hD!Rv$Ms-+%B+*Pqb-V=KHMiG3 z)OR6Z+t;F=e;DI+{-1Lz#_UCzd1~0F`h&Ai^=Bust-mPvaienWZBG0)G261ZPuNr`#Mk^ zzKI%OH)h|I* zF~%H6WuTVn#9Q$UoYHEgI;tHwTpXD=d~Br@fExs z2XGb^(Tg@y2sQJ~s1M6F)N^}LnLKK*-$P~OFBp&iLQQxem;CF-RCbn9oR1p7eAIxJ z;`P{!?kPYmNjpx*Q^>na3~9R;Z$?(pY(#am54A)GP#HRbiP(*U@oa>OGH?MC@G|NY zd~R=KM1zU&lXIh0)Z_z?(fDI@iWvW-Ch*U)FITKIEPx&_i!ry z1BYNfJ98+OV4}`{1r??A9@NPF_If?)!5yef{2GVhr&x(`j6$1e5k7!*xDZd`d`#tN zEy5bqUO9k|U?0|EBRjfX=l?7feWP0@N7rT(>e%c;CTA|7QZ}e0`UOlzbzFkVNG0l2 zRNL!kk<^+t)O%mUbUcCDW9M!AhZxa}FH_N``NIBTbZKi+3d?D?;uK^?5Z*|-@;;=8Ds^q~fL)wXBSYdP1& zNRtWS4D3Yhg)6A%l1ZbU%S2^xIx1sxQG2VZjQlG_)ih{xEXNTTK+U`rwQIMcQoh^% zy%UwW)2Q#o1=M~0sE$5IP2fx0K4Mz5!<$fNJdE2Wntr(LDut1J{ufD!-(%0NH0|7WUI{zwr++Sn( zzL*6>Cc%Www}}v;HGYM7gHXCvUMF-MRW#6bZY}!%#kJJe*z0E8Z|kDf);D9h`aeh| zjyOSlm)J)zIrB1ch-YztRU_oRP;6V z69;rbxm`KQi`Lz9sUz|;;w9TAR(-9mY9lezwk6@MM5n!e7=KKRC4NqH5X%XbH>0>8 zxOD0d5L>k-`9vw9b9+B=tqix7r|~ech-f3Sh+IM?C5kzMj}tY-w}{ciwX&2-j=iYH zjkZ1>)xUX=_=PHzImA?A0`U;>Eb$zn;*H||?&8<6*Q>FJXd-Hf>BP1211gUY0iuj} zk#LJs-xLnib(IWlyUuC!`21W4oq+ctC*0x)=(8wiCxey7e8@+|kXcw6$iLL=*w(n2eIA!nL?%k?v{KDd3z_=_=`9IiB-Z}sP delta 4265 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 diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index 0343bfec6..e4e2ce56a 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -4,7 +4,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-10 20:09+0100\n" "PO-Revision-Date: \n" -"Last-Translator: Gilles Wittezaële \n" +"Last-Translator: tcit \n" "Language-Team: \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.6.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "wallabag, a read it later open source system" @@ -298,6 +298,9 @@ msgstr "Nom d'utilisateur" msgid "Password for new user" msgstr "Mot de passe du nouvel utilisateur" +msgid "Email for new user (not required)" +msgstr "E-mail pour le nouvel utilisateur (facultatif)" + msgid "Send" msgstr "Envoyer" @@ -320,10 +323,12 @@ msgstr "" "Vous êtes l'unique utilisateur, vous ne pouvez pas supprimer votre compte." msgid "" -"To completely remove wallabag, delete the wallabag folder on your web server." +"To completely remove wallabag, delete the wallabag folder on your web server " +"(and eventual databases)." msgstr "" "Pour désinstaller complètement wallabag, supprimez le répertoire " -"wallabag de votre serveur Web." +"wallabag de votre serveur Web (ainsi que les bases de données " +"éventuelles)." msgid "Save a link" msgstr "Ajouter un lien" diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 0ae67bc32..12934c8b5 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -142,7 +142,7 @@
- +
@@ -167,5 +167,5 @@
{% else %}

{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}

{% endif %} + {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

{% endif %} {% endblock %} diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig index 9ab58461a..e921b4998 100755 --- a/themes/courgette/config.twig +++ b/themes/courgette/config.twig @@ -116,6 +116,6 @@ {% else %}

{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}

{% endif %} + {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

{% endif %} {% endblock %} diff --git a/themes/default/config.twig b/themes/default/config.twig index 160f6046a..72c5d6f4b 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -162,5 +162,5 @@ {% else %}

{% trans "You are the only user, you cannot delete your own account." %}
- {% trans "To completely remove wallabag, delete the wallabag folder on your web server." %}

{% endif %} + {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

{% endif %} {% endblock %} From 280972a66cd1a64003b4c4e5cc9b17347c1638bc Mon Sep 17 00:00:00 2001 From: tcit Date: Sat, 26 Jul 2014 12:44:55 +0200 Subject: [PATCH 4/5] changes in all themes --- themes/courgette/config.twig | 4 ++++ themes/default/config.twig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig index e921b4998..c49337942 100755 --- a/themes/courgette/config.twig +++ b/themes/courgette/config.twig @@ -97,6 +97,10 @@ +
+ + +
diff --git a/themes/default/config.twig b/themes/default/config.twig index 72c5d6f4b..9dfbc5da7 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -143,6 +143,10 @@ +
+ + +
From 2e8625c25fa603d0d870bf2f90821e900be27fd0 Mon Sep 17 00:00:00 2001 From: tcit Date: Tue, 29 Jul 2014 22:18:15 +0200 Subject: [PATCH 5/5] little fix --- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 12996 -> 12917 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 1 - 2 files changed, 1 deletion(-) diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index 24747ffa202f91e98a674a97070fd7abbae89bbc..1f729b60dcb1f67c1a00d55ceb85fbbb6b9ef378 100644 GIT binary patch delta 1434 zcmXZcO-Phc6vpurIqImBTBGJy>ZqfYnQ0S~BvO(lLgYsg1WBktK?M=oLVLp^qJ@Ql zN(r@S5fvm2gb)cus8G^EG)N($7A+K76h%<P`5D@$^?wcmD%VVnLa^(KXyae*}H_2o>-IR^lvf#9ycY(s)ox zAP==~DUzsT72XH+Sjz_oP#a&t4jje(xPm*ddb3$8cH=NUM;*{il&aui)T8Y}1%8`< z2{?r+{j}Gg$0+C9k~a|C>TZ;Wnplo1bp#W!#T)NH9drVf$vM=c>-G9$sLb!7-qs|l zLhn(PS@1rOtDs_>Z}~J7VFdkHhuXLabyo*b8?|FTo<_Zq>!_07Mc%E&un<3>9@}r^ z&oZ{TiR{A^`bSagd(csa7inmNAuPmaNL6hfb?{$QKtaOS#<{4#qNvK$dHqIAqTk|; zA3?3}L?zgZ$#@C%t+-K1{WUPofEGUVCdRx8FHi@}p$=R`m2wHGqJ2i5g$20q65NGh zJcg>wAhzKh%*9pI517BoEC+L{sJ}`YVIURTQID?+bx-XoN*X4-y3`71TpSR1fz3F+(7J?()C)o^$TipH0tQla~WM1AfLt zrWg}oj5(KTOd5{j7JPtq{D?Ui!(=oTV+iiY2&}<%*ofhH97}Nk3vd==aTNnGHr<%D zn3!%nW&@2J24o4wU^RweGsfdl48pUhg(J8buVW}aMQuEX#A+5$>wcgDjkJ2##i72- zK<$@n^%xUJBcB0fP=OY#Lj~l<-FOCr@fj+>In=?6sC6r-4F8}Gh|chi$DzK@#w094 zRjd|OVV8%7G8x85oIq{(2o=aHWKXk#$|NGwdr&M^(9gwkJcg>wV^rqzs05Z#SMnF5 zFgVM5)fQAjo+KJtXvHLHCE#?mSIu0G25^o58^bAU?9=yfJ>+f-b6jxDdfj| z;#V+6=6XvXi|VIg0q2_>-#{aVGtrK^qdwG~4q^z7`NnUc4w^(|@&xthW_ROa7M zZ!37Kw?fIN%2-kJRcPUS(?LTK4Pqz`p*FsNx{52PjmB{kK198dcc_woK_0sCw;7Xy znW)EBj!c;*R3hgw0&k<%-$#!oUeM46isgM<@?Z|3)BZ;r~{Hv2WFriTMklP<3OH= zsY5HC!c4q_s>}i&!q1q9#SZU3uv$!@-{zqHD(N5tQ8J~XqXK<{`tAeX z!|$jPU*%=$PUmq4E}`~G$oD?NJj|kh7?ZIdbrsh_XsASYr{lx3;ttf>D!W}xZEjnY z%h}V|TIqDR+8l)`_SWuBm%Y>3)7H~{!d}0ptj6BwYOwb?J35>V&X)fTTc@+v?dq|) QUA^wMu9oSN)SWT^0EeZlrvLx| diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index 5498a0400..8292a196e 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -12,7 +12,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.6.4\n" "X-Poedit-Basepath: .\n" -"testing\n" msgid "wallabag, a read it later open source system" msgstr "wallabag, a read it later open source system"