Changeset 2569:2a300bc67576 for plugins/importExport

Timestamp:

11/18/13 20:53:30 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Message:

And the end of the contextual help in english, big thanks to Luce Carevic and Pierre Equoy!

File:

• plugins/importExport/locales/en/help/import.html (modified) (4 diffs)

plugins/importExport/locales/en/help/import.html

@@ -14 +14 @@
 <p>Select the backup file (exported from another Dotclear install) or select one from the root directory of your media manager and click on the <strong>Import</strong> button to start the import process.</p>
 
-<p>Note: The content imported during this process will be added to the existing content of the current blog, nothing will be lost.</p>
+<p>Note: the content imported during this process will be added to the existing content of the current blog, nothing will be lost.</p>
 
 <h5>Multiple blogs</h5>
 
-<p>Select the full backup file from your computer or select one from your the root folder of your media manager, enter your password and click on the <strong>Import</strong> button to start the full import process.</p>
+<p>Select the full backup file from your computer or select one from the root folder of your media manager, enter your password and click on the <strong>Import</strong> button to start the full import process.</p>
 
-<p><strong>Warning:</strong> The whole content from the current blog will be deleted and replaced by the content of the backup file. Only current users will be kept. Additional users form the backup file will be appended to the current users list.</p>
+<p><strong>Warning:</strong> the whole content of the current blog will be deleted and replaced by the content of the backup file. Only current users will be kept. Additional users from the backup file will be added to the current users list.</p>
 
 <h4>RSS or Atom feed import</h4>
@@ -34 +34 @@
 <p>Enter the server URL where the Dotclear 1.2 database to import is located, then input the database name, the user name and password to connect to the database and the database tables prefix used in the Dotclear 1.2 installation. You can find this information in the <code>conf/config.php</code> file from your Dotclear 1.2 installation.</p>
 
-<p>Click on  the <strong>Import my blog now</strong> button to start the import process.</p>
+<p>Click on the <strong>Import my blog now</strong> button to start the import process.</p>
 
 <p>You can decrease or increase the amount of entries imported at once using the <strong>Number of entries to import at once</strong> field, depending on the access speed of your Dotclear 1.2 installation.</p>
@@ -44 +44 @@
 <p>Enter the server URL where the Wordpress database to import is located, then input the database name, the user name and password to connect to the database and the database tables prefix used in the Wordpress installation.</p>
 
-<p>You can set up a few import options regarding the categories import and the number of entries to import at once. You can also define the syntax to use for the entries and the comments content (XHTML, Wiki or others depending on the currently installed and activated syntaxes).</p>
+<p>You can set up a few import options regarding the categories import and the number of entries to import at once. You can also define the syntax used for the entries and the comments content (XHTML, Wiki or others depending on the currently installed and activated syntaxes).</p>
 
 <p>Click on <strong>Import my blog now</strong> to start the import process.</p>
@@ -50 +50 @@
 <hr />
 
-<p>Note: The export functions are now located in the<a href="/plugin.php?p=maintenance&tab=backup#backup">Maintenance</a> page.</p>
+<p>Note: the export functions are now located in the<a href="/plugin.php?p=maintenance&tab=backup#backup">Maintenance</a> page.</p>
 
 </body>