diff --git a/admin/blog_pref.php b/admin/blog_pref.php index 59eaad397..3ab86577f 100644 --- a/admin/blog_pref.php +++ b/admin/blog_pref.php @@ -302,7 +302,7 @@ if ($blog_id) '
'; echo - '
'.__('Blog details').''. + '

'.__('Blog details').'

'. $core->formNonce(); if ($core->auth->isSuperAdmin()) @@ -334,11 +334,11 @@ if ($blog_id) echo '

'. form::textarea('blog_desc',60,5,html::escapeHTML($blog_desc)).'

'. - '
'; + ''; echo - '
'.__('Blog configuration').''. + '

'.__('Blog configuration').'

'. '
'. '
'. '

'. @@ -392,25 +392,24 @@ if ($blog_id) '

'. '
'. '
'. //Opera sucks - '
'; + ''; echo - '
'.__('Comments and trackbacks').''. + '

'.__('Comments and trackbacks').'

'. + '
'. + '
'. '

'. - + __('Accept comments').'

'. '

'. - + __('Moderate comments').'

'. '

'. - '

'.__('Leave blank to disable this feature.').'

'. - + '

'.__('Leave blank to disable this feature.').'

'. '

'. @@ -419,26 +418,25 @@ if ($blog_id) '
'. '

'. - + __('Accept trackbacks').'

'. '

'. - + __('Moderate trackbacks').'

'. '

'. - '

'.__('Leave blank to disable this feature.').'

'. - + '

'.__('Leave blank to disable this feature.').'

'. '

'. '
'. + '
'. //Opera sucks + '
'. '
'. //Opera sucks - '
'; + ''; echo - '
'.__('Blog presentation').''. + '

'.__('Blog presentation').'

'. '
'. '
'. '

'. @@ -473,13 +471,13 @@ if ($blog_id) '

'. '
'. '
'. //Opera sucks - '
'; + ''; echo - '
'.__('Media and images').''. + '

'.__('Media and images').'

'. '
'. '
'. - '

'.__('Generated image sizes (in pixels)').'

'. + '
'.__('Generated image sizes (in pixels)').'
'. '

'. @@ -491,14 +489,14 @@ if ($blog_id) '
'. '
'. - '

'. + '
'. '

'.__('This defines image tag title when you insert it in a post from the media manager. It is retrieved from the picture\'s metadata.').'

'. '

'.form::combo('media_img_title_pattern',$img_title_combo,html::escapeHTML($blog_settings->system->media_img_title_pattern)).'

'. '

'. - '

'.__('Default image insertion attributes').'

'. + '
'.__('Default image insertion attributes').'
'. '

'. form::combo('media_img_default_size',$img_default_size_combo, (html::escapeHTML($blog_settings->system->media_img_default_size) != '' ? html::escapeHTML($blog_settings->system->media_img_default_size) : 'm')). @@ -511,11 +509,12 @@ if ($blog_id) __('As a link to original image').'

'. '
'. '
'. + '
'. //Opera sucks - '
'; + ''; echo - '
'.__('Search engines robots policy').''; + '

'.__('Search engines robots policy').'

'; $i = 0; foreach ($robots_policy_options as $k => $v) @@ -525,7 +524,7 @@ if ($blog_id) $i++; } - echo '
'; + echo ''; # --BEHAVIOR-- adminBlogPreferencesForm diff --git a/admin/blog_theme.php b/admin/blog_theme.php index cf56de915..1ef779ad5 100644 --- a/admin/blog_theme.php +++ b/admin/blog_theme.php @@ -249,7 +249,7 @@ if (!$theme_conf_mode) $themes = $core->themes->getModules(); if (isset($themes[$core->blog->settings->system->theme])) { - echo '

'.sprintf(__('You are currently using "%s"'),$themes[$core->blog->settings->system->theme]['name']).'.

'; + echo '

'.sprintf(__('You are currently using %s'),$themes[$core->blog->settings->system->theme]['name']).'.

'; } echo @@ -298,30 +298,26 @@ if (!$theme_conf_mode) # 'Upload theme' form echo - ''. - '
'. - ''.__('Upload a zip file').''. + ''. + '

'.__('Upload a zip file').'

'. '

'. '

'. '

'. form::password(array('your_pwd','your_pwd1'),20,255).'

'. - ''. - $core->formNonce(). - '
'. + '

'. + $core->formNonce().'

'. '
'; # 'Fetch theme' form echo - '
'. - '
'. - ''.__('Download a zip file').''. + ''. + '

'.__('Download a zip file').'

'. '

'. form::field(array('pkg_url','pkg_url'),40,255).'

'. '

'. form::password(array('your_pwd','your_pwd2'),20,255).'

'. - ''. - $core->formNonce(). - '
'. + '

'. + $core->formNonce().'

'. '
'; } else diff --git a/admin/category.php b/admin/category.php index 7b1dbfc26..4e8b8856b 100644 --- a/admin/category.php +++ b/admin/category.php @@ -225,27 +225,25 @@ if ($cat_id) '
'. '
'. - '
'. - '
'.__('Category parent').''. + ''. + '

'.__('Category parent').'

'. '

'. form::combo('cat_parent',$allowed_parents,$cat_parent).'

'. '

'. form::hidden(array('id'),$cat_id).$core->formNonce().'

'. - '
'. '
'. '
'; if (count($siblings) > 0) { echo '
'. - '
'. - '
'.__('Category sibling').''. + ''. + '

'.__('Category sibling').'

'. '

'. form::combo('cat_move',array(__('before')=>'before',__('after')=>'after'),'','','',false,'title="'.__('position: ').'"').' '. form::combo('cat_sibling',$siblings).'

'. '

'. form::hidden(array('id'),$cat_id).$core->formNonce().'

'. - '
'. '
'. '
'; } diff --git a/admin/index.php b/admin/index.php index 7e6e3ef78..31db2d1df 100644 --- a/admin/index.php +++ b/admin/index.php @@ -325,8 +325,8 @@ if ($core->auth->user_prefs->dashboard->quickentry) { echo '
'. '

'.__('Quick entry').'

'. - '
'. - '
'.__('New entry').''. + ''. + '

'.__('New entry').'

'. '

'. form::field('post_title',20,255,'','maximal'). '

'. @@ -357,7 +357,6 @@ if ($core->auth->user_prefs->dashboard->quickentry) { form::hidden('post_lang',$core->auth->getInfo('user_lang')). form::hidden('post_notes',''). '

'. - '
'. '
'. '
'; } diff --git a/admin/langs.php b/admin/langs.php index 651da6759..13c80ce4f 100644 --- a/admin/langs.php +++ b/admin/langs.php @@ -221,9 +221,8 @@ if (!empty($dc_langs) && $is_writable) } echo - '
'. - '
'. - ''.__('Available languages').''. + ''. + '

'.__('Available languages').'

'. '

'.sprintf(__('You can download and install a additional language directly from Dotclear.net. '. 'Proposed languages are based on your version: %s.'),''.DC_VERSION.'').'

'. '

'. @@ -232,7 +231,7 @@ if (!empty($dc_langs) && $is_writable) form::password(array('your_pwd','your_pwd1'),20,255).'

'. '

'. $core->formNonce(). - '

'. + '

'. '
'; } @@ -240,9 +239,8 @@ if ($is_writable) { # 'Upload language pack' form echo - '
'. - '
'. - ''.__('Upload a zip file').''. + ''. + '

'.__('Upload a zip file').'

'. '

'.__('You can install languages by uploading zip files.').'

'. '

'. '

'. @@ -250,7 +248,7 @@ if ($is_writable) form::password(array('your_pwd','your_pwd2'),20,255).'

'. '

'. $core->formNonce(). - '

'. + '

'. '
'; } diff --git a/admin/media.php b/admin/media.php index a54805a10..682401057 100644 --- a/admin/media.php +++ b/admin/media.php @@ -394,15 +394,15 @@ if ($core_media_writable) echo '
'. - '
'. - '
'. - ''.__('New directory').''. + ''. + '
'. + '

'.__('New directory').'

'. $core->formNonce(). '

'. form::field(array('newdir','newdir'),35,255).'

'. '

'. form::hidden(array('d'),html::escapeHTML($d)).'

'. - '
'. + '
'. '
'; echo ''; diff --git a/admin/media_item.php b/admin/media_item.php index 289abce67..d0e3c5ca3 100644 --- a/admin/media_item.php +++ b/admin/media_item.php @@ -488,18 +488,20 @@ if ($file->type == 'image/jpeg') echo ''; +echo '

'.__('Updates and modifications').'

'; + if ($file->editable && $core_media_writable) { if ($file->media_type == 'image') { echo - '
'. - '
'.__('Update thumbnails').''. + ''. + '

'.__('Update thumbnails').'

'. '

'.__('This will create or update thumbnails for this image.').'

'. '

'. form::hidden(array('id'),$id). $core->formNonce().'

'. - '
'; + ''; } if ($file->type == 'application/zip') @@ -510,8 +512,8 @@ if ($file->editable && $core_media_writable) ); echo - '
'. - '
'.__('Extract archive').''. + ''. + '

'.__('Extract archive').'

'. '
'; + ''; } echo - '
'. - '
'.__('Change media properties').''. + ''. + '

'.__('Change media properties').'

'. '

'. form::field('media_file',30,255,html::escapeHTML($file->basename)).'

'. '

'. @@ -542,11 +544,11 @@ if ($file->editable && $core_media_writable) '

'. form::hidden(array('id'),$id). $core->formNonce().'

'. - '
'; + ''; echo - '
'. - '
'.__('Change file').''. + ''. + '

'.__('Change file').'

'. '
'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).'
'. '

'. form::hidden(array('id'),$id). $core->formNonce().'

'. - '
'; + ''; if ($file->del) { echo diff --git a/admin/plugins.php b/admin/plugins.php index 7af361a2b..1f5898209 100644 --- a/admin/plugins.php +++ b/admin/plugins.php @@ -353,23 +353,21 @@ if ($is_writable) # 'Upload plugin' form echo - '
'. - '
'. - ''.__('Upload a zip file').''. + ''. + '

'.__('Upload a zip file').'

'. '

'. '

'. '

'. form::password(array('your_pwd','your_pwd1'),20,255).'

'. '

'. $core->formNonce(). - '

'. + '

'. '
'; # 'Fetch plugin' form echo - '
'. - '
'. - ''.__('Download a zip file').''. + ''. + '

'.__('Download a zip file').'

'. '

'. form::field(array('pkg_url','pkg_url'),40,255).'

'. '

'. diff --git a/admin/style/default.css b/admin/style/default.css index 7ff655e6b..003bab809 100644 --- a/admin/style/default.css +++ b/admin/style/default.css @@ -813,24 +813,27 @@ li.media-action input { #theme-box { display: table-cell; vertical-align: top; - padding: 1rem 0; + padding: 0; width: 312px; - background: #eef; border: 1px solid #ccc; border-radius: 3px; } -#theme-box div.theme-shot img { +#theme-box .theme-shot, +#theme-box .theme-info, +#theme-box .theme-actions { + background: #eef; + padding: 1em 16px; + margin: 0; +} +#theme-box .theme-shot img { display: block; - margin: 0 16px; width: 280px; height: 245px; border: 1px solid #ccc; } -#theme-box div.theme-info { - margin: 1em 16px; -} #theme-box h4 { color: #000; + background: #eef; } #theme-box span.theme-version { color: #666; @@ -842,10 +845,10 @@ li.media-action input { color: #c00; font-weight:bold; } -#theme-box div.theme-actions { - padding: 0 16px; +#theme-box .theme-actions { + border-bottom: 1px solid #ccc; } -#themes div.theme-details-js { +#themes .theme-details-js { float: left; width: 120px; height: 150px; @@ -857,14 +860,14 @@ li.media-action input { cursor: pointer; border-radius: 4px; } -#themes div.theme-details-js label { +#themes .theme-details-js label { cursor: pointer; } -#themes div.theme-details-js.theme-selected { +#themes .theme-details-js.theme-selected { background: #ddd; border: 1px solid #999; } -#themes div.theme-details-js div.theme-shot img { +#themes .theme-details-js .theme-shot img { width: 120px; height: 105px; border: 1px solid #fff; diff --git a/admin/users_actions.php b/admin/users_actions.php index 3a099d2ec..00f798144 100644 --- a/admin/users_actions.php +++ b/admin/users_actions.php @@ -178,6 +178,8 @@ else form::hidden(array('nb'),$_POST['nb']); } +echo '

'.__('Back to user profile').'

'; + # --BEHAVIOR-- adminUsersActionsContent $core->callBehavior('adminUsersActionsContent',$core,$action,$hidden_fields); @@ -262,7 +264,7 @@ elseif (!empty($blogs) && !empty($users) && $action == 'perms') foreach ($blogs as $b) { - echo '

'.html::escapeHTML($b).''. + echo '

'.('Blog:').' '.html::escapeHTML($b).''. form::hidden(array('blogs[]'),$b).'

'; foreach ($core->auth->getPermissionsTypes() as $perm_id => $perm) @@ -282,18 +284,17 @@ elseif (!empty($blogs) && !empty($users) && $action == 'perms') } echo - '
'.__('Validate permissions').''. + '
'. + '

'.__('Validate permissions').'

'. '

'. form::password('your_pwd',20,255).'

'. - '
'. '

'. $hidden_fields. form::hidden(array('action'),'updateperm'). $core->formNonce().'

'. + ''. ''; } -echo '

'.__('back').'

'; - dcPage::close(); ?> \ No newline at end of file diff --git a/locales/bn/main.po b/locales/bn/main.po index 775a89c35..eb06b9671 100644 --- a/locales/bn/main.po +++ b/locales/bn/main.po @@ -458,7 +458,7 @@ msgid "Themes" msgstr "থিমসমূহ" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "আপনি বর্তমানে ব্যবহার করছেন \"%s\"" #, fuzzy diff --git a/locales/bn/plugins.po b/locales/bn/plugins.po index 36d4fc98d..26af19e5d 100644 --- a/locales/bn/plugins.po +++ b/locales/bn/plugins.po @@ -837,7 +837,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/ca/main.po b/locales/ca/main.po index f2a6e7f6f..58cf8b38c 100644 --- a/locales/ca/main.po +++ b/locales/ca/main.po @@ -467,7 +467,7 @@ msgid "Themes" msgstr "Temes" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "" #, fuzzy diff --git a/locales/ca/plugins.po b/locales/ca/plugins.po index a7a07afb7..7fa5fd95f 100644 --- a/locales/ca/plugins.po +++ b/locales/ca/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/cs/main.po b/locales/cs/main.po index 3438c5f3d..1d664e364 100644 --- a/locales/cs/main.po +++ b/locales/cs/main.po @@ -456,7 +456,7 @@ msgid "Themes" msgstr "Vzhledy" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Používáte \"%s\" vzhled" #, fuzzy diff --git a/locales/cs/plugins.po b/locales/cs/plugins.po index 9e905c462..d00c792c4 100644 --- a/locales/cs/plugins.po +++ b/locales/cs/plugins.po @@ -842,7 +842,7 @@ msgid "Import a single blog" msgstr "Importovat jeden blog" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Tímto naimportujete zálohu jednoho blogu jako nový obsah tohoto blogu: %s." msgid "Upload a backup file" diff --git a/locales/da/main.po b/locales/da/main.po index 4d0de33df..f115c725d 100644 --- a/locales/da/main.po +++ b/locales/da/main.po @@ -458,7 +458,7 @@ msgid "Themes" msgstr "Temaer" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Du bruger lige nu \"%s\"" #, fuzzy diff --git a/locales/da/plugins.po b/locales/da/plugins.po index c545f7d5d..c5da7e07f 100644 --- a/locales/da/plugins.po +++ b/locales/da/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/de/main.po b/locales/de/main.po index 6d7e6c3cb..4a2f2c7b6 100644 --- a/locales/de/main.po +++ b/locales/de/main.po @@ -456,7 +456,7 @@ msgid "Themes" msgstr "Themes" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Du verwendest gerade \"%s\"" #, fuzzy diff --git a/locales/de/plugins.po b/locales/de/plugins.po index 24cb8a500..a4771ae91 100644 --- a/locales/de/plugins.po +++ b/locales/de/plugins.po @@ -842,7 +842,7 @@ msgid "Import a single blog" msgstr "Importiere einen einzelnen Blog" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Dies wird einen einzelnen Blog als neuen Inhalt in den aktuellen Blog importieren: %s." msgid "Upload a backup file" diff --git a/locales/en/main.po b/locales/en/main.po index cd09bbf10..27f134a5d 100644 --- a/locales/en/main.po +++ b/locales/en/main.po @@ -452,7 +452,7 @@ msgid "Themes" msgstr "" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "" msgid "Use selected theme" diff --git a/locales/en/plugins.po b/locales/en/plugins.po index 02f6fd88d..dced1c789 100644 --- a/locales/en/plugins.po +++ b/locales/en/plugins.po @@ -851,7 +851,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/eo/main.po b/locales/eo/main.po index 515c5b1bf..1b0ca4425 100644 --- a/locales/eo/main.po +++ b/locales/eo/main.po @@ -452,7 +452,7 @@ msgid "Themes" msgstr "" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "" msgid "Use selected theme" diff --git a/locales/eo/plugins.po b/locales/eo/plugins.po index c545f7d5d..c5da7e07f 100644 --- a/locales/eo/plugins.po +++ b/locales/eo/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/es-ar/main.po b/locales/es-ar/main.po index 81d610e75..2d7d81dab 100644 --- a/locales/es-ar/main.po +++ b/locales/es-ar/main.po @@ -459,7 +459,7 @@ msgid "Themes" msgstr "Temas" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Actualmente usas \"%s\"" #, fuzzy diff --git a/locales/es-ar/plugins.po b/locales/es-ar/plugins.po index 0b5275cca..1b951c14d 100644 --- a/locales/es-ar/plugins.po +++ b/locales/es-ar/plugins.po @@ -843,7 +843,7 @@ msgid "Import a single blog" msgstr "Importar un blig individual" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Esto importará un archivo de resguardo de un blog individual como contenido nuevo del actual blog: %s." msgid "Upload a backup file" diff --git a/locales/es/main.po b/locales/es/main.po index 4705e1e25..477664873 100644 --- a/locales/es/main.po +++ b/locales/es/main.po @@ -461,7 +461,7 @@ msgid "Themes" msgstr "Temas" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Actualmente está usando «%s»" #, fuzzy diff --git a/locales/es/plugins.po b/locales/es/plugins.po index 0e71faa26..9281ba6a4 100644 --- a/locales/es/plugins.po +++ b/locales/es/plugins.po @@ -848,7 +848,7 @@ msgid "Import a single blog" msgstr "Importar un blog" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Esto importará una copia de respaldo de un único blog como nuevo contenido del blog en uso: %s." msgid "Upload a backup file" diff --git a/locales/eu/main.po b/locales/eu/main.po index 515c5b1bf..1b0ca4425 100644 --- a/locales/eu/main.po +++ b/locales/eu/main.po @@ -452,7 +452,7 @@ msgid "Themes" msgstr "" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "" msgid "Use selected theme" diff --git a/locales/eu/plugins.po b/locales/eu/plugins.po index c545f7d5d..c5da7e07f 100644 --- a/locales/eu/plugins.po +++ b/locales/eu/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/fr/main.po b/locales/fr/main.po index 4c3de571a..c1146c917 100644 --- a/locales/fr/main.po +++ b/locales/fr/main.po @@ -480,8 +480,8 @@ msgid "Themes" msgstr "Thèmes" #, php-format -msgid "You are currently using \"%s\"" -msgstr "Vous utilisez actuellement \"%s\"" +msgid "You are currently using %s" +msgstr "Vous utilisez actuellement %s" msgid "Use selected theme" msgstr "Utiliser le thème sélectionné" @@ -3127,4 +3127,13 @@ msgid "Finish the update" msgstr "Finir la mise à jour" msgid "Information about this version" -psgstr "Informations sur cette version" \ No newline at end of file +msgstr "Informations sur cette version" + +msgid "Updates and modifications" +msgstr "Mises à jour et modifications" + +msgid "Back to user profile" +msgstr "Retour au profil utilisateur" + +msgid "Back to Blog themes" +msgstr "Retour à Apparence du blog" \ No newline at end of file diff --git a/locales/fr/plugins.po b/locales/fr/plugins.po index 42cf00cc7..da4e2dd31 100644 --- a/locales/fr/plugins.po +++ b/locales/fr/plugins.po @@ -960,10 +960,10 @@ msgstr "Êtes-vous sûr de vouloir importer un fichier de sauvegarde complet ?" #, php-format msgid "" -"This will import a single blog backup as new content in the current blog: %s." +"This will import a single blog backup as new content in the current blog: %s." msgstr "" "Cela importera une sauvegarde d'un blog comme nouveau contenu du blog " -"courant : %s." +"courant : %s." msgid "Upload a backup file" msgstr "Téléversez un fichier de sauvegarde" diff --git a/locales/hu/main.po b/locales/hu/main.po index bcd491d40..35b91b31c 100644 --- a/locales/hu/main.po +++ b/locales/hu/main.po @@ -464,7 +464,7 @@ msgid "Themes" msgstr "Témák" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "A \"%s\"-t használod" #, fuzzy diff --git a/locales/hu/plugins.po b/locales/hu/plugins.po index 1b6c9cd63..d3ea488b0 100644 --- a/locales/hu/plugins.po +++ b/locales/hu/plugins.po @@ -844,7 +844,7 @@ msgid "Import a single blog" msgstr "Egyedüli blog importálása" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Ezzel egy egyedüli blogot fogok importálni új tartalomként ide: %s" msgid "Upload a backup file" diff --git a/locales/it/main.po b/locales/it/main.po index e30b26de5..7ba15c3e1 100644 --- a/locales/it/main.po +++ b/locales/it/main.po @@ -455,7 +455,7 @@ msgid "Themes" msgstr "Temi" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Attualmente è in uso \"%s\"" #, fuzzy diff --git a/locales/it/plugins.po b/locales/it/plugins.po index c545f7d5d..c5da7e07f 100644 --- a/locales/it/plugins.po +++ b/locales/it/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/ja/main.po b/locales/ja/main.po index 0bdd14be1..9e56b0c51 100644 --- a/locales/ja/main.po +++ b/locales/ja/main.po @@ -464,7 +464,7 @@ msgid "Themes" msgstr "テーマ" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "現在使用中のテーマ: %s" #, fuzzy diff --git a/locales/ja/plugins.po b/locales/ja/plugins.po index d7fa28df7..6558e1d95 100644 --- a/locales/ja/plugins.po +++ b/locales/ja/plugins.po @@ -845,7 +845,7 @@ msgid "Import a single blog" msgstr "単独ブログのインポート" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "これは単独ブログのバックアップを、現在のブログ「%s」の新しいコンテンツとしてインポートします。" msgid "Upload a backup file" diff --git a/locales/ko/main.po b/locales/ko/main.po index dd9f07c47..a474648ac 100644 --- a/locales/ko/main.po +++ b/locales/ko/main.po @@ -463,7 +463,7 @@ msgid "Themes" msgstr "테마" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "현재 사용 중인 테마 : \"%s\"" #, fuzzy diff --git a/locales/ko/plugins.po b/locales/ko/plugins.po index 2b3bc9329..f0cd565b1 100644 --- a/locales/ko/plugins.po +++ b/locales/ko/plugins.po @@ -845,7 +845,7 @@ msgid "Import a single blog" msgstr "단일 블로그 가져오기" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "이 과정은, 백업된 단일 블로그 내용을 현재 블로그 (%s) 의 새 내용으로 가져옵니다." msgid "Upload a backup file" diff --git a/locales/lt/main.po b/locales/lt/main.po index 564e06cdf..a9873d3cd 100644 --- a/locales/lt/main.po +++ b/locales/lt/main.po @@ -431,7 +431,7 @@ msgid "Themes" msgstr "Temos" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Šiuo metu jūs naudojate \"%s\"" msgid "use selected theme" diff --git a/locales/lt/plugins.po b/locales/lt/plugins.po index 82005fbef..f4a6be4ca 100644 --- a/locales/lt/plugins.po +++ b/locales/lt/plugins.po @@ -807,7 +807,7 @@ msgid "Import a single blog" msgstr "Importuoti vieną blogą" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Importuojama viena blogo atsarginė kopija kaip naujas turinys jūsų bloge: %s." msgid "Upload a backup file" diff --git a/locales/nl/main.po b/locales/nl/main.po index a99dcd345..a2f011f3d 100644 --- a/locales/nl/main.po +++ b/locales/nl/main.po @@ -453,7 +453,7 @@ msgid "Themes" msgstr "Thema's" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Je gebruikt nu \"%s\"" #, fuzzy diff --git a/locales/nl/plugins.po b/locales/nl/plugins.po index 1fcd80cc7..debe1d70c 100644 --- a/locales/nl/plugins.po +++ b/locales/nl/plugins.po @@ -835,7 +835,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/oc/main.po b/locales/oc/main.po index aba785ebb..c6223c0b7 100644 --- a/locales/oc/main.po +++ b/locales/oc/main.po @@ -454,7 +454,7 @@ msgid "Themes" msgstr "" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "" msgid "Use selected theme" diff --git a/locales/oc/plugins.po b/locales/oc/plugins.po index 7eb4c6566..b7eb09c05 100644 --- a/locales/oc/plugins.po +++ b/locales/oc/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/pl/main.po b/locales/pl/main.po index 04bcd3ee1..768f9d841 100644 --- a/locales/pl/main.po +++ b/locales/pl/main.po @@ -454,7 +454,7 @@ msgid "Themes" msgstr "Motywy" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Aktualnie używasz \"%s\"" #, fuzzy diff --git a/locales/pl/plugins.po b/locales/pl/plugins.po index fc48532b4..23b4fa137 100644 --- a/locales/pl/plugins.po +++ b/locales/pl/plugins.po @@ -839,7 +839,7 @@ msgid "Import a single blog" msgstr "Importuj pojedynczy blog" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Zaimportuje kopię zapasową pojedynczego bloga jako nową zawartość w aktualnym blogu: %s." msgid "Upload a backup file" diff --git a/locales/pt-br/main.po b/locales/pt-br/main.po index 8928d476a..337e77cf9 100644 --- a/locales/pt-br/main.po +++ b/locales/pt-br/main.po @@ -469,7 +469,7 @@ msgid "Themes" msgstr "Temas" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "" #, fuzzy diff --git a/locales/pt-br/plugins.po b/locales/pt-br/plugins.po index c545f7d5d..c5da7e07f 100644 --- a/locales/pt-br/plugins.po +++ b/locales/pt-br/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/pt/main.po b/locales/pt/main.po index d74d373ce..24e20403a 100644 --- a/locales/pt/main.po +++ b/locales/pt/main.po @@ -460,7 +460,7 @@ msgid "Themes" msgstr "Temas" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Você está a usar \"%s\"" #, fuzzy diff --git a/locales/pt/plugins.po b/locales/pt/plugins.po index 1b4a27c5e..0d60fa411 100644 --- a/locales/pt/plugins.po +++ b/locales/pt/plugins.po @@ -848,7 +848,7 @@ msgid "Import a single blog" msgstr "Importar um blog simples" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Isto irá importar uma copia de simples blog como novo conteúdo no blog actual: %s." msgid "Upload a backup file" diff --git a/locales/ro/main.po b/locales/ro/main.po index e1b64c431..7833fb6c5 100644 --- a/locales/ro/main.po +++ b/locales/ro/main.po @@ -454,7 +454,7 @@ msgid "Themes" msgstr "" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "" msgid "Use selected theme" diff --git a/locales/ro/plugins.po b/locales/ro/plugins.po index 7bd449eb7..4620a2bd9 100644 --- a/locales/ro/plugins.po +++ b/locales/ro/plugins.po @@ -844,7 +844,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/ru/main.po b/locales/ru/main.po index 6cd35a7a3..822857fdf 100644 --- a/locales/ru/main.po +++ b/locales/ru/main.po @@ -459,7 +459,7 @@ msgid "Themes" msgstr "Темы" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "В данный момент вы используете \"%s\"" #, fuzzy diff --git a/locales/ru/plugins.po b/locales/ru/plugins.po index 892c0efb5..1f2d6658c 100644 --- a/locales/ru/plugins.po +++ b/locales/ru/plugins.po @@ -840,7 +840,7 @@ msgid "Import a single blog" msgstr "Импортировать один блог" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "Это импортирует резервный файл одного блога как новое содержимое в текущий блог: %s." msgid "Upload a backup file" diff --git a/locales/sr/main.po b/locales/sr/main.po index 9b9b6a20c..5186fe3c8 100644 --- a/locales/sr/main.po +++ b/locales/sr/main.po @@ -459,7 +459,7 @@ msgid "Themes" msgstr "Thèmes" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Vous utilisez actuellement \"%s\"" msgid "Use selected theme" diff --git a/locales/sr/plugins.po b/locales/sr/plugins.po index c545f7d5d..c5da7e07f 100644 --- a/locales/sr/plugins.po +++ b/locales/sr/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/sv/main.po b/locales/sv/main.po index 523c7e86a..cf74ff4e5 100644 --- a/locales/sv/main.po +++ b/locales/sv/main.po @@ -452,7 +452,7 @@ msgid "Themes" msgstr "" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "" msgid "Use selected theme" diff --git a/locales/sv/plugins.po b/locales/sv/plugins.po index 150d72e59..ecb93f746 100644 --- a/locales/sv/plugins.po +++ b/locales/sv/plugins.po @@ -834,7 +834,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/te/main.po b/locales/te/main.po index 59cc5a6ae..8c16c5b13 100644 --- a/locales/te/main.po +++ b/locales/te/main.po @@ -457,7 +457,7 @@ msgid "Themes" msgstr "అలంకారాలు" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "మీరు ప్రస్తుతం \"%s\" ని వాడుతున్నారు" #, fuzzy diff --git a/locales/te/plugins.po b/locales/te/plugins.po index b35a6c2f9..376120ecd 100644 --- a/locales/te/plugins.po +++ b/locales/te/plugins.po @@ -837,7 +837,7 @@ msgid "Import a single blog" msgstr "" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/tr/main.po b/locales/tr/main.po index ac48bb143..77e9a477f 100644 --- a/locales/tr/main.po +++ b/locales/tr/main.po @@ -459,7 +459,7 @@ msgid "Themes" msgstr "Temalar" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "Şimdi \"%s\" kullanıyorsunuz." #, fuzzy diff --git a/locales/tr/plugins.po b/locales/tr/plugins.po index 9d4202fd2..947f026a0 100644 --- a/locales/tr/plugins.po +++ b/locales/tr/plugins.po @@ -838,7 +838,7 @@ msgid "Import a single blog" msgstr "Tek bir blog içe aktar." #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "" msgid "Upload a backup file" diff --git a/locales/zh-cn/main.po b/locales/zh-cn/main.po index 11a60ef6c..5d4e7dab9 100644 --- a/locales/zh-cn/main.po +++ b/locales/zh-cn/main.po @@ -457,7 +457,7 @@ msgid "Themes" msgstr "主题" #, php-format -msgid "You are currently using \"%s\"" +msgid "You are currently using %s" msgstr "您正在使用“%s”" #, fuzzy diff --git a/locales/zh-cn/plugins.po b/locales/zh-cn/plugins.po index eadd5b84a..8afe73d7d 100644 --- a/locales/zh-cn/plugins.po +++ b/locales/zh-cn/plugins.po @@ -846,7 +846,7 @@ msgid "Import a single blog" msgstr "导入单一博客" #, php-format -msgid "This will import a single blog backup as new content in the current blog: %s." +msgid "This will import a single blog backup as new content in the current blog: %s." msgstr "这将会把一个单一博客的备份作为新内容导入到当前博客:%s。" msgid "Upload a backup file" diff --git a/plugins/antispam/_admin.php b/plugins/antispam/_admin.php index d29d0bcbc..52e36ca9b 100644 --- a/plugins/antispam/_admin.php +++ b/plugins/antispam/_admin.php @@ -67,12 +67,12 @@ class antispamBehaviors { $ttl = $settings->antispam->antispam_moderation_ttl; echo - '
Antispam'. + '

Antispam

'. '

'. - '
'; + ''; } public static function adminBeforeBlogSettingsUpdate($settings) diff --git a/plugins/antispam/filters/class.dc.filter.iplookup.php b/plugins/antispam/filters/class.dc.filter.iplookup.php index 45cab35a1..57a16effa 100644 --- a/plugins/antispam/filters/class.dc.filter.iplookup.php +++ b/plugins/antispam/filters/class.dc.filter.iplookup.php @@ -75,14 +75,13 @@ class dcFilterIpLookup extends dcSpamFilter $res = ''; $res .= - '
'. - '
' . __('IP Lookup servers') . ''. + ''. + '

' . __('IP Lookup servers') . '

'. '

'. form::textarea('bls',40,3,html::escapeHTML($bls),'maximal'). '

'. '

'. $this->core->formNonce().'

'. - '
'. '
'; return $res; diff --git a/plugins/blowupConfig/config.js b/plugins/blowupConfig/config.js index 9b7393a93..ef8fe24b1 100644 --- a/plugins/blowupConfig/config.js +++ b/plugins/blowupConfig/config.js @@ -48,7 +48,7 @@ $(function() { } $('#theme_config').prepend(styles_combo); - $(styles_combo).wrap('
').before('' + dotclear.msg.predefined_styles + '').wrap('

'); + $(styles_combo).wrap('
').before('

' + dotclear.msg.predefined_styles + '

').wrap('

'); $(styles_combo).change(function() { if (this.value == 'none') { @@ -61,7 +61,7 @@ $(function() { }); // Code import - var e = $('#bu_export ~ fieldset:first'); + var e = $('#bu_export_content'); e.toggle(); var img = document.createElement('img'); diff --git a/plugins/blowupConfig/index.php b/plugins/blowupConfig/index.php index 83c173aad..5986b4bfd 100644 --- a/plugins/blowupConfig/index.php +++ b/plugins/blowupConfig/index.php @@ -234,7 +234,7 @@ echo dcPage::breadcrumb( )); echo -'

'.__('back').'

'; +'

'.__('Back to Blog themes').'

'; if (!$can_write_images) { @@ -248,7 +248,8 @@ if (!empty($_GET['upd'])) { echo '
'; -echo '
'.__('General').''; +echo '

'.__('Customization').'

'. +'

'.__('General').'

'; if ($can_write_images) { echo @@ -271,9 +272,8 @@ form::field('body_txt_c',7,7,$blowup_user['body_txt_c'],'colorpicker').'

'. '

'. form::field('body_line_height',7,7,$blowup_user['body_line_height']).'

'. -'
'. -'
'.__('Links').''. +'

'.__('Links').'

'. '

'. form::field('body_link_c',7,7,$blowup_user['body_link_c'],'colorpicker').'

'. @@ -282,9 +282,8 @@ form::field('body_link_v_c',7,7,$blowup_user['body_link_v_c'],'colorpicker').' '. form::field('body_link_f_c',7,7,$blowup_user['body_link_f_c'],'colorpicker').'

'. -'
'. -'
'.__('Page top').''; +'

'.__('Page top').'

'; if ($can_write_images) { echo @@ -309,8 +308,7 @@ form::field('blog_title_c',7,7,$blowup_user['blog_title_c'],'colorpicker').'

form::combo('blog_title_a',array(__('center')=>'center',__('left')=>'left',__('right')=>'right'),$blowup_user['blog_title_a']).'

'. '

'. -form::field('blog_title_p',7,7,$blowup_user['blog_title_p']).'

'. -'
'; +form::field('blog_title_p',7,7,$blowup_user['blog_title_p']).'

'; if ($can_write_images) { if ($blowup_user['top_image'] == 'custom' && $blowup_user['uploaded']) { @@ -320,7 +318,7 @@ if ($can_write_images) { } echo - '
'.__('Top image').''. + '

'.__('Top image').'

'. '

'. form::combo('top_image',$top_images,($blowup_user['top_image'] ? $blowup_user['top_image'] : 'default')).'

'. '

'.__('Choose "Custom..." to upload your own image.').'

'. @@ -330,15 +328,14 @@ if ($can_write_images) { ''. '

'. - '

'.__('Preview').'

'. + '
'.__('Preview').'
'. '
'. ''. - '
'. - '
'; + ''; } echo -'
'.__('Sidebar').''. +'

'.__('Sidebar').'

'. '

'. form::combo('sidebar_position',array(__('right')=>'right',__('left')=>'left'),$blowup_user['sidebar_position']).'

'. @@ -382,7 +379,7 @@ form::field('sidebar_link_v_c',7,7,$blowup_user['sidebar_link_v_c'],'colorpicker form::field('sidebar_link_f_c',7,7,$blowup_user['sidebar_link_f_c'],'colorpicker').'

'. '
'. -'
'.__('Entries').''. +'

'.__('Entries').'

'. '

'. form::combo('date_title_f',blowupConfig::fontsList(),$blowup_user['date_title_f']).'

'. @@ -420,9 +417,8 @@ if ($can_write_images) { echo '

'. form::field('post_commentmy_c',7,7,$blowup_user['post_commentmy_c'],'colorpicker').'

'. -'
'. -'
'.__('Footer').''. +'

'.__('Footer').'

'. '

'. form::combo('footer_f',blowupConfig::fontsList(),$blowup_user['footer_f']).'

'. @@ -436,15 +432,14 @@ form::field('footer_c',7,7,$blowup_user['footer_c'],'colorpicker').'

'. form::field('footer_l_c',7,7,$blowup_user['footer_l_c'],'colorpicker').'

'. '

'. -form::field('footer_bg_c',7,7,$blowup_user['footer_bg_c'],'colorpicker').'

'. -'
'; +form::field('footer_bg_c',7,7,$blowup_user['footer_bg_c'],'colorpicker').'

'; echo -'
'.__('Additional CSS').''. +'

'.__('Additional CSS').'

'. '

'. form::textarea('extra_css',72,5,html::escapeHTML($blowup_user['extra_css']),'maximal','',false,'title="'.__('Additional CSS').'"'). '

'. -'
'; +''; @@ -460,10 +455,13 @@ foreach ($blowup_user as $k => $v) { } } echo -'

'.__('Configuration import / export').'

'. +'
'. +'

'.__('Configuration import / export').'

'. +'
'. '

'.__('You can share your configuration using the following code. To apply a configuration, paste the code, click on "Apply code" and save.').'

'. '

'.form::textarea('export_code',72,5,implode('; ',$tmp_array),'maximal','',false,'title="'.__('Copy this code:').'"').'

'. -'
'; +''. +''; echo '

'. diff --git a/plugins/daInstaller/index.php b/plugins/daInstaller/index.php index 41c58b802..6e1e5536f 100644 --- a/plugins/daInstaller/index.php +++ b/plugins/daInstaller/index.php @@ -297,21 +297,19 @@ echo ''. ''. '