Merge branch 'dev' into randomarticle

author: Thomas Citharel <tcit@tcit.fr> 2014-12-22 14:33:01 +0100
committer: Thomas Citharel <tcit@tcit.fr> 2014-12-22 14:33:01 +0100
commit: f3917b1ee4bba812e82da57dd181f50d62926db4 (patch)
tree: cb4b04931e97e4a69500bf9d7aa5c21985cab59e /locale/en_EN.utf8
parent: 311baf86befde0557faea614ca4d13bb2bd2cc66 (diff)
parent: 9254b6cf460edec3a59e9ccc19873481a1d19c90 (diff)
download: wallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.tar.gz
wallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.tar.zst
wallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.zip
2 files changed, 131 insertions, 28 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 12fef6c8..c9105ee6 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
Binary files differ
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 98c6a3e8..81f87342 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wallabag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:17+0300\n"
+"POT-Creation-Date: 2014-07-26 15:17+0300\n"
 "PO-Revision-Date: \n"
-"Last-Translator: tcit <tcit@openmailbox.org>\n"
+"Last-Translator: Thomas Citharel <tcit@openmailbox.org>\n"
 "Language-Team: \n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -113,8 +113,7 @@ msgstr "Your user ID:"
 msgid ""
 "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
 "</a>."
-msgstr ""
+msgstr "<a href='?feed&amp;action=generate'>Regenerate Token</a>"
-"<a href='?feed&amp;action=generate'>Regenerate Token</a>"
 msgid "Change your theme"
 msgstr "Change Your Theme"
@@ -146,25 +145,40 @@ msgstr "Repeat your new password:"
 msgid "Import"
 msgstr "Import"
-msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format."
-msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any fil in appropriate JSON or HTML format."
 msgid ""
-"Please execute the import script locally as it can take a very long time."
+"You can import your Pocket, Readability, Instapaper, Wallabag or any data in "
+"appropriate json or html format."
 msgstr ""
+"You can import your Pocket, Readability, Instapaper, wallabag or any fil in "
+"appropriate JSON or HTML format."
-msgid "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required."
+msgid ""
-msgstr "Please select export file on your computer and press &ldquo;Import&rdquo; button below. wallabag will parse your file, insert all URLs and start fetching of articles if required."
+"Please select export file on your computer and press \"Import\" button "
-"Please execute the import script locally as it can take a very long time."
+"below. Wallabag will parse your file, insert all URLs and start fetching of "
+"articles if required."
+msgstr ""
+"Please select export file on your computer and press &ldquo;Import&rdquo; "
+"button below. wallabag will parse your file, insert all URLs and start "
+"fetching of articles if required.Please execute the import script locally as "
+"it can take a very long time."
 msgid "You can click here to fetch content for articles with no content."
 msgstr "Fetch content for articles with no content"
+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:"
-msgid "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgid ""
-msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
+"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr ""
+"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
+"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
 msgid "Import from Pocket"
 msgstr "Import from Pocket"
@@ -463,7 +477,9 @@ msgid "a more recent development version is available."
 msgstr "A more recent development version is available."
 msgid "You can clear cache to check the latest release."
-msgstr "You can <a href=\"#cache\">clear the cache</a> to check for the latest release."
+msgstr ""
+"You can <a href=\"#cache\">clear the cache</a> to check for the latest "
+"release."
 msgid "Please execute the import script locally, it can take a very long time."
 msgstr ""
@@ -518,8 +534,8 @@ msgid ""
 "the two fields have to be filled & the password must be the same in the two "
 "fields"
 msgstr ""
-"The two fields must be filled, and the password must be the same in both "
+"les deux champs doivent être remplis et le mot de passe doit être le même "
-"fields"
+"pour les deux champs"
 msgid "still using the \""
 msgstr "Still using the \""
@@ -625,12 +641,17 @@ msgstr "Tag these results as"
 msgid "Fancy an E-Book ?"
 msgstr "Fancy an E-Book?"
-msgid ""
+msgid "Click to get all your articles in one ebook :"
-"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
+msgstr "Click to get all your articles in one ebook :"
-"link</a> to get all your articles in one ebook (ePub 3 format)."
-msgstr ""
+msgid "Generate ePub file"
-"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate EPUB\">this "
+msgstr "Generate ePub file"
-"link</a> to get all your articles in one ebook (EPUB 3 format)."
+msgid "Generate Mobi file"
+msgstr "Generate Mobi file"
+msgid "Generate PDF file"
+msgstr "Generate PDF file"
 msgid ""
 "This can <b>take a while</b> and can <b>even fail</b> if you have too many "
@@ -639,14 +660,96 @@ msgstr ""
 "This can <b>take a while</b> and can <b>even fail</b> if you have too many "
 "articles, depending on your server configuration."
-msgid "Download the articles from this tag in an epub"
+msgid "Download the articles from this tag in an ePub file"
-msgstr "Download the articles from this tag in an EPUB"
+msgstr "Download the articles from this tag in an ePub file"
+msgid "Download the articles from this tag in an Mobi file"
+msgstr "Download the articles from this tag in an Mobi file"
+msgid "Download the articles from this tag in an PDF file"
+msgstr "Download the articles from this tag in an PDF file"
+msgid "Download the articles from this search in an ePub"
+msgstr "Download the articles from this search in an ePub"
+msgid "Download the articles from this search in a Mobi file"
+msgstr "Download the articles from this search in a Mobi file"
+msgid "Download the articles from this search in a PDF file"
+msgstr "Download the articles from this search in a PDF file"
+msgid "Download the articles from this category in an ePub"
+msgstr "Download the articles from this category in an ePub"
+msgid "Download the articles from this category in a Mobi file"
+msgstr "Download the articles from this category in a Mobi file"
+msgid "Download the articles from this category in a PDF file"
+msgstr "Download the articles from this category in a PDF file"
+msgid "Download as ePub3"
+msgstr "Download as ePub3"
+msgid "Download as Mobi"
+msgstr "Download as Mobi"
+msgid "Download as PDF"
+msgstr "Download as PDF"
+msgid "All my articles on %s"
+msgstr "All my articles on %s"
+msgid "Allarticles"
+msgstr "Allarticles"
+msgid "Articles tagged %s"
+msgstr "Articles tagged %s"
+msgid "Tag %s"
+msgstr "Tag %s"
+msgid "Articles in category %s"
+msgstr "All articles in category %s"
+msgid "Category %s"
+msgstr "Category %s"
+msgid "Articles for search %s"
+msgstr "All articles for search %s"
+msgid "Search %s"
+msgstr "Search %s"
+msgid "wallabag articles book"
+msgstr "wallabag articles book"
+msgid "Some articles saved on my wallabag"
+msgstr "Some articles saved on my wallabag"
+msgid "Produced by wallabag with PHPePub"
+msgstr "Produced by wallabag with PHPePub"
+msgid ""
+"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</"
+"a> if you have trouble with the display of this E-Book on your device."
+msgstr ""
+"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</"
+"a> if you have trouble with the display of this E-Book on your device."
+msgid "Produced by wallabag with PHPMobi"
+msgstr "Produced by wallabag with PHPMobi"
+msgid "Mail function is disabled. You can't send emails from your server"
+msgstr "Mail function is disabled. You can't send emails from your server"
+msgid "You didn't set your kindle's email adress !"
+msgstr "You didn't set your kindle's email adress !"
-msgid "Download the articles from this search in an epub"
+msgid "The email has been sent to your kindle !"
-msgstr "Download the articles from this search in an EPUB"
+msgstr "The email has been sent to your kindle !"
-msgid "Download the articles from this category in an epub"
+msgid "Produced by wallabag with mPDF"
-msgstr "Download the articles from this category in an EPUB"
+msgstr "Produced by wallabag with mPDF"
 #~ msgid "poche it!"
 #~ msgstr "poche it!"
author	Thomas Citharel <tcit@tcit.fr>	2014-12-22 14:33:01 +0100
committer	Thomas Citharel <tcit@tcit.fr>	2014-12-22 14:33:01 +0100
commit	f3917b1ee4bba812e82da57dd181f50d62926db4 (patch)
tree	cb4b04931e97e4a69500bf9d7aa5c21985cab59e /locale/en_EN.utf8
parent	311baf86befde0557faea614ca4d13bb2bd2cc66 (diff)
parent	9254b6cf460edec3a59e9ccc19873481a1d19c90 (diff)
download	wallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.tar.gz wallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.tar.zst wallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.zip

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 12fef6c8..c9105ee6 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
Binary files differ


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 98c6a3e8..81f87342 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
@@ -2,9 +2,9 @@ msgid ""
2	msgstr ""	2	msgstr ""
3	"Project-Id-Version: wallabag\n"	3	"Project-Id-Version: wallabag\n"
4	"Report-Msgid-Bugs-To: \n"	4	"Report-Msgid-Bugs-To: \n"
5	"POT-Creation-Date: 2014-02-25 15:17+0300\n"	5	"POT-Creation-Date: 2014-07-26 15:17+0300\n"
6	"PO-Revision-Date: \n"	6	"PO-Revision-Date: \n"
7	"Last-Translator: tcit <tcit@openmailbox.org>\n"	7	"Last-Translator: Thomas Citharel <tcit@openmailbox.org>\n"
8	"Language-Team: \n"	8	"Language-Team: \n"
9	"Language: en\n"	9	"Language: en\n"
10	"MIME-Version: 1.0\n"	10	"MIME-Version: 1.0\n"
@@ -113,8 +113,7 @@ msgstr "Your user ID:"
113	msgid ""	113	msgid ""
114	"You can regenerate your token: <a href='?feed&action=generate'>generate!"	114	"You can regenerate your token: <a href='?feed&action=generate'>generate!"
115	"</a>."	115	"</a>."
116	msgstr ""	116	msgstr "<a href='?feed&action=generate'>Regenerate Token</a>"
117	"<a href='?feed&action=generate'>Regenerate Token</a>"
118		117
119	msgid "Change your theme"	118	msgid "Change your theme"
120	msgstr "Change Your Theme"	119	msgstr "Change Your Theme"
@@ -146,25 +145,40 @@ msgstr "Repeat your new password:"
146	msgid "Import"	145	msgid "Import"
147	msgstr "Import"	146	msgstr "Import"
148		147
149	msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format."
150	msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any fil in appropriate JSON or HTML format."
151
152	msgid ""	148	msgid ""
153	"Please execute the import script locally as it can take a very long time."	149	"You can import your Pocket, Readability, Instapaper, Wallabag or any data in "
		150	"appropriate json or html format."
154	msgstr ""	151	msgstr ""
		152	"You can import your Pocket, Readability, Instapaper, wallabag or any fil in "
		153	"appropriate JSON or HTML format."
155		154
156	msgid "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required."	155	msgid ""
157	msgstr "Please select export file on your computer and press “Import” button below. wallabag will parse your file, insert all URLs and start fetching of articles if required."	156	"Please select export file on your computer and press \"Import\" button "
158	"Please execute the import script locally as it can take a very long time."	157	"below. Wallabag will parse your file, insert all URLs and start fetching of "
		158	"articles if required."
		159	msgstr ""
		160	"Please select export file on your computer and press “Import” "
		161	"button below. wallabag will parse your file, insert all URLs and start "
		162	"fetching of articles if required.Please execute the import script locally as "
		163	"it can take a very long time."
159		164
160	msgid "You can click here to fetch content for articles with no content."	165	msgid "You can click here to fetch content for articles with no content."
161	msgstr "Fetch content for articles with no content"	166	msgstr "Fetch content for articles with no content"
162		167
		168	msgid ""
		169	"Please execute the import script locally as it can take a very long time."
		170	msgstr ""
		171	"Please execute the import script locally as it can take a very long time."
		172
163	msgid "More info in the official documentation:"	173	msgid "More info in the official documentation:"
164	msgstr "More info in the official documentation:"	174	msgstr "More info in the official documentation:"
165		175
166	msgid "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"	176	msgid ""
167	msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"	177	"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
		178	"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
		179	msgstr ""
		180	"(<a href=\"http://doc.wallabag.org/en/User_documentation/"
		181	"Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
168		182
169	msgid "Import from Pocket"	183	msgid "Import from Pocket"
170	msgstr "Import from Pocket"	184	msgstr "Import from Pocket"
@@ -463,7 +477,9 @@ msgid "a more recent development version is available."
463	msgstr "A more recent development version is available."	477	msgstr "A more recent development version is available."
464		478
465	msgid "You can clear cache to check the latest release."	479	msgid "You can clear cache to check the latest release."
466	msgstr "You can <a href=\"#cache\">clear the cache</a> to check for the latest release."	480	msgstr ""
		481	"You can <a href=\"#cache\">clear the cache</a> to check for the latest "
		482	"release."
467		483
468	msgid "Please execute the import script locally, it can take a very long time."	484	msgid "Please execute the import script locally, it can take a very long time."
469	msgstr ""	485	msgstr ""
@@ -518,8 +534,8 @@ msgid ""
518	"the two fields have to be filled & the password must be the same in the two "	534	"the two fields have to be filled & the password must be the same in the two "
519	"fields"	535	"fields"
520	msgstr ""	536	msgstr ""
521	"The two fields must be filled, and the password must be the same in both "	537	"les deux champs doivent être remplis et le mot de passe doit être le même "
522	"fields"	538	"pour les deux champs"
523		539
524	msgid "still using the \""	540	msgid "still using the \""
525	msgstr "Still using the \""	541	msgstr "Still using the \""
@@ -625,12 +641,17 @@ msgstr "Tag these results as"
625	msgid "Fancy an E-Book ?"	641	msgid "Fancy an E-Book ?"
626	msgstr "Fancy an E-Book?"	642	msgstr "Fancy an E-Book?"
627		643
628	msgid ""	644	msgid "Click to get all your articles in one ebook :"
629	"Click on <a href=\"./?epub&method=all\" title=\"Generate ePub\">this "	645	msgstr "Click to get all your articles in one ebook :"
630	"link</a> to get all your articles in one ebook (ePub 3 format)."	646
631	msgstr ""	647	msgid "Generate ePub file"
632	"Click on <a href=\"./?epub&method=all\" title=\"Generate EPUB\">this "	648	msgstr "Generate ePub file"
633	"link</a> to get all your articles in one ebook (EPUB 3 format)."	649
		650	msgid "Generate Mobi file"
		651	msgstr "Generate Mobi file"
		652
		653	msgid "Generate PDF file"
		654	msgstr "Generate PDF file"
634		655
635	msgid ""	656	msgid ""
636	"This can <b>take a while</b> and can <b>even fail</b> if you have too many "	657	"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
@@ -639,14 +660,96 @@ msgstr ""
639	"This can <b>take a while</b> and can <b>even fail</b> if you have too many "	660	"This can <b>take a while</b> and can <b>even fail</b> if you have too many "
640	"articles, depending on your server configuration."	661	"articles, depending on your server configuration."
641		662
642	msgid "Download the articles from this tag in an epub"	663	msgid "Download the articles from this tag in an ePub file"
643	msgstr "Download the articles from this tag in an EPUB"	664	msgstr "Download the articles from this tag in an ePub file"
		665
		666	msgid "Download the articles from this tag in an Mobi file"
		667	msgstr "Download the articles from this tag in an Mobi file"
		668
		669	msgid "Download the articles from this tag in an PDF file"
		670	msgstr "Download the articles from this tag in an PDF file"
		671
		672	msgid "Download the articles from this search in an ePub"
		673	msgstr "Download the articles from this search in an ePub"
		674
		675	msgid "Download the articles from this search in a Mobi file"
		676	msgstr "Download the articles from this search in a Mobi file"
		677
		678	msgid "Download the articles from this search in a PDF file"
		679	msgstr "Download the articles from this search in a PDF file"
		680
		681	msgid "Download the articles from this category in an ePub"
		682	msgstr "Download the articles from this category in an ePub"
		683
		684	msgid "Download the articles from this category in a Mobi file"
		685	msgstr "Download the articles from this category in a Mobi file"
		686
		687	msgid "Download the articles from this category in a PDF file"
		688	msgstr "Download the articles from this category in a PDF file"
		689
		690	msgid "Download as ePub3"
		691	msgstr "Download as ePub3"
		692
		693	msgid "Download as Mobi"
		694	msgstr "Download as Mobi"
		695
		696	msgid "Download as PDF"
		697	msgstr "Download as PDF"
		698
		699	msgid "All my articles on %s"
		700	msgstr "All my articles on %s"
		701
		702	msgid "Allarticles"
		703	msgstr "Allarticles"
		704
		705	msgid "Articles tagged %s"
		706	msgstr "Articles tagged %s"
		707
		708	msgid "Tag %s"
		709	msgstr "Tag %s"
		710
		711	msgid "Articles in category %s"
		712	msgstr "All articles in category %s"
		713
		714	msgid "Category %s"
		715	msgstr "Category %s"
		716
		717	msgid "Articles for search %s"
		718	msgstr "All articles for search %s"
		719
		720	msgid "Search %s"
		721	msgstr "Search %s"
		722
		723	msgid "wallabag articles book"
		724	msgstr "wallabag articles book"
		725
		726	msgid "Some articles saved on my wallabag"
		727	msgstr "Some articles saved on my wallabag"
		728
		729	msgid "Produced by wallabag with PHPePub"
		730	msgstr "Produced by wallabag with PHPePub"
		731
		732	msgid ""
		733	"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</"
		734	"a> if you have trouble with the display of this E-Book on your device."
		735	msgstr ""
		736	"Please open <a href='https://github.com/wallabag/wallabag/issues'>an issue</"
		737	"a> if you have trouble with the display of this E-Book on your device."
		738
		739	msgid "Produced by wallabag with PHPMobi"
		740	msgstr "Produced by wallabag with PHPMobi"
		741
		742	msgid "Mail function is disabled. You can't send emails from your server"
		743	msgstr "Mail function is disabled. You can't send emails from your server"
		744
		745	msgid "You didn't set your kindle's email adress !"
		746	msgstr "You didn't set your kindle's email adress !"
644		747
645	msgid "Download the articles from this search in an epub"	748	msgid "The email has been sent to your kindle !"
646	msgstr "Download the articles from this search in an EPUB"	749	msgstr "The email has been sent to your kindle !"
647		750
648	msgid "Download the articles from this category in an epub"	751	msgid "Produced by wallabag with mPDF"
649	msgstr "Download the articles from this category in an EPUB"	752	msgstr "Produced by wallabag with mPDF"
650		753
651	#~ msgid "poche it!"	754	#~ msgid "poche it!"
652	#~ msgstr "poche it!"	755	#~ msgstr "poche it!"