From a8babf564471363ff5eb4168fd99dd1d68aadbe9 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Wed, 14 Sep 2016 12:37:36 +0200 Subject: [PATCH 1/2] 9.1 compat, bump version --- mreporting.xml | 6 ++++++ setup.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mreporting.xml b/mreporting.xml index d0e82a31..07f43d01 100644 --- a/mreporting.xml +++ b/mreporting.xml @@ -70,6 +70,12 @@ Voir documentation : https://github.com/PluginsGLPI/mreporting/wiki Infotel + + 0.90+1.2 + 0.85 + 0.90 + 9.1 + 0.85+1.0-RC4 0.85 diff --git a/setup.php b/setup.php index 385e3793..fd3f4888 100644 --- a/setup.php +++ b/setup.php @@ -139,7 +139,7 @@ function plugin_init_mreporting() { // Get the name and the version of the plugin - Needed function plugin_version_mreporting() { return array('name' => __('More Reporting', 'mreporting'), - 'version' => "0.90+1.1", + 'version' => "0.90+1.2", 'author' => "Teclib' & Infotel", 'homepage' => "https://github.com/pluginsGLPI/mreporting", From 72573b3db132f87abac674a35f93b3d3b002ac45 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Wed, 14 Sep 2016 12:38:38 +0200 Subject: [PATCH 2/2] Update russian (from transifex) --- locales/ru_RU.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/locales/ru_RU.po b/locales/ru_RU.po index 2598ef84..9ea15062 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -4,13 +4,14 @@ # # Translators: # Alexey Petukhov , 2015 +# Nikolay , 2016 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - MReporting\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-06-02 14:27+0200\n" -"PO-Revision-Date: 2016-06-02 12:27+0000\n" -"Last-Translator: Alexandre DELAUNAY \n" +"PO-Revision-Date: 2016-07-28 09:32+0000\n" +"Last-Translator: Nikolay \n" "Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-project-plugin-mreporting/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: inc/notificationtargetnotification.class.php:8 inc/preference.class.php:182 #: inc/profile.class.php:38 msgid "More Reporting" -msgstr "" +msgstr "Больше отчетов" #: ajax/dropdownExport.php:45 inc/common.class.php:494 msgid "With data" @@ -85,7 +86,7 @@ msgstr "Смотреть область" #: inc/config.class.php:76 inc/config.class.php:656 inc/config.class.php:668 msgid "Curve lines (SVG)" -msgstr "" +msgstr "Кривые линии (SVG)" #: inc/config.class.php:82 msgid "See values" @@ -137,7 +138,7 @@ msgstr "Выбрать отчет для отображения" #: inc/dashboard.class.php:96 msgid "Dashboard is empty. Please add reports by clicking on the icon" -msgstr "" +msgstr "Приборная панель пустая. Пожалуйста, добавьте отчеты нажав на иконку." #: inc/dashboard.class.php:105 msgid "Add a report" @@ -181,7 +182,7 @@ msgstr "" #: inc/notification.class.php:46 inc/pdf.class.php:15 msgid "GLPI statistics reports" -msgstr "" +msgstr "Отчеты GLPI статистики" #: inc/notification.class.php:47 msgid "" @@ -206,7 +207,7 @@ msgstr "Добавить/удалить версию у ПО" #: inc/other.class.php:76 msgid "Add infocom" -msgstr "" +msgstr "Добавить инфоком" #: inc/other.class.php:79 msgid "Add/remove profile on a user" @@ -222,11 +223,11 @@ msgstr "Пользователь удален из LDAP" #: inc/other.class.php:93 msgid "Webservice logs" -msgstr "" +msgstr "Логи Webservice" #: inc/other.class.php:97 msgid "OCS Infos" -msgstr "" +msgstr "OCS Информация" #: inc/other.class.php:100 msgid "Add/update/remove device" @@ -238,11 +239,11 @@ msgstr "Добавить/удалить связь" #: inc/other.class.php:106 msgid "Add/remove item" -msgstr "" +msgstr "Добавить/удалить пункт" #: inc/other.class.php:109 msgid "Comments & date_mod changes" -msgstr "" +msgstr "Комментарии & date_mod изменения" #: inc/other.class.php:117 msgid "Genericobject plugin logs"