Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

lets merge #273

Closed
wants to merge 9 commits into from

3 participants

@helllamer
  1. russian localization
  2. some refactoring
  3. z_media_preview: i've added ability to define hard crop by x,y (production needs)
@arjan
Owner

These look good. However please take care that you don't destroy the indenting. From the github diff I see the indenting in your changes is different. Please try to use the same (tabs or spaces) that are in the original file.

@dmitriid

this is used for a checkbox I guess. Then it woould be better to have something like "(Отметка для модераторов/супервайзоров)"

@dmitriid

Укажи -> Укажите
or change the entire sentence to
Выберите, что могут делать пользователи, обладающие этой ролью, из списка ниже.

@dmitriid

закрузок -> загрузок

@dmitriid

Участик -> Участник

@dmitriid

Разрешить пользователям изменятьтолько контент, который они сами произвели. (Отметить для сайтов с контентом...)

@dmitriid

может создавать и редактировать какие-то категории или управлять какими-то модулями. -> может создавать и редактировать определенные категории или управлять определенными модулями.

@dmitriid

Possibly change to Перетяни меня?

ok, agreed

@dmitriid

Конфигурация не найдена

@dmitriid

Вы действительно хотите удалить пользователя из

@dmitriid

Нажмите “удалить” для удаления всех связанных с этим пользователем пар имен и паролей. Это равнознчно удалению статуса пользователя у этого человека.

s/равнознчно/равнозначно/

@dmitriid

person -> человек
for the lack of a better translation let's use a literal one

@dmitriid

Эот человек н является пользователем.

Not agreed. This sentence is not about user.

UPD: Ok, i've read your previous comment about "person == человек". So, lets use this:
"Этот человек не является пользователем."

Ok. Especially since my translation is one typo on top of another :)

ok, i've updated my previous comment with final version of message.

@dmitriid

I've had some review notes on Russian translations. Since there are not too many Russian-speaking users, we can merge them if helllamer agrees with changes :)

@arjan
Owner

Thanks for the review and changes... I'll commit it once @helllamer aggrees :)

@helllamer

please fix: s/z_media_identity/z_media_identify/

  • i'm far afk.
@helllamer

And I do not want to rollback crazy identation in z_media_preview.
All other changes from Dima looks ok.

I'm very-very far away from my pc, so cannot i take part in development by now and next one-two weeks too.

May be someone will finish this hang pull request...

@arjan
Owner

I'll fix the indenting, just a matter of letting Emacs' erlang-mode do the work... :)

@helllamer

Done.

@arjan
Owner

I'll just remove .hgignore since we've switch to git...

@arjan arjan closed this pull request from a commit
@arjan arjan Fixes #273
- Russian translations,
- fix exdev bug in media archive module
- add crop +x+y support

Squashed commit of the following:

commit c1f48f6047649bacf28522828c48a1df22012f86
Author: Arjan Scherpenisse <arjan@scherpenisse.net>
Date:   Sun Mar 11 08:29:05 2012 +0100

    Cleanups for merging #273

commit 5e1e083383a9faac7cb8a149fbf8128b2fb1a432
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Sat Mar 10 22:16:55 2012 +0400

    .hgignore: add some stuff from deps/

commit 9a2fcb5eed7320163ed5fd96b50f9660a40acaad
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Sat Mar 10 21:55:47 2012 +0400

    fixes for previous pull request

commit ebc0e8dbb4ddfda203bdda4d11e89f462f34cc72
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Sun Dec 4 12:19:19 2011 +0300

    resource_file_readonly: removed code duplication

commit 3d66d145e8ba13141721d361ca4d5eca7c30ae18
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Oct 27 13:21:41 2011 +0300

    {% image %}: crop="+X+Y" support

commit 02d6c0e200e92c393cf47a84bb5c581e0ef40dbd
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 23:29:33 2011 +0300

    more russian translations

commit 8e635c231dc7f2a4ede863c22bdd76280c99cb9d
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 22:12:07 2011 +0300

    z_media_archive: avoid exdev error when moving file between two fs

commit d6c368b709fd3c287815b5ba19f9d19ae114d7d9
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 18:56:08 2011 +0300

    mod_l10n/ru.po: it will be better to use genitive wordform for months

commit 36da34cf52448b926744d362299db662a08ce5a7
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 18:06:07 2011 +0300

    added some garbage patterns into .(hg|git)ignore
    *.swp - vim buffer
    *.mo  - binary compiled representation of .po traslation files

commit 6f93ce40cad2aad08aa962ec7a16789c374555f5
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 18:05:05 2011 +0300

    mod_acl_simple_roles: russian translation
a7830c2
@arjan arjan closed this in a7830c2
@helllamer

I'm using hg for github.

@arjan
Owner

OK, well, then you'll have to use a local .hgignore file. I removed your .hgignore from the zotonic repository.

@mawuli mawuli referenced this pull request from a commit in mawuli/zotonic
@arjan arjan Fixes #273
- Russian translations,
- fix exdev bug in media archive module
- add crop +x+y support

Squashed commit of the following:

commit c1f48f6047649bacf28522828c48a1df22012f86
Author: Arjan Scherpenisse <arjan@scherpenisse.net>
Date:   Sun Mar 11 08:29:05 2012 +0100

    Cleanups for merging #273

commit 5e1e083383a9faac7cb8a149fbf8128b2fb1a432
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Sat Mar 10 22:16:55 2012 +0400

    .hgignore: add some stuff from deps/

commit 9a2fcb5eed7320163ed5fd96b50f9660a40acaad
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Sat Mar 10 21:55:47 2012 +0400

    fixes for previous pull request

commit ebc0e8dbb4ddfda203bdda4d11e89f462f34cc72
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Sun Dec 4 12:19:19 2011 +0300

    resource_file_readonly: removed code duplication

commit 3d66d145e8ba13141721d361ca4d5eca7c30ae18
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Oct 27 13:21:41 2011 +0300

    {% image %}: crop="+X+Y" support

commit 02d6c0e200e92c393cf47a84bb5c581e0ef40dbd
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 23:29:33 2011 +0300

    more russian translations

commit 8e635c231dc7f2a4ede863c22bdd76280c99cb9d
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 22:12:07 2011 +0300

    z_media_archive: avoid exdev error when moving file between two fs

commit d6c368b709fd3c287815b5ba19f9d19ae114d7d9
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 18:56:08 2011 +0300

    mod_l10n/ru.po: it will be better to use genitive wordform for months

commit 36da34cf52448b926744d362299db662a08ce5a7
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 18:06:07 2011 +0300

    added some garbage patterns into .(hg|git)ignore
    *.swp - vim buffer
    *.mo  - binary compiled representation of .po traslation files

commit 6f93ce40cad2aad08aa962ec7a16789c374555f5
Author: Konstantin Nikiforov <helllamer@gmail.com>
Date:   Thu Dec 1 18:05:05 2011 +0300

    mod_acl_simple_roles: russian translation
4c65998
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
3  .gitignore
@@ -58,3 +58,6 @@ zotonic.tmproj
*.wmtrace
+*.swp
+
+*.mo
View
7 .hgignore
@@ -11,7 +11,7 @@ src/erlydtl/erlydtl_parser.erl
src/tests/erlydtl/rendered_output/*
priv/log/*
priv/sasl/*
-priv/sites/default/files/*
+priv/sites/*/files/
priv/sites/*/config
priv/config
priv/erlang.config
@@ -27,3 +27,8 @@ zotonic.tmproj
*.so
*.Plo
*.wmtrace
+*.mo
+*.swp
+deps/webzmachine/
+deps/lager
+log/
View
166 modules/mod_acl_simple_roles/translations/ru.po
@@ -0,0 +1,166 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# NB: Consider using poEdit <http://poedit.sourceforge.net>
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zotonic.mod_acl_simple_roles.ru\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-01 19:03+0300\n"
+"Last-Translator: Konstantin Nikiforov <helllamer@gmail.com>\n"
+"Language-Team: Konstantin Nikiforov <helllamer@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_sidebar_identity.tpl:7
+msgid "(implicit)"
+msgstr "(неявный)"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:79
+msgid "<strong>Security notice</strong>: When you allow */* files then all members of this role will be able to obtain full access to your whole site and all underlying data."
+msgstr "<strong>Уведомление безопасности</strong>: Если разрешить доступ к файлам */*, все пользователи указанной роли будут в способны получить полный доступ ко всему сайту и его данным."
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:22
+msgid "ACL role overview"
+msgstr "Обзор ролей ACL"
+
+#: modules/mod_acl_simple_roles/templates/_admin_menu_module.tpl:2
+msgid "Access Control"
+msgstr "Контроль доступа"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:10
+msgid "Access Control - Roles Overview"
+msgstr "Контроль доступа - Обзор ролей"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:20
+msgid "Access control controls what an user is allowed to do and see. The roles define different groups of rights. Users can be made member of multiple roles."
+msgstr "Контроль доступа отвечает системе на вопрос: \"Может ли какой-то пользователь делать такое-то действие или просматривать такой-то ресурс?\". Каждая роль определяет различный набор прав. На каждого пользователя может быть назначено одновременно несколько ролей."
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:28
+msgid "Actions"
+msgstr "Действия"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:3
+msgid "Admin Access Control"
+msgstr "Управление доступом"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:16
+msgid "All members are allowed to view all content. (Check this for supervisors.)"
+msgstr "Все пользователи с этой ролью могут просматривать весь контент. (Отметка для модераторов/супервайзоров)."
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:40
+msgid "Allow editing of category"
+msgstr "Разрешить редактировать категорию"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:38
+msgid "Categories"
+msgstr "Категории"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:11
+msgid "Check below what people that are member of this role are allowed to do."
+msgstr "Выберите, что могут делать пользователи, обладающие этой ролью, из списка ниже."
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:32
+msgid "Community members"
+msgstr "Участники сообщества"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:77
+msgid "File types allowed to be uploaded"
+msgstr "Типы файлов, разрешенные для загрузки"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:70
+msgid "File uploads"
+msgstr "Загрузка файлов"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:33
+msgid "Group members"
+msgstr "Участники групп"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:11
+msgid "Help about ACL roles."
+msgstr "О ролях ACL."
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:55
+msgid "Manage modules"
+msgstr "Управлять модулями"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:72
+msgid "Maximum allowed file size for uploads (in KB)"
+msgstr "Максимально разрешенный размер файла для закрузок (в КB)"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:25
+msgid "Maximum visibility (user can’t change visibility to higher level than this)"
+msgstr "Максимальная видимость (пользователь не сможет выставить уровень видимости выше указанного)"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_sidebar_identity.tpl:1
+msgid "Member of roles"
+msgstr "Участник ролей"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:42
+msgid "Modules"
+msgstr "Модули"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:11
+msgid "Need more help?"
+msgstr "Помочь?"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:56
+msgid "No ACL roles found."
+msgstr "Ролей ACL не найдено."
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:21
+msgid "Only allow to update content created by the user himself. (Check for user generated content sites.)"
+msgstr "Разрешить пользователям изменять только контент, который они сами произвели. (Отметить для сайтов с контентом, который генерят юзеры-редакторы)."
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:5
+msgid "Permissions"
+msgstr "Разрешения"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:27
+msgid "Rights"
+msgstr "Права"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:29
+msgid "The whole world"
+msgstr "Весь мир"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:25
+msgid "Title"
+msgstr "Заголовок"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:11
+msgid "Users can be member of multiple roles. Depending on the roles an user is allowed to create and edit certain categories or is able to manage certain modules."
+msgstr "Пользователи могут быть участниками нескольких ролей. Пользователь, обладающий теми или иными ролями, может создавать и редактировать определенные категории или управлять определенными модулями."
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:26
+msgid "View all"
+msgstr "Просмотреть всё"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:48
+msgid "delete"
+msgstr "удалить"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:49
+msgid "edit"
+msgstr "изменить"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:14
+msgid "make a new acl role"
+msgstr "Создать новую роль ACL"
+
+#: modules/mod_acl_simple_roles/templates/_admin_edit_content.acl_role.tpl:6
+msgid "make smaller"
+msgstr "уменьшить"
+
+#: modules/mod_acl_simple_roles/templates/admin_acl.tpl:36
+msgid "view all,&mdash;"
+msgstr "просмотреть всё,&mdash;"
+
View
67 modules/mod_admin_category/translations/ru.po
@@ -0,0 +1,67 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# NB: Consider using poEdit <http://poedit.sourceforge.net>
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zotonic.mod_admin_category.ru\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-01 23:32+0300\n"
+"Last-Translator: Konstantin Nikiforov <helllamer@gmail.com>\n"
+"Language-Team: Konstantin Nikiforov <helllamer@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: modules/mod_admin_category/templates/_admin_menu_module.tpl:2
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:10
+msgid "Categories"
+msgstr "Категории"
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:36
+msgid "Categories are used to categorize all pages. Every page belongs to exactly one category.<br/>The categories are defined in a hierarchy. Here you can change that hierarchy."
+msgstr "Категории используются для категорирования всех страниц. Каждая страница относится к одной определенной категории.<br/>Категории описываются иерархией. Здесь можно управлять этой иерархией."
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:3
+msgid "Category Hierarchy"
+msgstr "Дерево категории"
+
+#: modules/mod_admin_category/templates/_admin_category_sorter.tpl:4
+msgid "Category overview"
+msgstr "Обзор категорий"
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:38
+msgid "Drag categories to the place where you want them in the hierarchy."
+msgstr "Для изменения иерархии категорий можно использовать перетаскивание."
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:41
+msgid "Drag categories to the trash to remove them."
+msgstr "Чтобы удалить категорию, необходимо перетащить её в корзину."
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:25
+msgid "Drag me"
+msgstr "Перетяни меня"
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:42
+msgid "Drag the <strong>New category</strong> to add a new category."
+msgstr "Для добавления новой категории необходимо перетащить <strong>New category</strong> в дерево."
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:22
+msgid "Drag to add a new page"
+msgstr "Перетащите для создания новой страницы"
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:17
+msgid "How does this work?"
+msgstr "Как это работает?"
+
+#: modules/mod_admin_category/templates/admin_category_sorter.tpl:26
+msgid "New category"
+msgstr "Новая категория"
+
View
107 modules/mod_admin_config/translations/ru.po
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# NB: Consider using poEdit <http://poedit.sourceforge.net>
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zotonic.mod_admin_category.ru\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-01 23:49+0300\n"
+"Last-Translator: Konstantin Nikiforov <helllamer@gmail.com>\n"
+"Language-Team: Konstantin Nikiforov <helllamer@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: modules/mod_admin_config/templates/_action_dialog_config_new.tpl:23
+msgid "Add key"
+msgstr "Добавить ключ"
+
+#: modules/mod_admin_config/templates/_action_dialog_config_delete.tpl:2
+msgid "Are you sure you want to delete the configuration key"
+msgstr "Удалить ключ"
+
+#: modules/mod_admin_config/templates/_action_dialog_config_delete.tpl:7
+#: modules/mod_admin_config/templates/_action_dialog_config_edit.tpl:13
+msgid "Cancel"
+msgstr "Отмена"
+
+#: modules/mod_admin_config/templates/_admin_menu_module.tpl:2
+msgid "Config"
+msgstr "Конфиг"
+
+#: modules/mod_admin_config/templates/admin_config.tpl:3
+msgid "Configuration"
+msgstr "Конфигурация"
+
+#: modules/mod_admin_config/templates/admin_config.tpl:17
+msgid "Configuration overview"
+msgstr "Обзор конфигурации"
+
+#: modules/mod_admin_config/templates/_action_dialog_config_delete.tpl:6
+msgid "Delete"
+msgstr "Удалить"
+
+#: modules/mod_admin_config/templates/_action_dialog_config_new.tpl:13
+#: modules/mod_admin_config/templates/admin_config.tpl:21
+msgid "Key"
+msgstr "Ключ"
+
+#: modules/mod_admin_config/templates/admin_config.tpl:23
+msgid "Modified"
+msgstr "Изменен"
+
+#: modules/mod_admin_config/templates/_action_dialog_config_new.tpl:7
+#: modules/mod_admin_config/templates/admin_config.tpl:20
+msgid "Module"
+msgstr "Модуль"
+
+#: modules/mod_admin_config/templates/admin_config.tpl:47
+msgid "No configurations found."
+msgstr "Конфигурация не найдена."
+
+#: modules/mod_admin_config/templates/admin_config.tpl:24
+msgid "Options"
+msgstr "Опции"
+
+#: modules/mod_admin_config/templates/_action_dialog_config_new.tpl:1
+msgid "Please fill in the module, key and value for the new configuration key."
+msgstr "Необходимо указать модуль, ключ и значения для нового ключа конфигурации."
+
+#: modules/mod_admin_config/templates/_action_dialog_config_edit.tpl:12
+msgid "Save"
+msgstr "Сохранить"
+
+#: modules/mod_admin_config/templates/admin_config.tpl:10
+msgid "System Configuration"
+msgstr "Системная конфигурация"
+
+#: modules/mod_admin_config/templates/_action_dialog_config_delete.tpl:4
+msgid "This can't be undone. The configuration key will be lost forever."
+msgstr "Ключ конфигурации будет удален. Это действие нельзя отменить."
+
+#: modules/mod_admin_config/templates/_action_dialog_config_new.tpl:19
+#: modules/mod_admin_config/templates/_action_dialog_config_edit.tpl:8
+#: modules/mod_admin_config/templates/admin_config.tpl:22
+msgid "Value"
+msgstr "Значение"
+
+#: modules/mod_admin_config/templates/admin_config.tpl:37
+msgid "delete"
+msgstr "удалить"
+
+#: modules/mod_admin_config/templates/admin_config.tpl:39
+msgid "edit"
+msgstr "изменить"
+
+#: modules/mod_admin_config/templates/admin_config.tpl:12
+msgid "make a new config setting"
+msgstr "создать новый ключ конфигурации"
+
View
205 modules/mod_admin_identity/translations/ru.po
@@ -0,0 +1,205 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# NB: Consider using poEdit <http://poedit.sourceforge.net>
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zotonic.mod_admin_identity.ru\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2011-12-02 00:27+0300\n"
+"Last-Translator: Konstantin Nikiforov <helllamer@gmail.com>\n"
+"Language-Team: Konstantin Nikiforov <helllamer@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl:10
+msgid "Add or remove credentials."
+msgstr "Создание и удаление учетных записей."
+
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:57
+msgid "Add user"
+msgstr "Добавить пользователя."
+
+#: modules/mod_admin_identity/templates/_action_dialog_delete_username.tpl:2
+msgid "Are you sure you want to delete the username from"
+msgstr "Вы действительно хотите удалить пользователя из"
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:37
+#: modules/mod_admin_identity/templates/_action_dialog_delete_username.tpl:7
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:58
+msgid "Cancel"
+msgstr "Отмена"
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:9
+msgid "Click “delete” to remove any existing username/ password from the person, the person won't be an user anymore."
+msgstr "Нажмите “удалить” для удаления всех связанных с этим пользователем пар имен и паролей. Это равнознчно удалению статуса пользователя у этого человека."
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:42
+msgid "Created on"
+msgstr "Создано"
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:40
+#: modules/mod_admin_identity/templates/_action_dialog_delete_username.tpl:6
+msgid "Delete"
+msgstr "Удалить"
+
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:30
+msgid "E-mail"
+msgstr "E-mail"
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:21
+msgid ""
+"Every page/person can be made into a user on the edit page.\n"
+"\t\t\t\tThe difference between a user and a normal page is only\n"
+"\t\t\t\tthat the former has logon credentials attached to its page record."
+msgstr ""
+"Каждый человек может стать зарегистрированным пользователем системы.\n"
+"\t\t\t\tРазница между пользователем и обычной страницей\n"
+"\t\t\t\tтолько в наличии или отсутствии привязанной к странице учетной записи."
+
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:12
+msgid "First"
+msgstr "Первый"
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:7
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:39
+msgid "Give an unique username and a password. Usernames and passwords are case sensitive, so be careful when entering them."
+msgstr "Укажите уникальное имя пользователя и пароль. Имена пользователей и пароли регистрозависимые."
+
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:8
+msgid "Give the name and the e-mail address of the new user. A <em>person</em> page will be created for this user."
+msgstr "Укажите имя и адрес электронной почты для нового пользователя. Страница категории <em>person</em> будет создана для нового пользователя."
+
+#: modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl:11
+msgid "Help about user credentials."
+msgstr "Помощь по учетным записям."
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:12
+msgid "Make a new user"
+msgstr "Создать нового пользователя."
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:41
+msgid "Modified on"
+msgstr "Изменено"
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:39
+msgid "Name"
+msgstr "Имя"
+
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:6
+msgid "Name and e-mail address"
+msgstr "Имя и e-mail"
+
+#: modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl:11
+msgid "Need more help?"
+msgstr "Требуется помощь?"
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:63
+msgid "No users found."
+msgstr "Пользователей не найдено."
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:43
+msgid "Options"
+msgstr "Опции"
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:26
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:50
+msgid "Password"
+msgstr "Пароль"
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:35
+msgid "Save"
+msgstr "Сохранить"
+
+#: modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl:24
+msgid "Set username / password"
+msgstr "Установить имя / пароль"
+
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:18
+msgid "Sur. prefix"
+msgstr "Префикс фамил."
+
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:24
+msgid "Surname"
+msgstr "Фамилия"
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:3
+msgid "The password of the admin user cannot be changed in the database. Please edit your site's configuration file at"
+msgstr "Пароль администратора нельзя изменить в базе данных. Отредактируйте файл конфигурации текущего сайта в"
+
+#: modules/mod_admin_identity/templates/_action_dialog_delete_username.tpl:4
+msgid "This can't be undone. The username and password will be lost forever."
+msgstr "Имя и пароль будут удалены. Это действие нельзя отменить."
+
+#: modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl:16
+msgid "This person is also a user."
+msgstr "Эта страница person также является пользователем."
+
+#: modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl:18
+msgid "This person is not yet a user."
+msgstr "Этот человек не является пользователем."
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:20
+#: modules/mod_admin_identity/templates/admin_users.tpl:40
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:44
+msgid "Username"
+msgstr "Имя пользователя"
+
+#: modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl:5
+msgid "Username / password"
+msgstr "Логин / пароль"
+
+#: modules/mod_admin_identity/templates/_action_dialog_user_add.tpl:37
+msgid "Username and password"
+msgstr "Логин и пароль"
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:3
+#: modules/mod_admin_identity/templates/admin_users.tpl:32
+#: modules/mod_admin_identity/templates/_admin_menu_module.tpl:2
+msgid "Users"
+msgstr "Пользователи"
+
+#: modules/mod_admin_identity/templates/_admin_edit_sidebar.person.tpl:11
+msgid "When you add credentials to a person then the person becomes an user. A person or machine can log on with those credentials and perform actions on your Zotonic system.<br/><br/>What an user can do depends on the groups the user is member of."
+msgstr "Когда вы добавляете учетную запись к странице, эта страница становится пользователем. Пользователь может осуществлять вход в систему и производить какие-то действия.<br/><br/>Диапазон доступных действий зависит от того, в какой группе состоит пользователь и от настроек контроля доступа."
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:14
+msgid "You need to be an administrator to add users."
+msgstr "Только администратор может создавать новых пользователей."
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:55
+msgid "delete username"
+msgstr "удалить логин"
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:57
+msgid "edit"
+msgstr "изменить"
+
+#: modules/mod_admin_identity/templates/_action_dialog_set_username_password.tpl:3
+msgid "if you want to change the admin password."
+msgstr "если необходимо изменить пароль администратора."
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:33
+msgid "matching"
+msgstr "совпадение"
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:35
+msgid "overview"
+msgstr "обзор"
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:53
+msgid "set username/ password"
+msgstr "установить логин/ пароль"
+
+#: modules/mod_admin_identity/templates/admin_users.tpl:34
+msgid "show all"
+msgstr "показать все"
+
View
15 modules/mod_base/resources/resource_file_readonly.erl
@@ -115,15 +115,12 @@ encodings_provided(ReqData, Context) ->
true ->
[{"identity", fun(Data) -> Data end}];
_ ->
- case z_context:get(mime, Context) of
- "image/" ++ _ -> [{"identity", fun(Data) -> Data end}];
- "video/" ++ _ -> [{"identity", fun(Data) -> Data end}];
- "audio/" ++ _ -> [{"identity", fun(Data) -> Data end}];
- "application/x-gzip" ++ _ -> [{"identity", fun(Data) -> Data end}];
- "application/zip" ++ _ -> [{"identity", fun(Data) -> Data end}];
- _ ->
- [{"identity", fun(Data) -> decode_data(identity, Data) end},
- {"gzip", fun(Data) -> decode_data(gzip, Data) end}]
+ Mime = z_context:get(mime, Context),
+ case z_media_identify:is_mime_compressed(Mime) of
+ true -> [{"identity", fun(Data) -> Data end}];
+
+ _ -> [{"identity", fun(Data) -> decode_data(identity, Data) end},
+ {"gzip", fun(Data) -> decode_data(gzip, Data) end}]
end
end,
{Encodings, ReqData, z_context:set(encode_data, length(Encodings) > 1, Context)}.
View
24 modules/mod_l10n/translations/ru.po
@@ -21,19 +21,19 @@ msgstr ""
#: modules/mod_l10n/support/l10n_date.erl:37
msgid "April"
-msgstr "Апрель"
+msgstr "Апреля"
#: modules/mod_l10n/support/l10n_date.erl:41
msgid "August"
-msgstr "Август"
+msgstr "Августа"
#: modules/mod_l10n/support/l10n_date.erl:45
msgid "December"
-msgstr "Декабрь"
+msgstr "Декабря"
#: modules/mod_l10n/support/l10n_date.erl:35
msgid "February"
-msgstr "Февраль"
+msgstr "Февраля"
#: modules/mod_l10n/support/l10n_date.erl:28
msgid "Friday"
@@ -41,23 +41,23 @@ msgstr "Пятница"
#: modules/mod_l10n/support/l10n_date.erl:34
msgid "January"
-msgstr "Январь"
+msgstr "Января"
#: modules/mod_l10n/support/l10n_date.erl:40
msgid "July"
-msgstr "Июль"
+msgstr "Июля"
#: modules/mod_l10n/support/l10n_date.erl:39
msgid "June"
-msgstr "Июнь"
+msgstr "Июня"
#: modules/mod_l10n/support/l10n_date.erl:36
msgid "March"
-msgstr "Март"
+msgstr "Марта"
#: modules/mod_l10n/support/l10n_date.erl:38
msgid "May"
-msgstr "Май"
+msgstr "Мая"
#: modules/mod_l10n/support/l10n_date.erl:24
msgid "Monday"
@@ -65,11 +65,11 @@ msgstr "Понедельник"
#: modules/mod_l10n/support/l10n_date.erl:44
msgid "November"
-msgstr "Ноябрь"
+msgstr "Ноября"
#: modules/mod_l10n/support/l10n_date.erl:43
msgid "October"
-msgstr "Октябрь"
+msgstr "Октября"
#: modules/mod_l10n/support/l10n_date.erl:29
msgid "Saturday"
@@ -77,7 +77,7 @@ msgstr "Суббота"
#: modules/mod_l10n/support/l10n_date.erl:42
msgid "September"
-msgstr "Сентябрь"
+msgstr "Сентября"
#: modules/mod_l10n/support/l10n_date.erl:30
msgid "Sunday"
View
9 src/support/z_media_archive.erl
@@ -74,7 +74,14 @@ archive_file(Filename, NewBasename, Context) ->
NewFile = archive_filename(NewBasename, Context),
AbsPath = abspath(NewFile, Context),
ok = filelib:ensure_dir(AbsPath),
- ok = file:rename(Fileabs, AbsPath),
+ ok = case file:rename(Fileabs, AbsPath) of
+ %% cross-fs rename is not supported by erlang, so copy and delete the file
+ {error, exdev} ->
+ {ok, _BytesCopied} = file:copy(Fileabs, AbsPath),
+ file:delete(Fileabs);
+
+ Result -> Result
+ end,
NewFile
end.
View
57 src/support/z_media_preview.erl
@@ -365,31 +365,35 @@ calc_size(Width, Height, ImageWidth, ImageHeight, CropPar, _Orientation, _IsUpsc
false -> {Width, ceil(Width / ImageAspect), none}
end;
_ ->
- % When we are doing a crop then we have to calculate the
- % maximum inner bounding box, and not the maximum outer
- % bounding box for the image
- {W,H} = case Aspect > ImageAspect of
- true ->
- % width is the larger one
- {Width, Width / ImageAspect};
- false ->
- % height is the larger one
- {ImageAspect * Height, Height}
- end,
- CropL = case CropPar of
- X when X == north_west; X == west; X == south_west -> 0;
- X when X == north_east; X == east; X == south_east -> ceil(W - Width);
- _ -> ceil((W - Width) / 2)
- end,
+ %% When we are doing a crop then we have to calculate the
+ %% maximum inner bounding box, and not the maximum outer
+ %% bounding box for the image
+ {W,H} = case Aspect > ImageAspect of
+ % width is the larger one
+ true -> {Width, Width / ImageAspect};
+
+ % height is the larger one
+ false -> {ImageAspect * Height, Height}
+ end,
+
+
+ CropL = case CropPar of
+ X when X == north_west; X == west; X == south_west -> 0;
+ X when X == north_east; X == east; X == south_east -> ceil(W - Width);
+ [X,_] when is_integer(X) -> X;
+ _ -> ceil((W - Width) / 2)
+ end,
+
CropT = case CropPar of
- Y when Y == north_west; Y == north; Y == north_east -> 0;
- Y when Y == south_west; Y == south; Y == south_east -> ceil(H - Height);
- _ -> ceil((H - Height) / 2)
- end,
-
- % @todo Prevent scaleup of the image, but preserve the result size
- % The crop is relative to the original image
- {ceil(W), ceil(H), {CropL, CropT, Width, Height}}
+ Y when Y == north_west; Y == north; Y == north_east -> 0;
+ Y when Y == south_west; Y == south; Y == south_east -> ceil(H - Height);
+ [_,Y] when is_integer(Y) -> Y;
+ _ -> ceil((H - Height) / 2)
+ end,
+
+ %% @todo Prevent scaleup of the image, but preserve the result size
+ %% The crop is relative to the original image
+ {ceil(W), ceil(H), {CropL, CropT, Width, Height}}
end.
@@ -407,7 +411,10 @@ string2filter("crop", Where) ->
"south_west" -> south_west;
"west" -> west;
"north_west" -> north_west;
- "center" -> center
+ "center" -> center;
+ [C|_] = CropLT when C == $+ orelse C == $- ->
+ {match, [[CropL], [CropT]]} = re:run(CropLT, "[+-][0-9]+", [global, {capture, first, list}]),
+ [list_to_integer(CropL), list_to_integer(CropT)]
end,
{crop,Dir};
string2filter("grey",[]) ->
Something went wrong with that request. Please try again.