diff --git a/README.textile b/README.textile index aa54813a..263ed9cb 100644 --- a/README.textile +++ b/README.textile @@ -19,8 +19,8 @@ h2. Gems Here is a short list of main gems used in the application. -* Rails 3.0.9 -* Mongoid 2.0.2 (with MongoDB 1.6) +* Rails 3.0.10 +* Mongoid 2.0.2 (with MongoDB 1.8) * Liquid * Devise * Carrierwave @@ -34,8 +34,8 @@ See the "official website":http://www.locomotivecms.com h2. Team -* Developers: "Didier Lafforgue":http://www.nocoffee.fr, "Jacques Crocker":http://www.railsjedi.com -* Contributors: "Dirk Kelly":http://www.dirkkelly.com, "Mario Visic":http://www.mariovisic.com, "Raphael Costa":http://raphaelcosta.net (Brazilian Portuguese translation), "Bernd Hauser":http://www.designhunger.de (German translation), "Andrea Frigido":http://www.frisoft.it (Italian translation), "Enrique García":https://github.com/kikito (Spanish translation), "Lars Smit":https://github.com/larssmit (Dutch translation) +* Developers: "Didier Lafforgue":http://www.nocoffee.fr, "Jacques Crocker":http://www.railsjedi.com, "Mario Visic":http://www.mariovisic.com +* Contributors: "Dirk Kelly":http://www.dirkkelly.com, "Raphael Costa":http://raphaelcosta.net (Brazilian Portuguese translation), "Bernd Hauser":http://www.designhunger.de (German translation), "Andrea Frigido":http://www.frisoft.it (Italian translation), "Enrique García":https://github.com/kikito (Spanish translation), "Lars Smit":https://github.com/larssmit (Dutch translation), "PitOn":https://github.com/GarPit (Russian translation) * UI Designer: "Sacha Greif":http://www.sachagreif.com * IE maintainer: "Alex Sanford":https://github.com/alexsanford diff --git a/config/locales/admin_ui.de.yml b/config/locales/admin_ui.de.yml index eb2711ea..a546ad5e 100644 --- a/config/locales/admin_ui.de.yml +++ b/config/locales/admin_ui.de.yml @@ -164,6 +164,7 @@ de: it: "Italienisch" nl: "Holländer" es: "Spanisch" + ru: "Russisch" ask_for_name: "Bitte gib deinen neuen Namen an" theme_assets: diff --git a/config/locales/admin_ui.en.yml b/config/locales/admin_ui.en.yml index b41f0950..2d0633e9 100644 --- a/config/locales/admin_ui.en.yml +++ b/config/locales/admin_ui.en.yml @@ -175,6 +175,7 @@ en: it: Italian nl: Dutch es: Spanish + ru: Russian ask_for_name: "Please type your new name" theme_assets: diff --git a/config/locales/admin_ui.es.yml b/config/locales/admin_ui.es.yml index 29531fcc..dff56223 100644 --- a/config/locales/admin_ui.es.yml +++ b/config/locales/admin_ui.es.yml @@ -173,6 +173,7 @@ es: it: Italiano nl: holandés es: Español + ru: Ruso ask_for_name: "Por favor escriba su nuevo nombre" theme_assets: diff --git a/config/locales/admin_ui.fr.yml b/config/locales/admin_ui.fr.yml index 84383b70..e6a02aca 100644 --- a/config/locales/admin_ui.fr.yml +++ b/config/locales/admin_ui.fr.yml @@ -176,6 +176,8 @@ fr: it: "en Italien" nl: "en Hollandais" es: en Espagnol + ru: en Russe + ask_for_name: "Veuillez entrer le nouveau nom" theme_assets: diff --git a/config/locales/admin_ui.it.yml b/config/locales/admin_ui.it.yml index fd918e51..13329cd2 100644 --- a/config/locales/admin_ui.it.yml +++ b/config/locales/admin_ui.it.yml @@ -173,6 +173,7 @@ it: it: Italiano nl: Olandese es: Spagnolo + ru: Russo ask_for_name: "Prego, digita il tuo nome" theme_assets: diff --git a/config/locales/admin_ui.nl.yml b/config/locales/admin_ui.nl.yml index f5c9133f..c6d4c2d6 100644 --- a/config/locales/admin_ui.nl.yml +++ b/config/locales/admin_ui.nl.yml @@ -159,6 +159,7 @@ nl: pt-BR: "Braziliaans Portugees" it: Italiaans nl: Nederlands + ru: Russisch ask_for_name: "Voer uw nieuwe naam in" theme_assets: diff --git a/config/locales/admin_ui.pt-BR.yml b/config/locales/admin_ui.pt-BR.yml index a683d7bf..27302f78 100644 --- a/config/locales/admin_ui.pt-BR.yml +++ b/config/locales/admin_ui.pt-BR.yml @@ -159,6 +159,7 @@ pt-BR: it: Italiano nl: Holandês es: Espanhol + ru: Russo ask_for_name: "Por favor preencha o novo nome" theme_assets: diff --git a/doc/changelogs/20110812.txt b/doc/changelogs/20110812.txt index 89309427..8a206c3e 100644 --- a/doc/changelogs/20110812.txt +++ b/doc/changelogs/20110812.txt @@ -8,4 +8,6 @@ - fix carrierwave version to 0.5.6 (#163) - has_many target is not exported correctly (issue #165) + fix the import module as well - XSS vulnerability when adding new content from the api_contents_controller (#170) -- small bugs: #169, #171, #179 \ No newline at end of file +- small bugs: #169, #171, #179 +- russian version (#188) +- \ No newline at end of file diff --git a/public/images/admin/icons/flags/ru.png b/public/images/admin/icons/flags/ru.png new file mode 100644 index 00000000..ca1a0875 Binary files /dev/null and b/public/images/admin/icons/flags/ru.png differ