Skip to content

Commit a50a288

Browse files
rilian-la-terilian-la-te
committed
Updated Russian translation
1 parent d65c018 commit a50a288

File tree

3 files changed

+207
-46
lines changed

3 files changed

+207
-46
lines changed

‎applets/gtop/gtop.vala‎

Lines changed: 54 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -77,38 +77,63 @@ public class NetloadIconExporter : ItemExporter
7777
dlg.icon_name = "network-wired";
7878
return dlg;
7979
}
80-
private string format_net_label(uint64 data, bool padding)
80+
private string format_net_label(uint64 bytes, bool padding, bool less_kilo = true, int show_as = 0, string in_begin = "")
8181
{
82-
string str;
83-
/*if(data < 1000)
84-
{
85-
string = g_strdup_printf("%d B/s", data);
82+
string format;
83+
string unit;
84+
uint64 kilo; /* no really a kilo : a kilo or kibi */
85+
86+
if (show_as == 2) { //Bits
87+
bytes *= 8;
88+
kilo = 1000;
89+
} else if (show_as == 1) //Decimal
90+
kilo = 1000;
91+
else //Binary
92+
kilo = 1024;
93+
94+
if (less_kilo && (bytes < kilo)) {
95+
format = "%s%.0lf %s";
96+
if (show_as == 2) unit = _("b");
97+
else if (show_as == 1) unit = _("B");
98+
else unit = _("B");
99+
100+
} else if (bytes < (kilo * kilo)) {
101+
format = (bytes < (100 * kilo)) ? "%s%.1f %s" : "%s%.0f %s";
102+
bytes /= kilo;
103+
if (show_as == 2) unit = _("kb");
104+
else if (show_as == 1) unit = _("kB");
105+
else unit = _("KiB");
106+
107+
} else if (bytes < (kilo * kilo * kilo)) {
108+
format = "%s%.1lf %s";
109+
bytes /= kilo * kilo;
110+
if (show_as == 2) unit = _("Mb");
111+
else if (show_as == 1) unit = _("MB");
112+
else unit = _("MiB");
113+
114+
} else if (bytes < (kilo * kilo * kilo * kilo)) {
115+
format = "%s%.3lf %s";
116+
bytes /= kilo * kilo * kilo;
117+
if (show_as == 2) unit = _("Gb");
118+
else if (show_as == 1) unit = _("GB");
119+
else unit = _("GiB");
120+
121+
} else if (bytes < (kilo * kilo * kilo * kilo * kilo)) {
122+
format = "%s%.3lf %s";
123+
bytes /= kilo * kilo * kilo * kilo;
124+
if (show_as == 2) unit = _("Tb");
125+
else if (show_as == 1) unit = _("TB");
126+
else unit = _("TiB");
127+
128+
} else {
129+
format = "%s%.3f %s";
130+
bytes /= kilo * kilo * kilo * kilo * kilo;
131+
if (show_as == 2) unit = _("Pb");
132+
else if (show_as == 1) unit = _("PB");
133+
else unit = _("PiB");
86134
}
87-
else*/ if(data < 1000000) //should be < 1 MiB and not 1 MB, but this keeps width smaller
88-
str = "%.1lf KiB/s".printf(data/1024.0);
89-
else
90-
str = "%.2lf MiB/s".printf(data/1048576.0);
91-
//will someone have 1 gb/s ? maybe...
92-
//~ if(padding)
93-
//~ {
94-
//~ //render string and get its pixel width
95-
//~ int width = 0;
96-
//~ int maxWidth = 12; //max width for label in pixels
97-
//~ //TODO: should be determined from current panel font type and size
98-
//~ int spaceWidth = 4; //width of one space char in pixels,
99-
//~ Pango.Context context = this.get_pango_context();
100-
//~ Pango.Layout layout = new Pango.Layout(context);
101-
//~ layout.set_text(str);
102-
//~ layout.get_pixel_size(out width, null);
103-
//~ // frees the layout object, do not use after this point
104-
//~ //push max size up as needed
105-
//~ if (width > maxWidth) maxWidth = width + spaceWidth;
106-
//~ //fill up with spaces
107-
//~ str = "%*s%s".printf((int)((maxWidth-width)/spaceWidth), " ", str);
108-
//~ }
109-
return str;
135+
return format.printf(in_begin, bytes, unit);
110136
}
111-
112137
private void get_net(ref uint64[] traffic)
113138
{
114139
glibtop_netload netload;

‎po/ru.po‎

Lines changed: 77 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: lxpanel\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2015-04-21 01:10+0600\n"
10-
"PO-Revision-Date: 2015-04-21 01:13+0600\n"
9+
"POT-Creation-Date: 2015-04-21 01:25+0600\n"
10+
"PO-Revision-Date: 2015-04-21 01:27+0600\n"
1111
"Last-Translator: Andriy Grytsenko <andrej@rep.kiev.ua>\n"
1212
"Language-Team: Russian <hsh@runtu.org>\n"
1313
"Language: ru\n"
@@ -294,7 +294,7 @@ msgstr ""
294294
"Отдача: %s\n"
295295
"Загрузка: %s"
296296

297-
#: ../applets/gtop/gtop.vala:73 ../applets/gtop/gtop.vala:236
297+
#: ../applets/gtop/gtop.vala:73 ../applets/gtop/gtop.vala:261
298298
msgid "Vala Panel Netload Applet"
299299
msgstr "Апплет загрузки сети Vala Panel"
300300

@@ -306,27 +306,95 @@ msgstr "Выбрать сетевой интерфейс"
306306
msgid "Reload network interfaces"
307307
msgstr "Перезагрузить сетевой интерфейс"
308308

309-
#: ../applets/gtop/gtop.vala:200
309+
#: ../applets/gtop/gtop.vala:96
310+
msgid "b"
311+
msgstr "б"
312+
313+
#: ../applets/gtop/gtop.vala:97 ../applets/gtop/gtop.vala:98
314+
msgid "B"
315+
msgstr "Б"
316+
317+
#: ../applets/gtop/gtop.vala:103
318+
msgid "kb"
319+
msgstr "Кбит"
320+
321+
#: ../applets/gtop/gtop.vala:104
322+
msgid "kB"
323+
msgstr "КБ"
324+
325+
#: ../applets/gtop/gtop.vala:105
326+
msgid "KiB"
327+
msgstr "КиБ"
328+
329+
#: ../applets/gtop/gtop.vala:110
330+
msgid "Mb"
331+
msgstr "Мбит"
332+
333+
#: ../applets/gtop/gtop.vala:111
334+
msgid "MB"
335+
msgstr "МБ"
336+
337+
#: ../applets/gtop/gtop.vala:112
338+
msgid "MiB"
339+
msgstr "МиБ"
340+
341+
#: ../applets/gtop/gtop.vala:117
342+
msgid "Gb"
343+
msgstr "Гбит"
344+
345+
#: ../applets/gtop/gtop.vala:118
346+
msgid "GB"
347+
msgstr "ГБ"
348+
349+
#: ../applets/gtop/gtop.vala:119
350+
msgid "GiB"
351+
msgstr "ГиБ"
352+
353+
#: ../applets/gtop/gtop.vala:124
354+
msgid "Tb"
355+
msgstr "Тбит"
356+
357+
#: ../applets/gtop/gtop.vala:125
358+
msgid "TB"
359+
msgstr "ТБ"
360+
361+
#: ../applets/gtop/gtop.vala:126
362+
msgid "TiB"
363+
msgstr "ТиБ"
364+
365+
#: ../applets/gtop/gtop.vala:131
366+
msgid "Pb"
367+
msgstr "Пбит"
368+
369+
#: ../applets/gtop/gtop.vala:132
370+
msgid "PB"
371+
msgstr "ПБ"
372+
373+
#: ../applets/gtop/gtop.vala:133
374+
msgid "PiB"
375+
msgstr "ПиБ"
376+
377+
#: ../applets/gtop/gtop.vala:225
310378
msgid "All"
311379
msgstr "Все"
312380

313-
#: ../applets/gtop/gtop.vala:212
381+
#: ../applets/gtop/gtop.vala:237
314382
msgid "Netload Applet"
315383
msgstr "Апплет загрузки сети"
316384

317-
#: ../applets/gtop/gtop.vala:219
385+
#: ../applets/gtop/gtop.vala:244
318386
msgid "Interfaces"
319387
msgstr "Интерфейсы"
320388

321-
#: ../applets/gtop/gtop.vala:226
389+
#: ../applets/gtop/gtop.vala:251
322390
msgid "Down"
323391
msgstr "Загрузка"
324392

325-
#: ../applets/gtop/gtop.vala:230
393+
#: ../applets/gtop/gtop.vala:255
326394
msgid "Up"
327395
msgstr "Отдача"
328396

329-
#: ../applets/gtop/gtop.vala:237
397+
#: ../applets/gtop/gtop.vala:262
330398
msgid "Simple LibGTop based network indicator."
331399
msgstr "Простой индикатор загрузки сети на libgtop."
332400

‎po/vala-panel-extras.pot‎

Lines changed: 76 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2015-04-21 01:10+0600\n"
11+
"POT-Creation-Date: 2015-04-21 01:25+0600\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -290,7 +290,7 @@ msgid ""
290290
"Down: %s"
291291
msgstr ""
292292

293-
#: ../applets/gtop/gtop.vala:73 ../applets/gtop/gtop.vala:236
293+
#: ../applets/gtop/gtop.vala:73 ../applets/gtop/gtop.vala:261
294294
msgid "Vala Panel Netload Applet"
295295
msgstr ""
296296

@@ -302,27 +302,95 @@ msgstr ""
302302
msgid "Reload network interfaces"
303303
msgstr ""
304304

305-
#: ../applets/gtop/gtop.vala:200
305+
#: ../applets/gtop/gtop.vala:96
306+
msgid "b"
307+
msgstr ""
308+
309+
#: ../applets/gtop/gtop.vala:97 ../applets/gtop/gtop.vala:98
310+
msgid "B"
311+
msgstr ""
312+
313+
#: ../applets/gtop/gtop.vala:103
314+
msgid "kb"
315+
msgstr ""
316+
317+
#: ../applets/gtop/gtop.vala:104
318+
msgid "kB"
319+
msgstr ""
320+
321+
#: ../applets/gtop/gtop.vala:105
322+
msgid "KiB"
323+
msgstr ""
324+
325+
#: ../applets/gtop/gtop.vala:110
326+
msgid "Mb"
327+
msgstr ""
328+
329+
#: ../applets/gtop/gtop.vala:111
330+
msgid "MB"
331+
msgstr ""
332+
333+
#: ../applets/gtop/gtop.vala:112
334+
msgid "MiB"
335+
msgstr ""
336+
337+
#: ../applets/gtop/gtop.vala:117
338+
msgid "Gb"
339+
msgstr ""
340+
341+
#: ../applets/gtop/gtop.vala:118
342+
msgid "GB"
343+
msgstr ""
344+
345+
#: ../applets/gtop/gtop.vala:119
346+
msgid "GiB"
347+
msgstr ""
348+
349+
#: ../applets/gtop/gtop.vala:124
350+
msgid "Tb"
351+
msgstr ""
352+
353+
#: ../applets/gtop/gtop.vala:125
354+
msgid "TB"
355+
msgstr ""
356+
357+
#: ../applets/gtop/gtop.vala:126
358+
msgid "TiB"
359+
msgstr ""
360+
361+
#: ../applets/gtop/gtop.vala:131
362+
msgid "Pb"
363+
msgstr ""
364+
365+
#: ../applets/gtop/gtop.vala:132
366+
msgid "PB"
367+
msgstr ""
368+
369+
#: ../applets/gtop/gtop.vala:133
370+
msgid "PiB"
371+
msgstr ""
372+
373+
#: ../applets/gtop/gtop.vala:225
306374
msgid "All"
307375
msgstr ""
308376

309-
#: ../applets/gtop/gtop.vala:212
377+
#: ../applets/gtop/gtop.vala:237
310378
msgid "Netload Applet"
311379
msgstr ""
312380

313-
#: ../applets/gtop/gtop.vala:219
381+
#: ../applets/gtop/gtop.vala:244
314382
msgid "Interfaces"
315383
msgstr ""
316384

317-
#: ../applets/gtop/gtop.vala:226
385+
#: ../applets/gtop/gtop.vala:251
318386
msgid "Down"
319387
msgstr ""
320388

321-
#: ../applets/gtop/gtop.vala:230
389+
#: ../applets/gtop/gtop.vala:255
322390
msgid "Up"
323391
msgstr ""
324392

325-
#: ../applets/gtop/gtop.vala:237
393+
#: ../applets/gtop/gtop.vala:262
326394
msgid "Simple LibGTop based network indicator."
327395
msgstr ""
328396

0 commit comments

Comments
 (0)