diff --git a/admin/README b/admin/README.md
similarity index 100%
rename from admin/README
rename to admin/README.md
diff --git a/admin/themes/default/css/form-password.almost-flat.min.css b/admin/themes/default/css/form-password.almost-flat.min.css
deleted file mode 100644
index efdc7aa8..00000000
--- a/admin/themes/default/css/form-password.almost-flat.min.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! UIkit 2.23.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-.uk-form-password{display:inline-block;position:relative;max-width:100%}.uk-form-password-toggle{display:block;position:absolute;top:50%;right:10px;margin-top:-6px;font-size:13px;line-height:13px;color:#999}.uk-form-password-toggle:hover{color:#999;text-decoration:none}.uk-form-password>input{padding-right:50px!important}
\ No newline at end of file
diff --git a/admin/themes/default/js/form-password.min.js b/admin/themes/default/js/form-password.min.js
deleted file mode 100644
index f5495f78..00000000
--- a/admin/themes/default/js/form-password.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! UIkit 2.23.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-!function(t){var i;window.UIkit&&(i=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-form-password",["uikit"],function(){return i||t(UIkit)})}(function(t){"use strict";return t.component("formPassword",{defaults:{lblShow:"Show",lblHide:"Hide"},boot:function(){t.$html.on("click.formpassword.uikit","[data-uk-form-password]",function(i){var e=t.$(this);e.data("formPassword")||(i.preventDefault(),t.formPassword(e,t.Utils.options(e.attr("data-uk-form-password"))),e.trigger("click"))})},init:function(){var t=this;this.on("click",function(i){if(i.preventDefault(),t.input.length){var e=t.input.attr("type");t.input.attr("type","text"==e?"password":"text"),t.element.html(t.options["text"==e?"lblShow":"lblHide"])}}),this.input=this.element.next("input").length?this.element.next("input"):this.element.prev("input"),this.element.html(this.options[this.input.is("[type='password']")?"lblShow":"lblHide"]),this.element.data("formPassword",this)}}),t.formPassword});
\ No newline at end of file
diff --git a/content/README b/content/README.md
similarity index 100%
rename from content/README
rename to content/README.md
diff --git a/install.php b/install.php
index 0deac19f..7da52d20 100644
--- a/install.php
+++ b/install.php
@@ -412,7 +412,7 @@ Content:
### '.$Language->get('Whats next').'
- '.$Language->get('Manage your Bludit from the admin panel').'
-- '.$Language->get('Follow Bludit on').' [Twitter](https://twitter.com/bludit) / [Facebook](https://www.facebook.com/pages/Bludit/239255789455913) / [Google+](https://plus.google.com/+Bluditcms)
+- '.$Language->get('Follow Bludit on').' [Twitter](https://twitter.com/bludit) / [Facebook](https://www.facebook.com/bluditcms) / [Google+](https://plus.google.com/+Bluditcms)
- '.$Language->get('Visit the support forum').'
- '.$Language->get('Read the documentation for more information').'
- '.$Language->get('Share with your friends and enjoy');
@@ -488,14 +488,12 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
-
-
-
+
+
-
-
-
+
+
diff --git a/languages/en_US.json b/languages/en_US.json
index c91025af..ee6ebec0 100644
--- a/languages/en_US.json
+++ b/languages/en_US.json
@@ -169,6 +169,7 @@
"cli-mode": "Cli mode",
"command-line-mode": "Command line mode",
"enable-the-command-line-mode-if-you-add-edit": "Enable the command line mode if you add, edit or remove posts and pages from the filesystem",
+
"configure": "Configure",
"uninstall": "Uninstall",
"change-password": "Change password",
@@ -199,4 +200,4 @@
"view-and-edit-your-profile": "View and edit your profile.",
"password-must-be-at-least-6-characters-long": "Password must be at least 6 characters long"
-}
+}
\ No newline at end of file
diff --git a/languages/es_AR.json b/languages/es_AR.json
index ac9bcb88..27949c55 100644
--- a/languages/es_AR.json
+++ b/languages/es_AR.json
@@ -85,7 +85,7 @@
"first-name": "Nombre",
"last-name": "Apellido",
"bludit-version": "Bludit versión",
- "powered-by": "Corriendo con",
+ "powered-by": "Generado por",
"recent-posts": "Entradas recientes",
"manage-pages": "Administrar páginas",
"advanced-options": "Opciones avanzadas",
@@ -129,14 +129,14 @@
"there-are-no-drafts": "No hay borradores.",
"create-a-new-article-for-your-blog":"Crear un nuevo articulo para su blog.",
"create-a-new-page-for-your-website":"Crear una nueva página para su sitio web.",
- "invite-a-friend-to-collaborate-on-your-website":"Invite a un amigo para colaborar en el sitio web.",
+ "invite-a-friend-to-collaborate-on-your-website":"Invite un amigo para colaborar en el sitio web.",
"change-your-language-and-region-settings":"Cambiar la configuración de idioma y región.",
"language-and-timezone":"Idioma y zona horaria",
"author": "Autor",
"start-here": "Comience aquí",
"install-theme": "Instalar tema",
"first-post": "Primer entrada",
- "congratulations-you-have-successfully-installed-your-bludit": "Felicitación, usted ha instalado **Bludit** exitosamente",
+ "congratulations-you-have-successfully-installed-your-bludit": "Felicitación, se ha instalado **Bludit** exitosamente",
"whats-next": "Siguientes pasos",
"manage-your-bludit-from-the-admin-panel": "Administre su Bludit desde el [panel de administración](./admin/)",
"follow-bludit-on": "Siga Bludit en",
@@ -196,5 +196,8 @@
"edit-or-remove-your-blogs-posts": "Edite o elimine entradas de su blog.",
"general-settings": "Ajustes generales",
"advanced-settings": "Ajustes avanzados",
- "manage-users": "Administrar usuarios"
+ "manage-users": "Administrar usuarios",
+ "view-and-edit-your-profile": "Modifique su perfil.",
+
+ "password-must-be-at-least-6-characters-long": "La contraseña debe tener al menos 6 carácteres."
}
\ No newline at end of file
diff --git a/plugins/disqus/plugin.php b/plugins/disqus/plugin.php
index 17744110..fdf59213 100644
--- a/plugins/disqus/plugin.php
+++ b/plugins/disqus/plugin.php
@@ -18,9 +18,9 @@ class pluginDisqus extends Plugin {
{
parent::__construct();
- // Disable the plugin IF ...
global $Url;
+ // Disable the plugin IF ...
$this->disable = false;
if( (!$this->getDbField('enablePosts')) && ($Url->whereAmI()=='post') ) {
diff --git a/plugins/simplemde/languages/en_US.json b/plugins/simplemde/languages/en_US.json
index 53906940..55f8be9a 100644
--- a/plugins/simplemde/languages/en_US.json
+++ b/plugins/simplemde/languages/en_US.json
@@ -11,4 +11,4 @@
},
"toolbar": "Toolbar",
"tab-size": "Tab size"
-}
+}
\ No newline at end of file
diff --git a/plugins/simplemde/languages/es_AR.json b/plugins/simplemde/languages/es_AR.json
index f880b520..9d96f06a 100644
--- a/plugins/simplemde/languages/es_AR.json
+++ b/plugins/simplemde/languages/es_AR.json
@@ -2,7 +2,7 @@
"plugin-data":
{
"name": "SimpleMDE",
- "description": "Simple, facil y hermoso editor Markdown desarrollado por @WesCossick. Adaptado por Diego Najar para Bludit."
+ "description": "Simple y facil editor Markdown desarrollado por @WesCossick. Adaptado por Diego Najar para Bludit."
},
"toolbar": "Barra de herramientas",
"tab-size": "Tamaño de la tabulación"