Skip to content

Commit

Permalink
Merge pull request #58 from pluginsGLPI/9.1/compat
Browse files Browse the repository at this point in the history
9.1/compat
  • Loading branch information
orthagh committed Sep 19, 2016
2 parents 770f263 + 72573b3 commit 24b2ad7
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
23 changes: 12 additions & 11 deletions locales/ru_RU.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
#
# Translators:
# Alexey Petukhov <lexx015@gmail.com>, 2015
# Nikolay <techobsl@yandex.ru>, 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 <delaunay.alexandre@gmail.com>\n"
"PO-Revision-Date: 2016-07-28 09:32+0000\n"
"Last-Translator: Nikolay <techobsl@yandex.ru>\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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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 ""
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions mreporting.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ Voir documentation : https://github.com/PluginsGLPI/mreporting/wiki
<author>Infotel</author>
</authors>
<versions>
<version>
<num>0.90+1.2</num>
<compatibility>0.85</compatibility>
<compatibility>0.90</compatibility>
<compatibility>9.1</compatibility>
</version>
<version>
<num>0.85+1.0-RC4</num>
<compatibility>0.85</compatibility>
Expand Down
2 changes: 1 addition & 1 deletion setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => "<a href='http://www.teclib.com'>Teclib'</a>
& <a href='http://www.infotel.com'>Infotel</a>",
'homepage' => "https://github.com/pluginsGLPI/mreporting",
Expand Down

0 comments on commit 24b2ad7

Please sign in to comment.