luci-0.10: merge r7308 - r7326

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 4cbbe58ce0e2a770fe6b16decd9664af26184b2f..e29bd52bc8e240c70c9566332c43e0b40fcb82f8 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -269,7 +269,12 @@ function dispatch(request)
        end
 
        track.dependent = (track.dependent ~= false)
-       assert(not track.dependent or not track.auto, "Access Violation")
+       assert(not track.dependent or not track.auto,
+               "Access Violation\nThe page at '" .. table.concat(request, "/") .. "/' " ..
+               "has no parent node so the access to this location has been denied.\n" ..
+               "This is a software bug, please report this message at " ..
+               "http://luci.subsignal.org/trac/newticket"
+       )
 
        if track.sysauth then
                local sauth = require "luci.sauth"
@@ -380,13 +385,27 @@ function dispatch(request)
                        setfenv(target, env)
                end)
 
+               local ok, err
                if type(c.target) == "table" then
-                       target(c.target, unpack(args))
+                       ok, err = util.copcall(target, c.target, unpack(args))
                else
-                       target(unpack(args))
+                       ok, err = util.copcall(target, unpack(args))
                end
+               assert(ok,
+                      "Failed to execute " .. (type(c.target) == "function" and "function" or c.target.type or "unknown") ..
+                      " dispatcher target for entry '/" .. table.concat(request, "/") .. "'.\n" ..
+                      "The called action terminated with an exception:\n" .. tostring(err or "(unknown)"))
        else
-               error404()
+               local root = node()
+               if not root or not root.target then
+                       error404("No root node was registered, this usually happens if no module was installed.\n" ..
+                                "Install luci-admin-full and retry. " ..
+                                "If the module is already installed, try removing the /tmp/luci-indexcache file.")
+               else
+                       error404("No page is registered at '/" .. table.concat(request, "/") .. "'.\n" ..
+                                "If this url belongs to an extension, make sure it is properly installed.\n" ..
+                                "If the extension was recently installed, try removing the /tmp/luci-indexcache file.")
+               end
        end
 end
 
@@ -463,11 +482,20 @@ function createindex_plain(path, suffixes)
                end
 
                local mod = require(modname)
+               assert(mod ~= true,
+                      "Invalid controller file found\n" ..
+                      "The file '" .. c .. "' contains an invalid module line.\n" ..
+                      "Please verify whether the module name is set to '" .. modname ..
+                      "' - It must correspond to the file path!")
+               
                local idx = mod.index
+               assert(type(idx) == "function",
+                      "Invalid controller file found\n" ..
+                      "The file '" .. c .. "' contains no index() function.\n" ..
+                      "Please make sure that the controller contains a valid " ..
+                      "index function and verify the spelling!")
 
-               if type(idx) == "function" then
-                       index[modname] = idx
-               end
+               index[modname] = idx
        end
 
        if indexcache then

diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua
index 80a3206af59b0c1dc15b0e0df1bbf10844b7dc64..962c2ea8863809ebe688006d3f451880e73e8ada 100644 (file)
--- a/libs/web/luasrc/template.lua
+++ b/libs/web/luasrc/template.lua
@@ -78,7 +78,10 @@ function Template.__init__(self, name)
 
                -- If we have no valid template throw error, otherwise cache the template
                if not self.template then
-                       error(err)
+                       error("Failed to load template '" .. name .. "'.\n" ..
+                             "Error while parsing template '" .. sourcefile .. "'.\n" ..
+                             "A syntax error occured near '" ..
+                             (err or "(nil)"):gsub("\t", "\\t"):gsub("\n", "\\n") .. "'.")
                else
                        self.cache[name] = self.template
                end
@@ -99,6 +102,7 @@ function Template.render(self, scope)
        -- Now finally render the thing
        local stat, err = util.copcall(self.template)
        if not stat then
-               error("Error in template %s: %s" % {self.name, err})
+               error("Failed to execute template '" .. self.name .. "'.\n" ..
+                     "A runtime error occured: " .. tostring(err or "(nil)"))
        end
 end

diff --git a/po/ru/asterisk.po b/po/ru/asterisk.po
index 022a41e6c3dca08348b8af526bc21df9a4b86b86..739d45dd992d9bbf3c25d49c13e8882633d5fa7b 100644 (file)
--- a/po/ru/asterisk.po
+++ b/po/ru/asterisk.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2011-06-08 16:50+0200\n"
+"PO-Revision-Date: 2011-07-20 09:06+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
@@ -62,7 +62,7 @@ msgstr ""
 #. Log directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:10
 msgid "Log directory"
-msgstr ""
+msgstr "Директория логов"
 
 #. Maximum number of calls allowed
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:11
@@ -82,7 +82,7 @@ msgstr "Выключить цвета консоли"
 #. Sound files Cache directory
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:14
 msgid "Sound files Cache directory"
-msgstr ""
+msgstr "Директория кэша звуковых файлов"
 
 #. The Group to run as
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:15
@@ -342,7 +342,7 @@ msgstr ""
 #. User name
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:78
 msgid "User name"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. IAX General Options
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:79
@@ -392,7 +392,7 @@ msgstr ""
 #. Modules
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:89
 msgid "Modules"
-msgstr ""
+msgstr "Модули"
 
 #. Alarm Receiver Application
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:90
@@ -697,7 +697,7 @@ msgstr ""
 #. Voicemail
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:150
 msgid "Voicemail"
-msgstr ""
+msgstr "Голосовая почта"
 
 #. Waits until first ring after time
 #: applications/luci-asterisk/luasrc/i18n/asterisk.en.lua:151

diff --git a/po/ru/coovachilli.po b/po/ru/coovachilli.po
index fb4dcca051e2e629d96b64b7bd305397c8166491..83b03a25a54d31fa9bb18598e94efddda2edd9fe 100644 (file)
--- a/po/ru/coovachilli.po
+++ b/po/ru/coovachilli.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2011-07-05 14:45+0200\n"
-"Last-Translator: stanislav.fomichev <s@fomichev.me>\n"
+"PO-Revision-Date: 2011-07-20 15:19+0200\n"
+"Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr "Общие настройки CoovaChilli"
 #. Command socket
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:4
 msgid "Command socket"
-msgstr ""
+msgstr "Сокет команд"
 
 #. UNIX socket used for communication with chilli_query
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:5
@@ -85,7 +85,7 @@ msgstr ""
 #. Network down script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:14
 msgid "Network down script"
-msgstr ""
+msgstr "Скрипт выключения сети"
 
 #. Script executed after a session has moved from authorized state to unauthorized
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:15
@@ -97,7 +97,7 @@ msgstr ""
 #. Network up script
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:16
 msgid "Network up script"
-msgstr ""
+msgstr "Скрипт включения сети"
 
 #. Script executed after the tun network interface has been brought up
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:17
@@ -183,7 +183,7 @@ msgstr "TUN/TAP устройство"
 #. The specific device to use for the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:35
 msgid "The specific device to use for the TUN/TAP interface"
-msgstr ""
+msgstr "Устройство для TUN/TAP интерфейса"
 
 #. TX queue length
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:36
@@ -193,7 +193,7 @@ msgstr "Длина очереди TX"
 #. The TX queue length to set on the TUN/TAP interface
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:37
 msgid "The TX queue length to set on the TUN/TAP interface"
-msgstr ""
+msgstr "Длина TX очереди TUN/TAP интерфейса"
 
 #. Use TAP device
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:38
@@ -318,7 +318,7 @@ msgstr ""
 #. Do not check disconnection requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:62
 msgid "Do not check disconnection requests"
-msgstr ""
+msgstr "Не проверять запросы на разъединение"
 
 #. Do not check the source IP address of radius disconnect requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:63
@@ -338,7 +338,7 @@ msgstr ""
 #. NAS IP
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:66
 msgid "NAS IP"
-msgstr "NAS IP"
+msgstr "IP адрес NAS"
 
 #. Value to use in RADIUS NAS-IP-Address attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:67
@@ -348,7 +348,7 @@ msgstr ""
 #. NAS MAC
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:68
 msgid "NAS MAC"
-msgstr "NAS MAC"
+msgstr "MAC адрес NAS"
 
 #. MAC address value to use in RADIUS Called-Station-ID attribute
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:69
@@ -387,7 +387,7 @@ msgstr ""
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:75
 msgid ""
 "The UDP port number to use for radius authentication requests (default 1812)"
-msgstr ""
+msgstr "UDP порт для запросов аутентификации radius (1812 по умолчанию)"
 
 #. Option radiuscalled
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:76
@@ -427,7 +427,7 @@ msgstr ""
 #. NAS ID
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:83
 msgid "NAS ID"
-msgstr ""
+msgstr "Идентификатор NAS"
 
 #. Network access server identifier
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:84
@@ -442,7 +442,7 @@ msgstr ""
 #. NAS port type
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:86
 msgid "NAS port type"
-msgstr ""
+msgstr "Тип порта NAS"
 
 #. Value of NAS-Port-Type attribute. Defaults to 19 (Wireless-IEEE-802.11)
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:87
@@ -472,27 +472,27 @@ msgstr ""
 #. RADIUS server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:92
 msgid "RADIUS server 1"
-msgstr ""
+msgstr "RADIUS сервер 1"
 
 #. The IP address of radius server 1
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:93
 msgid "The IP address of radius server 1"
-msgstr ""
+msgstr "IP адрес RADIUS сервера 1"
 
 #. RADIUS server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:94
 msgid "RADIUS server 2"
-msgstr ""
+msgstr "RADIUS сервер 2"
 
 #. The IP address of radius server 2
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:95
 msgid "The IP address of radius server 2"
-msgstr ""
+msgstr "IP адрес RADIUS сервера 2"
 
 #. Swap octets
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:96
 msgid "Swap octets"
-msgstr ""
+msgstr "Переставлять октеты"
 
 #. Swap the meaning of \"input octets\" and \"output octets\" as it related to RADIUS attribtues
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:97
@@ -504,7 +504,7 @@ msgstr ""
 #. Allow WPA guests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:98
 msgid "Allow WPA guests"
-msgstr ""
+msgstr "Разрешить гостевой WPA вход"
 
 #. Allows WPA Guest authentication by sending ChilliSpot-Config=allow-wpa-guests in RADIUS Access-Requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:99
@@ -516,7 +516,7 @@ msgstr ""
 #. Proxy client
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:102
 msgid "Proxy client"
-msgstr ""
+msgstr "Клиент прокси"
 
 #. IP address from which radius requests are accepted. If omitted the server will not accept radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:103
@@ -538,7 +538,7 @@ msgstr ""
 #. Proxy port
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:106
 msgid "Proxy port"
-msgstr ""
+msgstr "Порт прокси"
 
 #. UDP Port to listen to for accepting radius requests
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:107
@@ -548,7 +548,7 @@ msgstr ""
 #. Proxy secret
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:108
 msgid "Proxy secret"
-msgstr ""
+msgstr "Секрет прокси"
 
 #. Radius shared secret for clients
 #: applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua:109

diff --git a/po/ru/diag_devinfo.po b/po/ru/diag_devinfo.po
index 2594aba340adb197f89bcd9faa1e5c122d2b087c..a36fc320bd0103b174899026da521e3e7d8e4728 100644 (file)
--- a/po/ru/diag_devinfo.po
+++ b/po/ru/diag_devinfo.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2011-05-30 16:36+0200\n"
+"PO-Revision-Date: 2011-07-20 14:38+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: none\n"
 "Language: ru\n"
@@ -22,16 +22,16 @@ msgid "Add"
 msgstr "Добавить"
 
 msgid "Invalid"
-msgstr ""
+msgstr "Неверный"
 
 msgid "No SIP devices"
-msgstr ""
+msgstr "SIP устройства отсутствуют"
 
 msgid "No devices detected"
 msgstr "Устройства не обнаружены"
 
 msgid "check other networks"
-msgstr ""
+msgstr "проверить другие сети"
 
 #. Devices discovered for
 msgid "Devices discovered for"
@@ -50,64 +50,64 @@ msgid "Raw"
 msgstr ""
 
 msgid "Enable"
-msgstr ""
+msgstr "Включить"
 
 msgid "Interface"
 msgstr "Интерфейс"
 
 msgid "Subnet"
-msgstr ""
+msgstr "Подсеть"
 
 msgid "Timeout"
-msgstr ""
+msgstr "Таймаут"
 
 msgid "Time to wait for responses in seconds (default 10)"
-msgstr ""
+msgstr "Время ожидания ответов (сек, 10 по умолчанию)"
 
 msgid "Repeat Count"
-msgstr ""
+msgstr "Счетчик повтора"
 
 msgid "Number of times to send requests (default 1)"
-msgstr ""
+msgstr "Количество запросов (1 по умолчанию)"
 
 msgid "Sleep Between Requests"
-msgstr ""
+msgstr "Бездействовать между запросами"
 
 msgid "Milliseconds to sleep between requests (default 100)"
-msgstr ""
+msgstr "Время бездействия между запросами (мс, 10 по умолчанию)"
 
 msgid "Phones"
-msgstr ""
+msgstr "Телефоны"
 
 msgid "Configure"
-msgstr ""
+msgstr "Настроить"
 
 msgid "SIP Devices on Network"
-msgstr ""
+msgstr "SIP устройства в сети"
 
 msgid "SIP Device Scan"
-msgstr ""
+msgstr "Сканировать SIP устройства"
 
 msgid "Devices on Network"
-msgstr ""
+msgstr "Устройства в сети"
 
 msgid "Phone Scan"
-msgstr ""
+msgstr "Сканировать телефоны"
 
 msgid "Config Phone Scan"
-msgstr ""
+msgstr "Настроить сканирование телефонов"
 
 msgid "Device Scan Config"
-msgstr ""
+msgstr "Конфигурация сканирования устройства"
 
 msgid "SIP Device Scanning Configuration"
-msgstr ""
+msgstr "Конфигурация сканирования SIP устройства"
 
 msgid "SIP Device Information"
-msgstr ""
+msgstr "Информация о SIP устройстве"
 
 msgid "Phone Information"
-msgstr ""
+msgstr "Информация о телефоне"
 
 msgid ""
 "Override the information returned by the MAC to Device Info Script (mac-to-"
@@ -133,7 +133,7 @@ msgid "OUI Owner"
 msgstr ""
 
 msgid "Scan for devices on specified networks."
-msgstr ""
+msgstr "Сканировать устройства в заданных сетях."
 
 msgid "Phone Scanning Configuration"
 msgstr ""

diff --git a/po/ru/ffwizard.po b/po/ru/ffwizard.po
index eb648817f9c030edc2e9cf66105571b510fb3cb0..62085c6d8f4caf719236597e587e815b715ee683 100644 (file)
--- a/po/ru/ffwizard.po
+++ b/po/ru/ffwizard.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2011-05-31 09:02+0200\n"
+"PO-Revision-Date: 2011-07-20 14:49+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: none\n"
 "Language: ru\n"
@@ -13,43 +13,43 @@ msgstr ""
 "X-Generator: Pootle 2.0.4\n"
 
 msgid "Allow to transfer anonymous statistics about this node"
-msgstr ""
+msgstr "Разрешить передачу анонимной статистики с этого узла"
 
 msgid "Channel"
 msgstr "Канал"
 
 msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
+msgstr "Выберите это для зашиты Вашей локальной сети от других узлов и клиентов"
 
 msgid "Configure network"
-msgstr ""
+msgstr "Конфигурировать сеть"
 
 msgid "Connect your node with other nodes with a tunnel via the internet."
-msgstr ""
+msgstr "Соединять Ваш узел с другими узлами туннелем через интернет."
 
 msgid "DHCP IP range"
-msgstr ""
+msgstr "Диапазон IP адресов DHCP"
 
 msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
+msgstr "DHCP автоматически назначит IP адреса клиентам"
 
 msgid "DNS Server"
-msgstr ""
+msgstr "Сервер DNS"
 
 msgid "Enable DHCP"
-msgstr ""
+msgstr "Разрешить DHCP"
 
 msgid "Gateway"
-msgstr ""
+msgstr "Шлюз"
 
 msgid "Heartbeat"
 msgstr ""
 
 msgid "IP address"
-msgstr ""
+msgstr "IP адрес"
 
 msgid "L2gvpn tunnel"
-msgstr ""
+msgstr "L2gvpn туннель"
 
 msgid "Limit download bandwidth"
 msgstr ""
@@ -64,32 +64,34 @@ msgid "Mesh IPv6 Address"
 msgstr ""
 
 msgid "Netmask"
-msgstr ""
+msgstr "Маска сети"
 
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 msgid "Password confirmation"
-msgstr ""
+msgstr "Подтверждение пароля"
 
 msgid "Password successfully changed"
-msgstr ""
+msgstr "Пароль успешно изменен"
 
 msgid "Protect LAN"
 msgstr ""
 
 msgid "Protocol"
-msgstr ""
+msgstr "Протокол"
 
 msgid "Select this checkbox to configure your network interfaces."
-msgstr ""
+msgstr "Настроить сетевые интерфейсы"
 
 msgid ""
 "Select this to allow others to use your connection to access the internet."
 msgstr ""
+"Разрешить другим пользователям использовать Ваше соединение для доступа в "
+"интернет."
 
 msgid "Share your internet connection"
-msgstr ""
+msgstr "Разрешить другим использовать Ваше интернет соединение"
 
 msgid ""
 "The IP range from which clients are assigned ip addresses (e.g. "
@@ -99,10 +101,10 @@ msgid ""
 msgstr ""
 
 msgid "The ipv6 address is calculated auomatically."
-msgstr ""
+msgstr "Автоматический IPv6 адрес"
 
 msgid "The protocol to use for internet connectivity."
-msgstr ""
+msgstr "Протокол доступа в интернет."
 
 msgid ""
 "This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
@@ -118,46 +120,49 @@ msgid ""
 msgstr ""
 
 msgid "Unknown Error"
-msgstr ""
+msgstr "Неизвестная ошибка"
 
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
 
 msgid "Virtual Access Point (VAP)"
-msgstr ""
+msgstr "Виртуальная точка доступа (VAP)"
 
 msgid "Wizard"
-msgstr ""
+msgstr "Помощник"
 
 msgid "Your device and neighbouring nodes have to use the same channel."
 msgstr ""
+"Ваше устройство и соседние узлы должны использовать один и тот же канал."
 
 msgid "dhcp"
-msgstr ""
+msgstr "dhcp"
 
 msgid "kbit/s"
-msgstr ""
+msgstr "кбит/с"
 
 msgid "static"
-msgstr ""
+msgstr "статический"
 
 msgid "Configure this interface."
-msgstr ""
+msgstr "Настроить интерфейс."
 
 msgid "recommended"
 msgstr ""
 
 msgid "Basic settings"
-msgstr ""
+msgstr "Главные настройки"
 
 msgid "Basic settings are incomplete. Please go to"
-msgstr ""
+msgstr "Ошибка в главных настройках. Пожалуйста, перейдите в"
 
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 msgid "You can not use the wizard because some necessary values are missing."
 msgstr ""
+"Вы не можете использовать Помощника так как некоторые необходимые значения "
+"отсутствуют."
 
 msgid "and fill out all required fields."
-msgstr ""
+msgstr "и заполните все требуемые поля."

diff --git a/po/ru/meshwizard.po b/po/ru/meshwizard.po
index f035cf46d9281104740ef156f202766ba86cfb97..7570762fe74aa88255c10b9f375a821c5cfe2509 100644 (file)
--- a/po/ru/meshwizard.po
+++ b/po/ru/meshwizard.po
@@ -1,5 +1,21 @@
-msgid "Channel"
+msgid ""
 msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-20 09:47+0200\n"
+"PO-Revision-Date: 2011-07-20 09:53+0200\n"
+"Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
+
+msgid "Channel"
+msgstr "Канал"
 
 msgid "Check this to protect your LAN from other nodes or clients"
 msgstr ""
@@ -8,26 +24,26 @@ msgid "Cleanup config"
 msgstr ""
 
 msgid "Configure this interface"
-msgstr ""
+msgstr "Конфигурировать этот интерфейс"
 
 msgid "DHCP IP range"
-msgstr ""
+msgstr "Диапазон IP адресов DHCP"
 
 msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
+msgstr "DHCP автоматически назначит IP адреса клиентам"
 
 msgid "Enable DHCP"
-msgstr ""
+msgstr "Разрешить DHCP"
 
 msgid "General Settings"
-msgstr ""
+msgstr "Общие настройки"
 
 msgid ""
 "If this is selected then config is cleaned before setting new config options."
 msgstr ""
 
 msgid "Interfaces"
-msgstr ""
+msgstr "Интерфейсы"
 
 msgid "Mesh IP address"
 msgstr ""
@@ -43,7 +59,7 @@ msgid ""
 msgstr ""
 
 msgid "Share your internet connection"
-msgstr ""
+msgstr "Разрешить другим использовать интернет соединение"
 
 msgid ""
 "The IP range from which clients are assigned ip addresses (e.g. "

diff --git a/po/ru/multiwan.po b/po/ru/multiwan.po
index 559d47e27e82f0d3a0bc5af0c1e4b2798e27e954..05b5ea099bf19d820a71e21cb4a91bb567782a8b 100644 (file)
--- a/po/ru/multiwan.po
+++ b/po/ru/multiwan.po
@@ -1,13 +1,16 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-07-20 09:12+0200\n"
+"Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: none\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
 
 msgid "Attempts Before WAN Failover"
 msgstr ""
@@ -23,13 +26,13 @@ msgid ""
 msgstr ""
 
 msgid "DNS Server(s)"
-msgstr ""
+msgstr "DNS сервер(ы)"
 
 msgid "Default Route"
 msgstr ""
 
 msgid "Destination Address"
-msgstr ""
+msgstr "Адрес назначения"
 
 msgid "Disable"
 msgstr ""
@@ -77,10 +80,10 @@ msgid "None"
 msgstr ""
 
 msgid "Ports"
-msgstr ""
+msgstr "Порты"
 
 msgid "Protocol"
-msgstr ""
+msgstr "Протокол"
 
 msgid "Source Address"
 msgstr ""

diff --git a/po/ru/olsr.po b/po/ru/olsr.po
index b01a7d2f7f4a3c72038028fd91eccaf8490f33bd..c36ac9b60024e4ca53f2d83cea845a78e8ea359d 100644 (file)
--- a/po/ru/olsr.po
+++ b/po/ru/olsr.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2011-06-06 09:19+0200\n"
+"PO-Revision-Date: 2011-07-20 14:07+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
@@ -71,7 +71,7 @@ msgid ""
 msgstr ""
 
 msgid "Enable this interface."
-msgstr ""
+msgstr "Использовать этот интерфейс."
 
 msgid "Enabled"
 msgstr ""
@@ -95,13 +95,13 @@ msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
 msgid "Gateway"
-msgstr ""
+msgstr "Шлюз"
 
 msgid "General Settings"
 msgstr "Общие настройки"
 
 msgid "General settings"
-msgstr ""
+msgstr "Общие настройки"
 
 msgid "HNA"
 msgstr ""
@@ -125,7 +125,7 @@ msgid "Hello validity time"
 msgstr ""
 
 msgid "Hna4"
-msgstr ""
+msgstr "Hna4"
 
 msgid "Hna6"
 msgstr ""
@@ -134,7 +134,7 @@ msgid "Hops"
 msgstr ""
 
 msgid "Hostname"
-msgstr ""
+msgstr "Имя хоста"
 
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
@@ -143,24 +143,27 @@ msgid ""
 msgstr ""
 
 msgid "IP Addresses"
-msgstr "IP адрес"
+msgstr "IP адреса"
 
 msgid ""
 "IP-version to use. If 6and4 is selected then one olsrd instance is started "
 "for each protocol."
-msgstr ""
+msgstr "Версия IP. olsrd будет запущен для каждой выбранной версии."
 
 msgid "IPv4"
-msgstr ""
+msgstr "IPv4"
 
 msgid "IPv4 broadcast"
-msgstr ""
+msgstr "Широковещательный IPv4"
 
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
+"Широковещательный IPv4 адрес для исходящих OLSR пакетов. Например, "
+"255.255.255.255. По умолчанию, \"0.0.0.0\" адрес ведет к использованию "
+"широковещательного IP."
 
 msgid "IPv4 source"
 msgstr ""
@@ -171,15 +174,15 @@ msgid ""
 msgstr ""
 
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 msgid "IPv6 multicast"
-msgstr ""
+msgstr "Групповой IPv6"
 
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
-msgstr ""
+msgstr "Групповой IPv6 адрес. По умолчанию, \"FF02::6D\"."
 
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
@@ -225,12 +228,14 @@ msgid "Interfaces Defaults"
 msgstr ""
 
 msgid "Internet protocol"
-msgstr ""
+msgstr "Интернет протокол"
 
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
+"Интервал опроса сетвых интерфейсов на наличие изменений в конфигурации (в "
+"секундах). По умолчанию, \"2.5\"."
 
 msgid "Known OLSR routes"
 msgstr ""
@@ -284,16 +289,16 @@ msgid "LinkQuality Multiplicator"
 msgstr ""
 
 msgid "Links per node (average)"
-msgstr ""
+msgstr "Кол-во соединений на узел (среднее)"
 
 msgid "Links total"
-msgstr ""
+msgstr "Кол-во соединений общее"
 
 msgid "Local interface IP"
-msgstr ""
+msgstr "IP адрес локального интерфейса"
 
 msgid "MID"
-msgstr ""
+msgstr "MID"
 
 msgid "MID interval"
 msgstr ""
@@ -305,7 +310,7 @@ msgid "MTU"
 msgstr ""
 
 msgid "Main IP"
-msgstr ""
+msgstr "Основной IP адрес"
 
 msgid ""
 "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
@@ -313,10 +318,10 @@ msgid ""
 msgstr ""
 
 msgid "Metric"
-msgstr ""
+msgstr "Метрика"
 
 msgid "Mode"
-msgstr ""
+msgstr "Режим"
 
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
@@ -329,31 +334,31 @@ msgid "NAT threshold"
 msgstr ""
 
 msgid "Neighbors"
-msgstr ""
+msgstr "Соседние узлы"
 
 msgid "Neighbour IP"
-msgstr ""
+msgstr "Соседние IP адреса"
 
 msgid "Neighbours"
-msgstr ""
+msgstr "Соседние узлы"
 
 msgid "Netmask"
-msgstr ""
+msgstr "Маска сети"
 
 msgid "Network"
 msgstr "Сеть"
 
 msgid "Network address"
-msgstr ""
+msgstr "Сетевой адрес"
 
 msgid "Nic changes poll interval"
 msgstr ""
 
 msgid "Nodes"
-msgstr ""
+msgstr "Узлы"
 
 msgid "OLSR"
-msgstr ""
+msgstr "OLSR"
 
 msgid "OLSR - Display Options"
 msgstr ""
@@ -371,7 +376,7 @@ msgid "OLSR Daemon - Interface"
 msgstr ""
 
 msgid "OLSR connections"
-msgstr ""
+msgstr "OLSR соединения"
 
 msgid "OLSR gateway"
 msgstr ""
@@ -389,13 +394,13 @@ msgid "Overview of currently established OLSR connections"
 msgstr ""
 
 msgid "Overview of currently known OLSR nodes"
-msgstr ""
+msgstr "Обзор текущих известных OLSR узлов"
 
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
 msgid "Overview of interfaces where OLSR is running"
-msgstr ""
+msgstr "Обзор интерфейсов с запущенным OLSR"
 
 msgid "Overview of known multiple interface announcements"
 msgstr ""
@@ -413,7 +418,7 @@ msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
 msgid "Pollrate"
-msgstr ""
+msgstr "Частота опроса"
 
 msgid "Port"
 msgstr "Порт"
@@ -431,10 +436,10 @@ msgid ""
 msgstr ""
 
 msgid "Routes"
-msgstr ""
+msgstr "Маршруты"
 
 msgid "Secondary OLSR interfaces"
-msgstr ""
+msgstr "Вторичные OLSR интерфейсы"
 
 msgid ""
 "Sets the main IP (originator ip) of the router. This IP will NEVER change "
@@ -478,7 +483,7 @@ msgid "TC"
 msgstr ""
 
 msgid "TC interval"
-msgstr ""
+msgstr "Интервал TC"
 
 msgid "TC validity time"
 msgstr ""
@@ -518,7 +523,7 @@ msgid "Timing and Validity"
 msgstr ""
 
 msgid "Topology"
-msgstr ""
+msgstr "Топология"
 
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "

diff --git a/po/ru/polipo.po b/po/ru/polipo.po
index efa4dbc553fdc1f38b8717f3bf02b64cfd73eeb6..1b4321a3be4e4a4cb6790c9d4683dd8bc1f5b361 100644 (file)
--- a/po/ru/polipo.po
+++ b/po/ru/polipo.po
@@ -1,22 +1,24 @@
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-07-20 14:17+0200\n"
+"Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.4\n"
 
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Расширенные настройки"
 
 msgid "Allowed clients"
-msgstr ""
+msgstr "Разрешенные клиенты"
 
 msgid "Always use system DNS resolver"
 msgstr ""
@@ -30,7 +32,7 @@ msgid "DNS and Query Settings"
 msgstr ""
 
 msgid "DNS server address"
-msgstr ""
+msgstr "Адрес DNS сервера"
 
 msgid "Delete cache files time"
 msgstr ""
@@ -87,24 +89,26 @@ msgid "PMM segments size (in bytes)"
 msgstr ""
 
 msgid "Parent Proxy"
-msgstr ""
+msgstr "Родительский прокси"
 
 msgid "Parent proxy address"
-msgstr ""
+msgstr "Адрес родительского прокси"
 
 msgid ""
 "Parent proxy address (in host:port format), to which Polipo will forward the "
 "requests."
 msgstr ""
+"Адрес родительского прокси (в формате хост:порт) на который Polipo будет "
+"перенаправлять запросы."
 
 msgid "Parent proxy authentication"
 msgstr ""
 
 msgid "Polipo"
-msgstr ""
+msgstr "Polipo"
 
 msgid "Polipo is a small and fast caching web proxy."
-msgstr ""
+msgstr "Polipo - небольшой веб-прокси использующий кэширование."
 
 msgid "Poor Man's Multiplexing"
 msgstr ""
@@ -120,7 +124,7 @@ msgid "Port on which Polipo will listen"
 msgstr ""
 
 msgid "Proxy"
-msgstr ""
+msgstr "Прокси"
 
 msgid "Query DNS by hostname"
 msgstr ""
@@ -149,7 +153,7 @@ msgid ""
 msgstr ""
 
 msgid "Shared cache"
-msgstr ""
+msgstr "Общий кэш"
 
 msgid ""
 "Size of the first PMM segment. If not defined, it defaults to twice the PMM "
@@ -168,10 +172,10 @@ msgid ""
 msgstr ""
 
 msgid "Time after which cached files will be deleted"
-msgstr ""
+msgstr "Интервал удаления кэш файлов"
 
 msgid "Time after which cached files will be truncated"
-msgstr ""
+msgstr "Интервал округления размера кэш файлов"
 
 msgid "To enable PMM, PMM segment size must be set to some positive value."
 msgstr ""

diff --git a/po/ru/qos.po b/po/ru/qos.po
index 1c3cdd3ef8ff0ffdcc6a7e0ace6664a37fd3fcff..7f7d9cb02cb8e4f835080b32c437f4497cca7c6e 100644 (file)
--- a/po/ru/qos.po
+++ b/po/ru/qos.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-25 22:10+0100\n"
-"PO-Revision-Date: 2011-06-06 17:48+0200\n"
+"PO-Revision-Date: 2011-07-20 10:28+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
@@ -32,22 +32,22 @@ msgid "Classification group"
 msgstr ""
 
 msgid "default"
-msgstr ""
+msgstr "по умолчанию"
 
 msgid "Calculate overhead"
 msgstr ""
 
 msgid "Half-duplex"
-msgstr ""
+msgstr "Полудуплекс"
 
 msgid "Download speed (kbit/s)"
-msgstr ""
+msgstr "Скорость загрузки (кбит/с)"
 
 msgid "Upload speed (kbit/s)"
-msgstr ""
+msgstr "Скорость отдачи (кбит/с)"
 
 msgid "Classification Rules"
-msgstr ""
+msgstr "Правила классификации"
 
 msgid "Target"
 msgstr ""
@@ -56,25 +56,25 @@ msgid "priority"
 msgstr "приоритет"
 
 msgid "express"
-msgstr ""
+msgstr "экспресс"
 
 msgid "normal"
-msgstr ""
+msgstr "обычный"
 
 msgid "low"
-msgstr ""
+msgstr "низкий"
 
 msgid "Source host"
 msgstr ""
 
 msgid "all"
-msgstr ""
+msgstr "все"
 
 msgid "Destination host"
 msgstr ""
 
 msgid "Service"
-msgstr ""
+msgstr "Служба"
 
 msgid "Protocol"
 msgstr "Протокол"
@@ -83,4 +83,4 @@ msgid "Ports"
 msgstr "Порты"
 
 msgid "Number of bytes"
-msgstr ""
+msgstr "Количество байт"

diff --git a/po/ru/radvd.po b/po/ru/radvd.po
index 663859e278a9f6d917ef06c05ebc5699215f086e..1491b694a5bb3d11e6715b0037611a2bb59e4af3 100644 (file)
--- a/po/ru/radvd.po
+++ b/po/ru/radvd.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2011-05-31 09:08+0200\n"
+"PO-Revision-Date: 2011-07-20 15:27+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: German\n"
 "Language: ru\n"
@@ -19,7 +19,7 @@ msgid "Address"
 msgstr "Адрес"
 
 msgid "Addresses"
-msgstr ""
+msgstr "Адреса"
 
 msgid "Advanced"
 msgstr ""
@@ -108,7 +108,7 @@ msgid "Autonomous"
 msgstr ""
 
 msgid "Clients"
-msgstr ""
+msgstr "Клиенты"
 
 msgid "Configuration flag"
 msgstr ""
@@ -117,10 +117,10 @@ msgid "Current hop limit"
 msgstr ""
 
 msgid "DNSSL"
-msgstr ""
+msgstr "DNSSL"
 
 msgid "DNSSL Configuration"
-msgstr ""
+msgstr "Конфигурация DNSSL"
 
 msgid "Default lifetime"
 msgstr ""
@@ -193,16 +193,16 @@ msgid ""
 msgstr ""
 
 msgid "Interface"
-msgstr ""
+msgstr "Интерфейс"
 
 msgid "Interface Configuration"
-msgstr ""
+msgstr "Конфигурация интерфейса"
 
 msgid "Interface required"
 msgstr ""
 
 msgid "Interfaces"
-msgstr ""
+msgstr "Интерфейсы"
 
 msgid "Lifetime"
 msgstr ""
@@ -253,22 +253,22 @@ msgid "Preferred lifetime"
 msgstr ""
 
 msgid "Prefix"
-msgstr ""
+msgstr "Префикс"
 
 msgid "Prefix Configuration"
-msgstr ""
+msgstr "Конфигурация префикса"
 
 msgid "Prefixes"
-msgstr ""
+msgstr "Префиксы"
 
 msgid "RDNSS"
-msgstr ""
+msgstr "RDNSS"
 
 msgid "RDNSS Configuration"
-msgstr ""
+msgstr "Конфигурация RDNSS"
 
 msgid "Radvd"
-msgstr ""
+msgstr "Radvd"
 
 msgid "Radvd - DNSSL"
 msgstr ""
@@ -280,7 +280,7 @@ msgid "Radvd - Prefix"
 msgstr ""
 
 msgid "Radvd - RDNSS"
-msgstr ""
+msgstr "Radvd - RDNSS"
 
 msgid "Radvd - Route"
 msgstr ""
@@ -304,7 +304,7 @@ msgid "Route Configuration"
 msgstr ""
 
 msgid "Routes"
-msgstr ""
+msgstr "Маршруты"
 
 msgid "Source link-layer address"
 msgstr ""
@@ -337,7 +337,7 @@ msgid "Specifies the preference associated with the default router"
 msgstr ""
 
 msgid "Suffix"
-msgstr ""
+msgstr "Суффикс"
 
 msgid ""
 "The maximum time allowed between sending unsolicited multicast router "
@@ -382,7 +382,7 @@ msgid "medium"
 msgstr ""
 
 msgid "no"
-msgstr ""
+msgstr "нет"
 
 msgid "yes"
-msgstr ""
+msgstr "да"

diff --git a/po/ru/samba.po b/po/ru/samba.po
index ad28105e2302d3ad82f35d45087c0afc7904bbbf..bccdb825ae65dadea91325a40a23b1a4bf0c9089 100644 (file)
--- a/po/ru/samba.po
+++ b/po/ru/samba.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2011-06-01 12:02+0200\n"
+"PO-Revision-Date: 2011-07-20 14:29+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
@@ -15,22 +15,24 @@ msgstr ""
 "X-Generator: Pootle 2.0.4\n"
 
 msgid "Allow guests"
-msgstr ""
+msgstr "Разрешить гостевой вход"
 
 msgid "Allow system users to reach their home directories via network shares"
 msgstr ""
+"Разрешить пользователям получать доступ к их домашним директориям через "
+"сетевые русурсы"
 
 msgid "Allowed users"
-msgstr ""
+msgstr "Разрешенные пользователи"
 
 msgid "Create mask"
-msgstr ""
+msgstr "Создать маску"
 
 msgid "Description"
 msgstr "Описание"
 
 msgid "Directory mask"
-msgstr ""
+msgstr "Маска директории"
 
 msgid "Edit Template"
 msgstr "Редактировать шаблон"
@@ -42,25 +44,25 @@ msgid "General Settings"
 msgstr "Общие настройки"
 
 msgid "Hostname"
-msgstr ""
+msgstr "Имя хоста"
 
 msgid "Mask for new directories"
-msgstr ""
+msgstr "Маска для новых директорий"
 
 msgid "Mask for new files"
-msgstr ""
+msgstr "Маска для новых файлов"
 
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 msgid "Network Shares"
-msgstr ""
+msgstr "Сетевые ресурсы"
 
 msgid "Path"
-msgstr ""
+msgstr "Путь"
 
 msgid "Read-only"
-msgstr ""
+msgstr "Только чтение"
 
 msgid "Share home-directories"
 msgstr ""

diff --git a/po/ru/statistics.po b/po/ru/statistics.po
index 9373a100f1c6390d42ea172fc4a86be627ab1e0f..58df10c7b302b00fcb071271502bc5817f5c7e50 100644 (file)
--- a/po/ru/statistics.po
+++ b/po/ru/statistics.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2011-06-21 14:08+0200\n"
-"Last-Translator: stanislav.fomichev <s@fomichev.me>\n"
+"PO-Revision-Date: 2011-07-20 09:21+0200\n"
+"Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr ""
 #. Processor
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:9
 msgid "Processor"
-msgstr ""
+msgstr "Процессор"
 
 #. Ping
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:10
@@ -105,7 +105,7 @@ msgstr "Прерывания"
 #. Disk Usage
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:19
 msgid "Disk Usage"
-msgstr ""
+msgstr "Использование диска"
 
 #. Exec
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:20
@@ -130,7 +130,7 @@ msgstr ""
 #. System Load
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:24
 msgid "System Load"
-msgstr ""
+msgstr "Загрузка системы"
 
 #. DNS
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:25
@@ -203,7 +203,7 @@ msgstr ""
 #. Number of threads for data collection
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:39
 msgid "Number of threads for data collection"
-msgstr ""
+msgstr "Количество потоков сбора данных"
 
 #. Try to lookup fully qualified hostname
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:40
@@ -402,12 +402,12 @@ msgstr ""
 #. max. 16 chars
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:106
 msgid "max. 16 chars"
-msgstr ""
+msgstr "Не более 16 символов"
 
 #. Table
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:107
 msgid "Table"
-msgstr ""
+msgstr "Таблица"
 
 #. Chain
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:108
@@ -422,7 +422,7 @@ msgstr ""
 #. Network protocol
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:110
 msgid "Network protocol"
-msgstr ""
+msgstr "Сетевой протокол"
 
 #. Source ip range
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:111
@@ -583,7 +583,7 @@ msgstr ""
 #. Server port
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:157
 msgid "Server port"
-msgstr ""
+msgstr "Порт сервера"
 
 #. TTL for network packets
 #: applications/luci-statistics/luasrc/i18n/statistics.en.lua:159

diff --git a/po/ru/tinyproxy.po b/po/ru/tinyproxy.po
index 38288db5b4e0f0b4298eb3660a9ab0f31da18f2a..a71a6ca1897dc4e0b60a8540068014b0af315fea 100644 (file)
--- a/po/ru/tinyproxy.po
+++ b/po/ru/tinyproxy.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2011-05-31 09:14+0200\n"
+"PO-Revision-Date: 2011-07-20 11:14+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
@@ -26,18 +26,20 @@ msgid ""
 msgstr ""
 
 msgid "Allowed clients"
-msgstr ""
+msgstr "Разрешенные клиенты"
 
 msgid "Allowed connect ports"
-msgstr ""
+msgstr "Разрешенные порты подключения"
 
 msgid "Bind address"
-msgstr ""
+msgstr "Адрес привязки"
 
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
 msgstr ""
+"Разрешить использование расширенных регулярных выражений для фильтрации. По "
+"умолчанию, используются основные POSIX выражения."
 
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
@@ -78,7 +80,7 @@ msgid "Filter by URLs"
 msgstr ""
 
 msgid "Filter case-sensitive"
-msgstr ""
+msgstr "Фильтровать с учетом регистра"
 
 msgid "Filter file"
 msgstr ""
@@ -87,7 +89,7 @@ msgid "Filtering and ACLs"
 msgstr ""
 
 msgid "General settings"
-msgstr ""
+msgstr "Общие настройки"
 
 msgid "Group"
 msgstr ""
@@ -129,10 +131,10 @@ msgid "Logging verbosity of the Tinyproxy process"
 msgstr ""
 
 msgid "Max. clients"
-msgstr ""
+msgstr "Макс. кол-во клиентов"
 
 msgid "Max. requests per server"
-msgstr ""
+msgstr "Макс. кол-во запросов на сервер"
 
 msgid "Max. spare servers"
 msgstr ""
@@ -164,19 +166,19 @@ msgid "Plaintext file with URLs or domains to filter. One entry per line"
 msgstr ""
 
 msgid "Policy"
-msgstr ""
+msgstr "Политика"
 
 msgid "Privacy settings"
-msgstr ""
+msgstr "Настройки конфиденциальности"
 
 msgid "Reject access"
-msgstr ""
+msgstr "Отклонять доступ"
 
 msgid "Server Settings"
 msgstr "Настройки сервера"
 
 msgid "Server limits"
-msgstr ""
+msgstr "Ограничения сервера"
 
 msgid ""
 "Specifies HTTP header names which are allowed to pass-through, all others "
@@ -211,16 +213,16 @@ msgid "Start spare servers"
 msgstr ""
 
 msgid "Statistics page"
-msgstr ""
+msgstr "Страница статистики"
 
 msgid "Target host"
 msgstr ""
 
 msgid "Tinyproxy"
-msgstr ""
+msgstr "Tinyproxy"
 
 msgid "Tinyproxy is a small and fast non-caching HTTP(S)-Proxy"
-msgstr ""
+msgstr "Tinyproxy - быстрый HTTP(S)-прокси не использующий кэш"
 
 msgid "Upstream Proxies"
 msgstr ""
@@ -231,16 +233,16 @@ msgid ""
 msgstr ""
 
 msgid "Use syslog"
-msgstr ""
+msgstr "Использовать syslog"
 
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 msgid "Via hostname"
-msgstr ""
+msgstr "Через имя хоста"
 
 msgid "Via proxy"
-msgstr ""
+msgstr "Через прокси"
 
 msgid "Writes log messages to syslog instead of a log file"
 msgstr ""

diff --git a/po/ru/upnp.po b/po/ru/upnp.po
index 8953cafa1ecd987e78bebdc43804c28c4893821e..227212d54a06a1d91cfd626ac64683c54af1003b 100644 (file)
--- a/po/ru/upnp.po
+++ b/po/ru/upnp.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2011-06-01 12:05+0200\n"
+"PO-Revision-Date: 2011-07-20 11:20+0200\n"
 "Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ru\n"
@@ -20,10 +20,10 @@ msgid ""
 msgstr ""
 
 msgid "Action"
-msgstr ""
+msgstr "Действие"
 
 msgid "Active UPnP Redirects"
-msgstr ""
+msgstr "Активные UPnP переадресации"
 
 msgid "Advanced Settings"
 msgstr "Расширенные настройки"
@@ -44,52 +44,52 @@ msgid "Clean rules threshold"
 msgstr ""
 
 msgid "Client Address"
-msgstr ""
+msgstr "Адрес клиента"
 
 msgid "Client Port"
-msgstr ""
+msgstr "Порт клиента"
 
 msgid "Collecting data..."
-msgstr ""
+msgstr "Сбор данных..."
 
 msgid "Comment"
-msgstr ""
+msgstr "Комментарий"
 
 msgid "Delete Redirect"
-msgstr ""
+msgstr "Удалить переадресацию"
 
 msgid "Device UUID"
-msgstr ""
+msgstr "UUID устройства"
 
 msgid "Downlink"
 msgstr ""
 
 msgid "Enable NAT-PMP functionality"
-msgstr ""
+msgstr "Использовать NAT-PMP"
 
 msgid "Enable UPnP functionality"
-msgstr ""
+msgstr "Использовать UPnP"
 
 msgid "Enable additional logging"
 msgstr ""
 
 msgid "Enable secure mode"
-msgstr ""
+msgstr "Использовать защищенный режим"
 
 msgid "External Port"
-msgstr ""
+msgstr "Внешний порт"
 
 msgid "External ports"
-msgstr ""
+msgstr "Внешние порты"
 
 msgid "General Settings"
-msgstr ""
+msgstr "Общие настройки"
 
 msgid "Internal addresses"
-msgstr ""
+msgstr "Внутренние адреса"
 
 msgid "Internal ports"
-msgstr ""
+msgstr "Внутренние порты"
 
 msgid "MiniUPnP ACLs"
 msgstr ""
@@ -98,16 +98,16 @@ msgid "MiniUPnP settings"
 msgstr ""
 
 msgid "Notify interval"
-msgstr ""
+msgstr "Интервал уведомления"
 
 msgid "Port"
-msgstr ""
+msgstr "Порт"
 
 msgid "Presentation URL"
 msgstr ""
 
 msgid "Protocol"
-msgstr ""
+msgstr "Протокол"
 
 msgid "Puts extra debugging information into the system log"
 msgstr ""
@@ -116,10 +116,10 @@ msgid "Report system instead of daemon uptime"
 msgstr ""
 
 msgid "Start UPnP and NAT-PMP service"
-msgstr ""
+msgstr "Запуск UPnP и NAT-PMP служб"
 
 msgid "There are no active redirects."
-msgstr ""
+msgstr "Активные переадресации отсутствуют."
 
 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
@@ -130,6 +130,8 @@ msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
+"UPnP позволяет клиентам в локальной сети автоматически настраивать "
+"маршрутизатор."
 
 msgid "UPnP lease file"
 msgstr ""

diff --git a/po/ru/vnstat.po b/po/ru/vnstat.po
index 5b87c76d88c6823c95d50711e39ba2ae2c8fb833..71126f8d34173498fc88722b92d95cf29bd936f3 100644 (file)
--- a/po/ru/vnstat.po
+++ b/po/ru/vnstat.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2011-05-31 09:11+0200\n"
-"Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
+"PO-Revision-Date: 2011-07-21 12:20+0200\n"
+"Last-Translator: stanislav.fomichev <s@fomichev.me>\n"
 "Language-Team: German\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -16,50 +16,52 @@ msgid "Configuration"
 msgstr "Конфигурация"
 
 msgid "Daily traffic"
-msgstr ""
+msgstr "Трафик за день"
 
 msgid "Graphs"
-msgstr ""
+msgstr "Графики"
 
 msgid "Hourly traffic"
-msgstr ""
+msgstr "Трафик за час"
 
 msgid "Monitor selected interfaces"
-msgstr ""
+msgstr "Собирать статистику на выбранных интерфейсах"
 
 msgid "Monthly traffic"
-msgstr ""
+msgstr "Трафик за месяц"
 
 msgid ""
 "No database has been set up yet. Go to the VnStat configuration and enable "
 "monitoring for one or more interfaces."
 msgstr ""
+"База данных не настроена. Перейдите в конфигурацию и укажите интерфейсы для "
+"сбора статистики."
 
 msgid "Restart VnStat"
-msgstr ""
+msgstr "Перезапустить VnStat"
 
 msgid "Summary display"
-msgstr ""
+msgstr "Сводная статистика"
 
 msgid "The VnStat service has been restarted."
-msgstr ""
+msgstr "VnStat сервис перезапущен."
 
 msgid "Top 10 display"
-msgstr ""
+msgstr "Последние 10"
 
 msgid "Update »"
-msgstr ""
+msgstr "Обновить »"
 
 msgid "VnStat"
-msgstr ""
+msgstr "VnStat"
 
 msgid "VnStat Graphs"
-msgstr ""
+msgstr "Графики VnStat"
 
 msgid "VnStat Traffic Monitor"
-msgstr ""
+msgstr "Монитор трафика VnStat"
 
 msgid ""
 "VnStat is a network traffic monitor for Linux that keeps a log of network "
 "traffic for the selected interface(s)."
-msgstr ""
+msgstr "VnStat - монитор сетевого трафика для Linux."

diff --git a/po/ru/wol.po b/po/ru/wol.po
index 2b3c3ee01591cd19c3e4506039a6568d2c5f7009..3c2c0606c03dbbde4d7ea6f017441cd5447d27e8 100644 (file)
--- a/po/ru/wol.po
+++ b/po/ru/wol.po
@@ -5,8 +5,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-19 00:29+0200\n"
-"PO-Revision-Date: 2011-07-05 16:51+0200\n"
-"Last-Translator: stanislav.fomichev <s@fomichev.me>\n"
+"PO-Revision-Date: 2011-07-20 09:47+0200\n"
+"Last-Translator: Kamal <kamal.aliev@epscom.ru>\n"
 "Language-Team: none\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -29,8 +29,9 @@ msgid "Wake up host"
 msgstr ""
 
 msgid "Starting WoL utility:"
-msgstr ""
+msgstr "Запуск WoL утилиты:"
 
+#, fuzzy
 msgid "WoL program"
 msgstr "WoL программа"