Changeset 1559:b6601f74bcd2
- Timestamp:
- 08/24/13 11:25:47 (12 years ago)
- Branch:
- default
- Files:
-
- 8 edited
-
admin/style/default.css (modified) (2 diffs)
-
locales/fr/main.po (modified) (1 diff)
-
locales/fr/plugins.po (modified) (6 diffs)
-
plugins/importExport/inc/class.dc.export.flat.php (modified) (1 diff)
-
plugins/importExport/inc/class.dc.import.dc1.php (modified) (2 diffs)
-
plugins/importExport/inc/class.dc.import.feed.php (modified) (2 diffs)
-
plugins/importExport/inc/class.dc.import.flat.php (modified) (5 diffs)
-
plugins/importExport/inc/class.dc.import.wp.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
admin/style/default.css
r1558 r1559 1028 1028 /* ------------------------------------------------------------------ messages */ 1029 1029 .error, .message, .static-msg, .static-msg, .success { 1030 padding: 0.5em 0.5em 0.5em 48px;1030 padding: 1em 0.5em 0.5em 48px; 1031 1031 margin-bottom: 1em; 1032 1032 border-radius: 8px; … … 1387 1387 padding: 0; 1388 1388 background: transparent; 1389 } 1390 input[type=file] { 1391 margin-top: .3em; 1392 margin-bottom: .3em; 1389 1393 } 1390 1394 label { -
locales/fr/main.po
r1556 r1559 1274 1274 msgstr "Taille maximale %s" 1275 1275 1276 msgid "maximum size %s" 1277 msgstr "taille maximale %s" 1278 1276 1279 msgid "Private" 1277 1280 msgstr "Privé" -
locales/fr/plugins.po
r1528 r1559 809 809 810 810 msgid "Compress file" 811 msgstr "Compresse le fichier"811 msgstr "Compresser le fichier" 812 812 813 813 msgid "You may also want to download your media directory as a zip file" … … 859 859 msgstr "" 860 860 "Notez que cela supprimera les catégories, liste de liens, billets et " 861 "commentaires actuels d e votreblog courant. "861 "commentaires actuels du blog courant. " 862 862 863 863 msgid "Depending on the size of your blog, it could take a few minutes." … … 977 977 msgid "or pick up a local file in your public directory" 978 978 msgstr "" 979 "ou sélectionnez un fichier local présent dans votre répertoire de média "979 "ou sélectionnez un fichier local présent dans votre répertoire de médias" 980 980 981 981 msgid "This will reset all the content of your database, except users." … … 1021 1021 msgstr "" 1022 1022 "La gestion des catégories chez WordPress et Dotclear est tout à fait " 1023 "différente. Vous pouvez assigner plusieurs catégories à un seul postedans "1023 "différente. Vous pouvez assigner plusieurs catégories à un seul billet dans " 1024 1024 "WordPress. Dans le monde Dotclear, nous le voyons davantage comme « une " 1025 1025 "catégorie, plusieurs mots-clés ». Par conséquent Dotclear peut seulement " … … 1037 1037 "D'autre part, dans WordPress, un billet ne peut pas être sans catégorie, et " 1038 1038 "une installation par défaut possède systématiquement une première catégorie " 1039 "nommée <i>« sans catégorie »</ 1039 "nommée <i>« sans catégorie »</i>. Si vous n'avez pas changé cette " 1040 1040 "catégorie, vous pouvez simplement l'ignorer lors de l'importation sur votre " 1041 1041 "blog, puisque Dotclear vous permet réellement de conserver votre message " … … 1955 1955 msgid "List of entries with the tag “%s”" 1956 1956 msgstr "Liste des billets avec le mot-clé “%s”" 1957 1958 msgid "RSS or Atom feed import" 1959 msgstr "Importation d'un flux RSS ou Atom" 1960 1961 msgid "Add a feed content to the current blog: <strong>%s</strong>." 1962 msgstr "Ajouter les contenus d'un flux au blog courant : <strong>%s</strong>." 1963 1964 msgid "Add a feed content to the blog." 1965 msgstr "Ajouter les contenus d'un flux au blog." 1966 1967 #, php-format 1968 msgid "" 1969 "Import the content of a Dotclear 1.2\'s blog in the current " 1970 "blog: %s." 1971 msgstr "" 1972 "Importer le contenu d'un blog Dotclear 1.2 comme nouveau contenu dans le blog " 1973 "courant : %s." -
plugins/importExport/inc/class.dc.export.flat.php
r1499 r1559 193 193 '<form action="'.$this->getURL(true).'" method="post" class="fieldset">'. 194 194 '<h3>'.__('Single blog').'</h3>'. 195 '<p>'.sprintf(__('This will create an export of your current blog: %s'), html::escapeHTML($this->core->blog->name)).'</p>'.195 '<p>'.sprintf(__('This will create an export of your current blog: %s'),'<strong>'.html::escapeHTML($this->core->blog->name)).'</strong>.</p>'. 196 196 197 197 '<p><label for="file_name">'.__('File name:').'</label>'. -
plugins/importExport/inc/class.dc.import.dc1.php
r1454 r1559 143 143 case 1: 144 144 echo 145 '<p>'.sprintf(__(' This will import your Dotclear 1.2 content as new contentin the current blog: %s.'),145 '<p>'.sprintf(__('Import the content of a Dotclear 1.2\'s blog in the current blog: %s.'), 146 146 '<strong>'.html::escapeHTML($this->core->blog->name).'</strong>').'</p>'. 147 '<p class="static-msg">'.__('Please note that this process '. 148 'will empty your categories, blogroll, entries and comments on the current blog.').'</p>'. 149 '<p>'.__('Depending on the size of your blog, it could take a few minutes.').'</p>'; 147 '<p class="form-note warn">'.__('Please note that this process '. 148 'will empty your categories, blogroll, entries and comments on the current blog.').'</p>'; 150 149 151 150 printf($this->imForm(1,__('General information'),__('Import my blog now')), 152 '<p class="form-note info">'.__('We first need some information about your old Dotclear 1.2 installation.').'</p>'.151 '<p>'.__('We first need some information about your old Dotclear 1.2 installation.').'</p>'. 153 152 '<p><label for="db_host">'.__('Database Host Name:').'</label> '. 154 153 form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</p>'. … … 217 216 return 218 217 '<form action="'.$this->getURL(true).'" method="post">'. 219 '< fieldset><legend>'.$legend.'</legend>'.218 '<h3>'.$legend.'</h3>'. 220 219 $this->core->formNonce(). 221 220 form::hidden(array('do'),'step'.$step). 222 221 '%s'. 223 222 '<p><input type="submit" value="'.$submit_value.'" /></p>'. 224 '< /fieldset>'.223 '<p class="form-note info">'.__('Depending on the size of your blog, it could take a few minutes.').'</p>'. 225 224 '</form>'; 226 225 } -
plugins/importExport/inc/class.dc.import.feed.php
r1553 r1559 20 20 { 21 21 $this->type = 'import'; 22 $this->name = __(' Feed import');23 $this->description = __(' Imports a feed as new entries.');22 $this->name = __('RSS or Atom feed import'); 23 $this->description = __('Add a feed content to the blog.'); 24 24 } 25 25 … … 82 82 echo 83 83 '<form action="'.$this->getURL(true).'" method="post">'. 84 '<p>'.sprintf(__(' This will import a feed (RSS or Atom) a as new content in the current blog: %s.'),html::escapeHTML($this->core->blog->name)).'</p>'.84 '<p>'.sprintf(__('Add a feed content to the current blog: <strong>%s</strong>.'),html::escapeHTML($this->core->blog->name)).'</p>'. 85 85 86 86 '<p><label for="feed_url">'.__('Feed URL:').'</label>'. -
plugins/importExport/inc/class.dc.import.flat.php
r1499 r1559 142 142 if ($this->status == 'single') 143 143 { 144 dcPage:: message(__('Single blog successfully imported.'));144 dcPage::success(__('Single blog successfully imported.')); 145 145 return; 146 146 } 147 147 if ($this->status == 'full') 148 148 { 149 dcPage:: message(__('Content successfully imported.'));149 dcPage::success(__('Content successfully imported.')); 150 150 return; 151 151 } … … 184 184 '<p>'.sprintf(__('This will import a single blog backup as new content in the current blog: <strong>%s</strong>.'),html::escapeHTML($this->core->blog->name)).'</p>'. 185 185 186 '<p><label for="up_single_file" class="classic">'.__('Upload a backup file').187 ' ('.sprintf(__(' Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'.186 '<p><label for="up_single_file">'.__('Upload a backup file'). 187 ' ('.sprintf(__('maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'. 188 188 ' <input type="file" id="up_single_file" name="up_single_file" size="20" />'. 189 189 '</p>'; … … 191 191 if ($has_files) { 192 192 echo 193 '<p><label for="public_single_file" class=" classic">'.__('or pick up a local file in your public directory').'</label> '.193 '<p><label for="public_single_file" class="">'.__('or pick up a local file in your public directory').' </label> '. 194 194 form::combo('public_single_file',$public_files). 195 195 '</p>'; … … 212 212 '<p class="warning">'.__('This will reset all the content of your database, except users.').'</p>'. 213 213 214 '<p><label for="up_full_file" class="classic">'.__('Upload a backup file').' '.215 ' ('.sprintf(__(' Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'.214 '<p><label for="up_full_file">'.__('Upload a backup file').' '. 215 ' ('.sprintf(__('maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'. 216 216 '<input type="file" id="up_full_file" name="up_full_file" size="20" />'. 217 217 '</p>'; … … 219 219 if ($has_files) { 220 220 echo 221 '<p><label for="public_full_file" class="classic">'.__('or pick up a local file in your public directory').' </label>'.221 '<p><label for="public_full_file">'.__('or pick up a local file in your public directory').' </label>'. 222 222 form::combo('public_full_file',$public_files). 223 223 '</p>'; -
plugins/importExport/inc/class.dc.import.wp.php
r1454 r1559 176 176 '<p>'.sprintf(__('This will import your WordPress content as new content in the current blog: %s.'), 177 177 '<strong>'.html::escapeHTML($this->core->blog->name).'</strong>').'</p>'. 178 '<p class="static-msg">'.__('Please note that this process '. 179 'will empty your categories, blogroll, entries and comments on the current blog.').'</p>'. 180 '<p>'.__('Depending on the size of your blog, it could take a few minutes.').'</p>'; 178 '<p class="form-note warn">'.__('Please note that this process '. 179 'will empty your categories, blogroll, entries and comments on the current blog.').'</p>'; 181 180 182 181 printf($this->imForm(1,__('General information'),__('Import my blog now')), 183 '< h3>'.__('We first need some information about your old WordPress installation.').'</h3>'.182 '<p>'.__('We first need some information about your old WordPress installation.').'</p>'. 184 183 '<p><label for="db_host">'.__('Database Host Name:').'</label> '. 185 184 form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</p>'. … … 199 198 'category per post and will chose the lowest numbered one. If you want to keep a trace of '. 200 199 'every category, you can import them as tags, with an optional prefix.').'</p>'. 201 '<p>'.__('On the other hand, in WordPress, a post can not be uncategorized, and a default '. 202 'installation has a first category labelised <i>"Uncategorized"</i>. If you did not change that '. 203 'category, you can just ignore it while importing your blog, as Dotclear allows you to '. 204 'actually keep your posts uncategorized.').'</p>'. 200 '<p>'.__('On the other hand, in WordPress, a post can not be uncategorized, and a '. 201 'default installation has a first category labelised <i>"Uncategorized"</i>.'. 202 'If you did not change that category, you can just ignore it while '. 203 'importing your blog, as Dotclear allows you to actually keep your posts '. 204 'uncategorized.').'</p>'. 205 205 206 206 '<p><label for="ignore_first_cat" class="classic">'.form::checkbox('ignore_first_cat',1,$this->vars['ignore_first_cat']).' '. … … 265 265 return 266 266 '<form action="'.$this->getURL(true).'" method="post">'. 267 '< fieldset><legend>'.$legend.'</legend>'.267 '<h3>'.$legend.'</h3>'. 268 268 $this->core->formNonce(). 269 269 form::hidden(array('do'),'step'.$step). 270 270 '%s'. 271 271 '<p><input type="submit" value="'.$submit_value.'" /></p>'. 272 '< /fieldset>'.272 '<p class="form-note info">'.__('Depending on the size of your blog, it could take a few minutes.').'</p>'. 273 273 '</form>'; 274 274 }
Note: See TracChangeset
for help on using the changeset viewer.