Skip to content

Commit

Permalink
Russian translation
Browse files Browse the repository at this point in the history
  • Loading branch information
rilian-la-te committed May 3, 2015
1 parent bc157e9 commit 58a7dbc
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 35 deletions.
6 changes: 3 additions & 3 deletions archlinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ pkgbase=xfce4-sntray-plugin
pkgname=('xfce4-sntray-plugin' 'vala-panel-sntray' 'xfce4-sntray-plugin-translations')
_cmakename=cmake-vala
_dbusmenuname=vala-dbusmenu
pkgver=0.3.12.1
pkgrel=2
pkgver=0.3.13
pkgrel=1
pkgdesc="Plugin for xfce4-panel and vala-panel to show StatusNotifierItems (AppIndicators) via FlowBox"
url="https://github.com/rilian-la-te/xfce4-sntray-plugin"
arch=('i686' 'x86_64')
license=('GPL3')
makedepends=('cmake' 'vala' 'gtk3' 'xfce4-panel>=4.11.2' 'vala-panel-git')
source=("https://github.com/rilian-la-te/xfce4-sntray-plugin/archive/${pkgver}.tar.gz"
source=("https://github.com/rilian-la-te/xfce4-sntray-plugin/releases/${pkgver}/${pkgbase}-${pkgver}.tar.gz"
"git://github.com/rilian-la-te/${_cmakename}.git"
"git://github.com/rilian-la-te/${_dbusmenuname}.git")
sha256sums=('be44ef67ddfd8bc4d76af0faddb9856f4f9596fe9702784a37ae939b6f6b6681'
Expand Down
43 changes: 29 additions & 14 deletions po/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-sntray-plugin\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-17 00:08+0600\n"
"PO-Revision-Date: 2015-03-17 00:09+0600\n"
"POT-Creation-Date: 2015-05-04 01:39+0600\n"
"PO-Revision-Date: 2015-05-04 01:40+0600\n"
"Last-Translator: Andriy Grytsenko <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
Expand All @@ -16,7 +16,7 @@ msgstr ""
"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: Poedit 1.7.4\n"
"X-Generator: Poedit 1.7.5\n"
"X-POOTLE-MTIME: 1407841216.000000\n"

#: ../src/snconfig.ui:38
Expand Down Expand Up @@ -51,47 +51,50 @@ msgstr "Показывать значки служб в пассивном ре
msgid "Categories visibility"
msgstr "Фильтр по категориям"

#: ../src/snconfig.ui:206
#: ../src/snconfig.ui:206 ../src/snconfig.ui:221
msgid "Use symbolic icons"
msgstr "Использовать монохромные значки"

#: ../src/snconfig.ui:228
#: ../src/snconfig.ui:228 ../src/snconfig.ui:243
msgid "Indicator size:"
msgstr "Размер значка:"

#: ../src/snconfig.ui:266
#: ../src/snconfig.ui:266 ../src/snconfig.ui:281
msgid "Appearance properties"
msgstr "Внешний вид"

#: ../src/snconfig.ui:285
#: ../src/snconfig.ui:285 ../src/snconfig.ui:300
msgid "Core"
msgstr "Общее"

#: ../src/snconfig.ui:309 ../src/snconfig.ui:396
#: ../src/snconfig.ui:309 ../src/snconfig.ui:396 ../src/snconfig.ui:324
#: ../src/snconfig.ui:411
msgid "Icon"
msgstr "Значок"

#: ../src/snconfig.ui:320 ../src/snconfig.ui:407
#: ../src/snconfig.ui:320 ../src/snconfig.ui:407 ../src/snconfig.ui:335
#: ../src/snconfig.ui:422
msgid "Name"
msgstr "Имя"

#: ../src/snconfig.ui:331 ../src/snconfig.ui:418
#: ../src/snconfig.ui:331 ../src/snconfig.ui:418 ../src/snconfig.ui:346
#: ../src/snconfig.ui:433
msgid "Override"
msgstr "Настройка"

#: ../src/snconfig.ui:344
#: ../src/snconfig.ui:344 ../src/snconfig.ui:359
msgid "Index"
msgstr "Индекс"

#: ../src/snconfig.ui:369
#: ../src/snconfig.ui:369 ../src/snconfig.ui:384
msgid "Order"
msgstr "Порядок"

#: ../src/snconfig.ui:431
#: ../src/snconfig.ui:431 ../src/snconfig.ui:446
msgid "Visible"
msgstr "Видимый"

#: ../src/snconfig.ui:454
#: ../src/snconfig.ui:454 ../src/snconfig.ui:469
msgid "Visibility"
msgstr "Видимость"

Expand All @@ -106,3 +109,15 @@ msgstr "Показывает значки AppIndicators (трей KDE)"
#: ../data/sntray.desktop.xfce.in:7
msgid "applications-system"
msgstr "applications-system"

#: ../src/snconfig.ui:206
msgid "Show labels near icons (if applications provides some)"
msgstr "Показывать текст рядом с иконками (если приложение показывает)"

#: ../data/sntray.desktop.plugin.in:4
msgid "StatusNotifier"
msgstr "StatusNotifier"

#: ../data/sntray.desktop.plugin.in:5
msgid "System tray in KDE StatusNotifierItem format"
msgstr "Системный лоток в формате KDE StatusNotifierItem."
39 changes: 27 additions & 12 deletions po/xfce4-sntray-plugin.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-17 00:08+0600\n"
"POT-Creation-Date: 2015-05-04 01:39+0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -49,47 +49,50 @@ msgstr ""
msgid "Categories visibility"
msgstr ""

#: ../src/snconfig.ui:206
#: ../src/snconfig.ui:206 ../src/snconfig.ui:221
msgid "Use symbolic icons"
msgstr ""

#: ../src/snconfig.ui:228
#: ../src/snconfig.ui:228 ../src/snconfig.ui:243
msgid "Indicator size:"
msgstr ""

#: ../src/snconfig.ui:266
#: ../src/snconfig.ui:266 ../src/snconfig.ui:281
msgid "Appearance properties"
msgstr ""

#: ../src/snconfig.ui:285
#: ../src/snconfig.ui:285 ../src/snconfig.ui:300
msgid "Core"
msgstr ""

#: ../src/snconfig.ui:309 ../src/snconfig.ui:396
#: ../src/snconfig.ui:309 ../src/snconfig.ui:396 ../src/snconfig.ui:324
#: ../src/snconfig.ui:411
msgid "Icon"
msgstr ""

#: ../src/snconfig.ui:320 ../src/snconfig.ui:407
#: ../src/snconfig.ui:320 ../src/snconfig.ui:407 ../src/snconfig.ui:335
#: ../src/snconfig.ui:422
msgid "Name"
msgstr ""

#: ../src/snconfig.ui:331 ../src/snconfig.ui:418
#: ../src/snconfig.ui:331 ../src/snconfig.ui:418 ../src/snconfig.ui:346
#: ../src/snconfig.ui:433
msgid "Override"
msgstr ""

#: ../src/snconfig.ui:344
#: ../src/snconfig.ui:344 ../src/snconfig.ui:359
msgid "Index"
msgstr ""

#: ../src/snconfig.ui:369
#: ../src/snconfig.ui:369 ../src/snconfig.ui:384
msgid "Order"
msgstr ""

#: ../src/snconfig.ui:431
#: ../src/snconfig.ui:431 ../src/snconfig.ui:446
msgid "Visible"
msgstr ""

#: ../src/snconfig.ui:454
#: ../src/snconfig.ui:454 ../src/snconfig.ui:469
msgid "Visibility"
msgstr ""

Expand All @@ -104,3 +107,15 @@ msgstr ""
#: ../data/sntray.desktop.xfce.in:7
msgid "applications-system"
msgstr ""

#: ../src/snconfig.ui:206
msgid "Show labels near icons (if applications provides some)"
msgstr ""

#: ../data/sntray.desktop.plugin.in:4
msgid "StatusNotifier"
msgstr ""

#: ../data/sntray.desktop.plugin.in:5
msgid "System tray in KDE StatusNotifierItem format"
msgstr ""
12 changes: 6 additions & 6 deletions src/snitem.vala
Original file line number Diff line number Diff line change
Expand Up @@ -297,16 +297,16 @@ namespace StatusNotifier
var markup_parser = new QRichTextParser(str);
markup_parser.translate_markup();
markup = (markup_parser.pango_markup.length > 0) ? markup_parser.pango_markup: tooltip_markup;
var res_icon = change_icon(tooltip.icon_name, tooltip.pixmap,48);
var res_icon = change_icon(tooltip.icon_name, tooltip.pixmap,48,false);
icon = (markup_parser.icon != null) ? markup_parser.icon: res_icon;
}
else
{
markup = raw_text;
icon = change_icon(tooltip.icon_name, tooltip.pixmap,48);
icon = change_icon(tooltip.icon_name, tooltip.pixmap,48,false);
}
}
private Icon? change_icon(string? icon_name, IconPixmap[] pixmaps, int icon_size)
private Icon? change_icon(string? icon_name, IconPixmap[] pixmaps, int icon_size, bool use_symbolic)
{
var new_name = (use_symbolic) ? icon_name+"-symbolic" : icon_name;
if (icon_name != null && icon_name.length > 0)
Expand Down Expand Up @@ -388,9 +388,9 @@ namespace StatusNotifier
try
{
ItemIface item = Bus.get_proxy_sync(BusType.SESSION, object_name, object_path);
var main_icon = change_icon(item.icon_name,item.icon_pixmap,image.pixel_size);
var attention_icon = change_icon(item.attention_icon_name,item.attention_icon_pixmap,image.pixel_size);
var overlay_icon = change_icon(item.overlay_icon_name,item.overlay_icon_pixmap,image.pixel_size/4);
var main_icon = change_icon(item.icon_name,item.icon_pixmap,image.pixel_size, this.use_symbolic);
var attention_icon = change_icon(item.attention_icon_name,item.attention_icon_pixmap,image.pixel_size,this.use_symbolic);
var overlay_icon = change_icon(item.overlay_icon_name,item.overlay_icon_pixmap,image.pixel_size/4,this.use_symbolic);
if (overlay_icon != null)
overlay_icon = new Emblem(overlay_icon);
bool build_icon = ((attention_icon != null && item.status == Status.NEEDS_ATTENTION) || (main_icon != null) || (image.gicon != null));
Expand Down

0 comments on commit 58a7dbc

Please sign in to comment.