aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaryana Rozhankivska <mariroz@mr.lviv.ua>2014-04-03 13:53:47 +0300
committerMaryana Rozhankivska <mariroz@mr.lviv.ua>2014-04-03 13:53:47 +0300
commitd9bb0cdeb86fafa995fd17acea4dc5c097056fe6 (patch)
treefb559edba0c961b413135cdd812bde419b0bffcf
parent4d2bd6e507808b61ef09a0255686427edc04ad07 (diff)
downloadwallabag-d9bb0cdeb86fafa995fd17acea4dc5c097056fe6.tar.gz
wallabag-d9bb0cdeb86fafa995fd17acea4dc5c097056fe6.tar.zst
wallabag-d9bb0cdeb86fafa995fd17acea4dc5c097056fe6.zip
import w/o cron: explanation added
-rwxr-xr-xthemes/baggy/config.twig2
-rwxr-xr-xthemes/default/config.twig2
2 files changed, 2 insertions, 2 deletions
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index fc7890ec..725b775e 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -106,7 +106,7 @@
106 106
107 <h2>{% trans "Import" %}</h2> 107 <h2>{% trans "Import" %}</h2>
108 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p> 108 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
109 <p>{% trans "Please select export file on your computer:" %}</p> 109 <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
110 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data"> 110 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
111 <fieldset class="w500p"> 111 <fieldset class="w500p">
112 <div class="row"> 112 <div class="row">
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 7ccd0b36..5bdaf567 100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -105,7 +105,7 @@
105 105
106 <h2>{% trans "Import" %}</h2> 106 <h2>{% trans "Import" %}</h2>
107 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p> 107 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
108 <p>{% trans "Please select export file on your computer:" %}</p> 108 <p>{% trans "Please select export file on your computer and press \"Import\" button below.<br>Wallabag will parse your file, insert all URLs and start fetching of articles if required.<br>Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}</p>
109 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data"> 109 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
110 <fieldset class="w500p"> 110 <fieldset class="w500p">
111 <div class="row"> 111 <div class="row">