Skip to content

Commit

Permalink
Fix about dialog, translations and bug who found EXL
Browse files Browse the repository at this point in the history
  • Loading branch information
Cactus64k committed Apr 21, 2015
1 parent 524b3cc commit fb1250d
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 102 deletions.
59 changes: 32 additions & 27 deletions intl/en_US.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: simple-fb2-reader 1.0.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2015-04-05 18:09+0300\n"
"PO-Revision-Date: 2015-04-05 18:09+0300\n"
"POT-Creation-Date: 2015-04-21 13:09+0300\n"
"PO-Revision-Date: 2015-04-21 13:09+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en_US\n"
Expand All @@ -17,38 +17,42 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: ../res/simple-fb2-reader.glade:64
#: ../res/simple-fb2-reader.glade:66
msgid "Forget all books position and endodings?"
msgstr "Forget all books position and endodings?"

#: ../res/simple-fb2-reader.glade:65
#: ../res/simple-fb2-reader.glade:67
msgid "without the possibility of restoration"
msgstr "without the possibility of restoration"

#: ../res/simple-fb2-reader.glade:128
#: ../res/simple-fb2-reader.glade:154
msgid ""
"ctrl+f\tsearch\n"
"ctrl+c\tcopy selected text\n"
"ctrl+m3 \tfont scale\n"
"\n"
"Have nice reading!\n"
"ctrl + f\t\t\t\t\tsearch\n"
"ctrl + c\t\t\t\t\tcopy selected text\n"
"ctrl + mouse-wheel \t\tfont scale\n"
"left-arrow\t\t\t\t\tlink backward\n"
"\n"
"\t\t\tHave nice reading!\n"
msgstr ""
"ctrl+f\tsearch\n"
"ctrl+c\tcopy selected text\n"
"ctrl+m3 \tfont scale\n"
"\n"
"Have nice reading!\n"
"ctrl + f\t\t\t\t\tsearch\n"
"ctrl + c\t\t\t\t\tcopy selected text\n"
"ctrl + mouse-wheel \t\tfont scale\n"
"left-arrow\t\t\t\t\tlink backward\n"
"\n"
"\t\t\tHave nice reading!\n"

#: ../res/simple-fb2-reader.glade:229
#: ../res/simple-fb2-reader.glade:244
#: ../src/callbacks/text_view_callback/popup_menu_callback.c:14
msgid "Backward"
msgstr "Backward"

#: ../res/simple-fb2-reader.glade:246
#: ../res/simple-fb2-reader.glade:261
msgid "Forward"
msgstr "Forward"

#: ../res/simple-fb2-reader.glade:287
#: ../res/simple-fb2-reader.glade:302
msgid "Case ensitive"
msgstr "Case ensitive"

Expand Down Expand Up @@ -108,41 +112,42 @@ msgstr "End read book\n"
msgid "ERROR: Failed to parsing fb2 file: %s\n"
msgstr "ERROR: Failed to parsing fb2 file: %s\n"

#: ../src/fb2/FictionBook/body/section/image_inline.c:29
#: ../src/fb2/FictionBook/body/image.c:32
#: ../src/fb2/FictionBook/body/section/image_inline.c:28
#: ../src/fb2/FictionBook/body/image.c:38
#, c-format
msgid "Image %s not found in table\n"
msgstr "Image %s not found in table\n"

#: ../src/fb2/FictionBook/body/section/image_inline.c:32
#: ../src/fb2/FictionBook/body/image.c:35
#: ../src/fb2/FictionBook/body/section/image_inline.c:31
#: ../src/fb2/FictionBook/body/image.c:41
msgid "Not local links not supported\n"
msgstr "Not local links not supported\n"

#: ../src/fb2/FictionBook/body/section.c:18 ../src/fb2/FictionBook/body.c:15
#: ../src/fb2/FictionBook/body/section/section.c:18
#: ../src/fb2/FictionBook/body/body.c:15
msgid "No Title"
msgstr "No Title"

#: ../src/fb2/FictionBook/attributes/id.c:26
#: ../src/fb2/FictionBook/attributes/id.c:22
#, c-format
msgid "ERROR: id %s already exist in table\n"
msgstr "ERROR: id %s already exist in table\n"

#: ../src/fb2/FictionBook/binary/binary.c:42
#: ../src/fb2/FictionBook/binary/binary.c:34
msgid "ERROR: no content in <image> tag\n"
msgstr "ERROR: no content in <image> tag\n"

#: ../src/fb2/FictionBook/binary/binary.c:45
#: ../src/fb2/FictionBook/binary/binary.c:37
#, c-format
msgid "ERROR: image %s already exist in table\n"
msgstr "ERROR: image %s already exist in table\n"

#: ../src/fb2/FictionBook/binary/binary.c:49
#: ../src/fb2/FictionBook/binary/binary.c:40
msgid "ERROR: no id properties in <image> tag\n"
msgstr "ERROR: no id properties in <image> tag\n"

#: ../src/fb2/FictionBook/binary/binary.c:81
#: ../src/fb2/FictionBook/binary/binary.c:97
#: ../src/fb2/FictionBook/binary/binary.c:72
#: ../src/fb2/FictionBook/binary/binary.c:88
#, c-format
msgid "ERROR: GdkPixbufLoader: %s\n"
msgstr "ERROR: GdkPixbufLoader: %s\n"
Expand Down
59 changes: 32 additions & 27 deletions intl/ru.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: simple-fb2-reader 1.0.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2015-04-05 18:09+0300\n"
"POT-Creation-Date: 2015-04-21 13:09+0300\n"
"PO-Revision-Date: 2015-03-30 18:11+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand All @@ -19,38 +19,42 @@ msgstr ""
"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"

#: ../res/simple-fb2-reader.glade:64
#: ../res/simple-fb2-reader.glade:66
msgid "Forget all books position and endodings?"
msgstr "Забыть все позиции чтения и кодировки книг?"

#: ../res/simple-fb2-reader.glade:65
#: ../res/simple-fb2-reader.glade:67
msgid "without the possibility of restoration"
msgstr "Без возможности востановления"

#: ../res/simple-fb2-reader.glade:128
#: ../res/simple-fb2-reader.glade:154
msgid ""
"ctrl+f\tsearch\n"
"ctrl+c\tcopy selected text\n"
"ctrl+m3 \tfont scale\n"
"\n"
"Have nice reading!\n"
"ctrl + f\t\t\t\t\tsearch\n"
"ctrl + c\t\t\t\t\tcopy selected text\n"
"ctrl + mouse-wheel \t\tfont scale\n"
"left-arrow\t\t\t\t\tlink backward\n"
"\n"
"\t\t\tHave nice reading!\n"
msgstr ""
"ctrl+f\tПоиск\n"
"ctrl+c\tКопирование выделенного текста\n"
"ctrl+m3 \tРазмер шрифта\n"
"\n"
"Приятного чтения!\n"
"ctrl + f\t\t\t\t\tПоиск\n"
"ctrl + c\t\t\t\t\tКопирование выделенного текста\n"
"ctrl + mouse-wheel \t\tРазмер шрифта\n"
"left-arrow\t\t\t\t\tПереход назад по ссылке\n"
"\n"
"\t\t\tПриятного чтения!\n"

#: ../res/simple-fb2-reader.glade:229
#: ../res/simple-fb2-reader.glade:244
#: ../src/callbacks/text_view_callback/popup_menu_callback.c:14
msgid "Backward"
msgstr "Назад"

#: ../res/simple-fb2-reader.glade:246
#: ../res/simple-fb2-reader.glade:261
msgid "Forward"
msgstr "Вперед"

#: ../res/simple-fb2-reader.glade:287
#: ../res/simple-fb2-reader.glade:302
msgid "Case ensitive"
msgstr "С учетом регистра"

Expand Down Expand Up @@ -110,41 +114,42 @@ msgstr "Окончание чтения книги\n"
msgid "ERROR: Failed to parsing fb2 file: %s\n"
msgstr "ОШИБКА: не удалось разобрать fb2 файл: %s\n"

#: ../src/fb2/FictionBook/body/section/image_inline.c:29
#: ../src/fb2/FictionBook/body/image.c:32
#: ../src/fb2/FictionBook/body/section/image_inline.c:28
#: ../src/fb2/FictionBook/body/image.c:38
#, c-format
msgid "Image %s not found in table\n"
msgstr "Картинка %s не найдена в таблице\n"

#: ../src/fb2/FictionBook/body/section/image_inline.c:32
#: ../src/fb2/FictionBook/body/image.c:35
#: ../src/fb2/FictionBook/body/section/image_inline.c:31
#: ../src/fb2/FictionBook/body/image.c:41
msgid "Not local links not supported\n"
msgstr "Поддерживаются только локальные ссылки\n"

#: ../src/fb2/FictionBook/body/section.c:18 ../src/fb2/FictionBook/body.c:15
#: ../src/fb2/FictionBook/body/section/section.c:18
#: ../src/fb2/FictionBook/body/body.c:15
msgid "No Title"
msgstr "Нет Заголовка"

#: ../src/fb2/FictionBook/attributes/id.c:26
#: ../src/fb2/FictionBook/attributes/id.c:22
#, c-format
msgid "ERROR: id %s already exist in table\n"
msgstr "ОШИБКА: id %s уже присутствует в таблице\n"

#: ../src/fb2/FictionBook/binary/binary.c:42
#: ../src/fb2/FictionBook/binary/binary.c:34
msgid "ERROR: no content in <image> tag\n"
msgstr "ОШИБКА: нет содержимого в теге <image>\n"

#: ../src/fb2/FictionBook/binary/binary.c:45
#: ../src/fb2/FictionBook/binary/binary.c:37
#, c-format
msgid "ERROR: image %s already exist in table\n"
msgstr "ОШИБКА: картинка %s уже содержится в таблице\n"

#: ../src/fb2/FictionBook/binary/binary.c:49
#: ../src/fb2/FictionBook/binary/binary.c:40
msgid "ERROR: no id properties in <image> tag\n"
msgstr "ОШИБКА: не найдено свойство id в теге <image>\n"

#: ../src/fb2/FictionBook/binary/binary.c:81
#: ../src/fb2/FictionBook/binary/binary.c:97
#: ../src/fb2/FictionBook/binary/binary.c:72
#: ../src/fb2/FictionBook/binary/binary.c:88
#, c-format
msgid "ERROR: GdkPixbufLoader: %s\n"
msgstr "ОШИБКА: GdkPixbufLoader: %s\n"
Expand Down Expand Up @@ -219,7 +224,7 @@ msgstr ""
"\n"

#: ../src/main.c:59
#, fuzzy, c-format
#, c-format
msgid "ERROR: Failed to load gui construct file %s\n"
msgstr "ОШИБКА: не удалось загрузить файл с каркасом gui: %s\n"

Expand Down
47 changes: 25 additions & 22 deletions intl/simple-fb2-reader.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr "Project-Id-Version: simple-fb2-reader 1.0.0\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2015-04-05 18:09+0300\n"
"POT-Creation-Date: 2015-04-21 13:09+0300\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 All @@ -16,32 +16,34 @@ msgstr "Project-Id-Version: simple-fb2-reader 1.0.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

#: ../res/simple-fb2-reader.glade:64
#: ../res/simple-fb2-reader.glade:66
msgid "Forget all books position and endodings?"
msgstr ""

#: ../res/simple-fb2-reader.glade:65
#: ../res/simple-fb2-reader.glade:67
msgid "without the possibility of restoration"
msgstr ""

#: ../res/simple-fb2-reader.glade:128
msgid "ctrl+f\tsearch\n"
"ctrl+c\tcopy selected text\n"
"ctrl+m3 \tfont scale\n"
#: ../res/simple-fb2-reader.glade:154
msgid "\n"
"ctrl + f\t\t\t\t\tsearch\n"
"ctrl + c\t\t\t\t\tcopy selected text\n"
"ctrl + mouse-wheel \t\tfont scale\n"
"left-arrow\t\t\t\t\tlink backward\n"
"\n"
"Have nice reading!\n"
"\t\t\tHave nice reading!\n"
msgstr ""

#: ../res/simple-fb2-reader.glade:229
#: ../res/simple-fb2-reader.glade:244
#: ../src/callbacks/text_view_callback/popup_menu_callback.c:14
msgid "Backward"
msgstr ""

#: ../res/simple-fb2-reader.glade:246
#: ../res/simple-fb2-reader.glade:261
msgid "Forward"
msgstr ""

#: ../res/simple-fb2-reader.glade:287
#: ../res/simple-fb2-reader.glade:302
msgid "Case ensitive"
msgstr ""

Expand Down Expand Up @@ -92,41 +94,42 @@ msgstr ""
msgid "ERROR: Failed to parsing fb2 file: %s\n"
msgstr ""

#: ../src/fb2/FictionBook/body/section/image_inline.c:29
#: ../src/fb2/FictionBook/body/image.c:32
#: ../src/fb2/FictionBook/body/section/image_inline.c:28
#: ../src/fb2/FictionBook/body/image.c:38
#, c-format
msgid "Image %s not found in table\n"
msgstr ""

#: ../src/fb2/FictionBook/body/section/image_inline.c:32
#: ../src/fb2/FictionBook/body/image.c:35
#: ../src/fb2/FictionBook/body/section/image_inline.c:31
#: ../src/fb2/FictionBook/body/image.c:41
msgid "Not local links not supported\n"
msgstr ""

#: ../src/fb2/FictionBook/body/section.c:18 ../src/fb2/FictionBook/body.c:15
#: ../src/fb2/FictionBook/body/section/section.c:18
#: ../src/fb2/FictionBook/body/body.c:15
msgid "No Title"
msgstr ""

#: ../src/fb2/FictionBook/attributes/id.c:26
#: ../src/fb2/FictionBook/attributes/id.c:22
#, c-format
msgid "ERROR: id %s already exist in table\n"
msgstr ""

#: ../src/fb2/FictionBook/binary/binary.c:42
#: ../src/fb2/FictionBook/binary/binary.c:34
msgid "ERROR: no content in <image> tag\n"
msgstr ""

#: ../src/fb2/FictionBook/binary/binary.c:45
#: ../src/fb2/FictionBook/binary/binary.c:37
#, c-format
msgid "ERROR: image %s already exist in table\n"
msgstr ""

#: ../src/fb2/FictionBook/binary/binary.c:49
#: ../src/fb2/FictionBook/binary/binary.c:40
msgid "ERROR: no id properties in <image> tag\n"
msgstr ""

#: ../src/fb2/FictionBook/binary/binary.c:81
#: ../src/fb2/FictionBook/binary/binary.c:97
#: ../src/fb2/FictionBook/binary/binary.c:72
#: ../src/fb2/FictionBook/binary/binary.c:88
#, c-format
msgid "ERROR: GdkPixbufLoader: %s\n"
msgstr ""
Expand Down
26 changes: 19 additions & 7 deletions res/simple-fb2-reader.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,6 @@
<property name="transient_for">main_wnd</property>
<property name="program_name">Simple FB2 Reader</property>
<property name="version">1.0.0</property>
<property name="comments" translatable="yes">&lt;ctrl&gt; + &lt;f&gt; search
&lt;ctrl&gt; + &lt;c&gt; copy selected text
&lt;ctrl&gt; + &lt;mouse-wheel&gt; font scale
&lt;left-arrow&gt; link backward

Have nice reading!
</property>
<property name="website">https://github.com/Cactus64k/simple-fb2-reader</property>
<property name="authors">Cactus &lt;[email protected]&gt;</property>
<property name="logo_icon_name">simple-fb2-reader</property>
Expand All @@ -154,6 +147,25 @@ Have nice reading!
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="about_dialog_hotkeys_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">
ctrl + f search
ctrl + c copy selected text
ctrl + mouse-wheel font scale
left-arrow link backward

Have nice reading!
</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
Expand Down
Loading

0 comments on commit fb1250d

Please sign in to comment.