From a7b88b1f9d647e9ba9c28336cb06bdd03fa4db45 Mon Sep 17 00:00:00 2001 From: chrox Date: Thu, 5 Jun 2014 19:17:19 +0800 Subject: [PATCH] adjust option orders in readermenu --- frontend/apps/filemanager/filemanagermenu.lua | 10 +++++----- frontend/apps/reader/modules/readermenu.lua | 10 +++++----- l10n/templates/koreader.pot | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua index 0bd7de9ab..76132943c 100644 --- a/frontend/apps/filemanager/filemanagermenu.lua +++ b/frontend/apps/filemanager/filemanagermenu.lua @@ -81,23 +81,23 @@ function FileManagerMenu:setUpdateItemTable() ReaderFrontLight:addToMainMenu(self.tab_item_table) end + table.insert(self.tab_item_table.main, Language:getLangMenuTable()) table.insert(self.tab_item_table.main, { - text = _("Help"), + text = _("Version"), callback = function() UIManager:show(InfoMessage:new{ - text = _("Please report bugs to \nhttps://github.com/koreader/koreader/issues"), + text = io.open("git-rev", "r"):read(), }) end }) table.insert(self.tab_item_table.main, { - text = _("Version"), + text = _("Help"), callback = function() UIManager:show(InfoMessage:new{ - text = io.open("git-rev", "r"):read(), + text = _("Please report bugs to \nhttps://github.com/koreader/koreader/issues"), }) end }) - table.insert(self.tab_item_table.main, Language:getLangMenuTable()) end function FileManagerMenu:onShowMenu() diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index 6d9a04b1b..474535d36 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -71,23 +71,23 @@ function ReaderMenu:setUpdateItemTable() widget:addToMainMenu(self.tab_item_table) end + table.insert(self.tab_item_table.main, Language:getLangMenuTable()) table.insert(self.tab_item_table.main, { - text = _("Help"), + text = _("Version"), callback = function() UIManager:show(InfoMessage:new{ - text = _("Please report bugs to \nhttps://github.com/koreader/koreader/issues"), + text = io.open("git-rev", "r"):read(), }) end }) table.insert(self.tab_item_table.main, { - text = _("Version"), + text = _("Help"), callback = function() UIManager:show(InfoMessage:new{ - text = io.open("git-rev", "r"):read(), + text = _("Please report bugs to \nhttps://github.com/koreader/koreader/issues"), }) end }) - table.insert(self.tab_item_table.main, Language:getLangMenuTable()) end function ReaderMenu:onShowReaderMenu() diff --git a/l10n/templates/koreader.pot b/l10n/templates/koreader.pot index fc9a389c4..238c6513d 100644 --- a/l10n/templates/koreader.pot +++ b/l10n/templates/koreader.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n" -"POT-Creation-Date: 2014-06-05 11:05+0000\n" +"POT-Creation-Date: 2014-06-05 11:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -251,8 +251,8 @@ msgid "" "Go to Page or Location" msgstr "" -#: frontend/apps/filemanager/filemanagermenu.lua:85 -#: frontend/apps/reader/modules/readermenu.lua:75 +#: frontend/apps/filemanager/filemanagermenu.lua:94 +#: frontend/apps/reader/modules/readermenu.lua:84 msgid "" "Help" msgstr "" @@ -400,8 +400,8 @@ msgid "" "Paste" msgstr "" -#: frontend/apps/filemanager/filemanagermenu.lua:88 -#: frontend/apps/reader/modules/readermenu.lua:78 +#: frontend/apps/filemanager/filemanagermenu.lua:97 +#: frontend/apps/reader/modules/readermenu.lua:87 msgid "" "Please report bugs to \n" "https://github.com/koreader/koreader/issues" @@ -552,8 +552,8 @@ msgid "" "Underscore" msgstr "" -#: frontend/apps/filemanager/filemanagermenu.lua:93 -#: frontend/apps/reader/modules/readermenu.lua:83 +#: frontend/apps/filemanager/filemanagermenu.lua:86 +#: frontend/apps/reader/modules/readermenu.lua:76 msgid "" "Version" msgstr ""