[hitori] Release version 3.22.4

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [hitori] Release version 3.22.4
Date: Mon, 2 Oct 2017 08:17:36 +0000 (UTC)
commit 4515af09f31b09e4d16b8b11b7b660d2f81bb351
Author: Philip Withnall <withnall endlessm com>
Date:   Mon Oct 2 09:17:19 2017 +0100

    Release version 3.22.4
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 NEWS              |   12 +++
 configure.ac      |    2 +-
 po/an.po          |   86 ++++++++++----------
 po/ar.po          |   93 +++++++++++-----------
 po/as.po          |  115 +++++++++++++--------------
 po/be.po          |   21 ++---
 po/bg.po          |   11 +--
 po/bs.po          |   96 +++++++++++------------
 po/ca.po          |   11 +--
 po/ca valencia po |  106 ++++++++++++-------------
 po/cs.po          |   23 ++----
 po/da.po          |   24 ++----
 po/de.po          |   23 ++----
 po/el.po          |   21 ++---
 po/en_GB.po       |   93 +++++++++++-----------
 po/eo.po          |   94 +++++++++++-----------
 po/es.po          |   23 ++----
 po/eu.po          |   23 ++----
 po/fa.po          |   13 +---
 po/fi.po          |   23 ++----
 po/fr.po          |   11 +--
 po/fur.po         |   23 ++----
 po/gl.po          |   21 ++---
 po/he.po          |   93 +++++++++++-----------
 po/hu.po          |   23 ++----
 po/id.po          |   24 ++----
 po/it.po          |   23 ++----
 po/ko.po          |   11 +--
 po/lt.po          |   23 ++----
 po/lv.po          |   28 +++----
 po/ml.po          |   19 ++---
 po/nb.po          |   22 ++---
 po/ne.po          |  105 +++++++++++++------------
 po/nl.po          |   11 +--
 po/oc.po          |   88 ++++++++++-----------
 po/pa.po          |  226 +++++++++++++++++++++++++++++++++-------------------
 po/pl.po          |   11 +--
 po/pt.po          |   23 ++----
 po/pt_BR.po       |   23 ++----
 po/ro.po          |  229 ++++++++++++++++++++++++++++++++--------------------
 po/ru.po          |   21 ++---
 po/sk.po          |   23 ++----
 po/sl.po          |   25 ++----
 po/sr.po          |   27 +++----
 po/sr latin po    |   39 ++++------
 po/sv.po          |   23 ++----
 po/tr.po          |   11 +--
 po/uk.po          |   27 +++----
 po/vi.po          |  212 ++++++++++++++++++++++++++++++++-----------------
 po/zh_CN.po       |   23 ++----
 po/zh_HK.po       |  112 +++++++++++++-------------
 po/zh_TW.po       |   21 ++---
 52 files changed, 1218 insertions(+), 1296 deletions(-)
---
diff --git a/NEWS b/NEWS
index 322870a..adcef83 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,17 @@
 Major new features in version...
 
+3.22.4:
+* Translations:
+** bg (Alexander Shopov)
+** ca (Jordi Mas)
+** fa (Arash Mousavi)
+** fr (Alain Lojewski)
+** ko (Junyoul Lim)
+** ml (Ani Peter)
+** nl (Nathan Follens)
+** pl (Piotr DrÄ…g)
+** tr (Muhammet Kara)
+
 3.22.3:
 * Minor rendering improvements (bug #732776)
 * Add flatpak manifests for nightly builds
diff --git a/configure.ac b/configure.ac
index dc055a8..d884d54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Hitori],[3.22.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=hitori],[hitori],[https://wiki.gnome.org/Apps/Hitori])
+AC_INIT([Hitori],[3.22.4],[https://bugzilla.gnome.org/enter_bug.cgi?product=hitori],[hitori],[https://wiki.gnome.org/Apps/Hitori])
 AX_IS_RELEASE([git-directory])
 
 AM_INIT_AUTOMAKE([check-news dist-xz no-dist-gzip subdir-objects])
diff --git a/po/an.po b/po/an.po
index eaa3a5d..2388a4c 100644
--- a/po/an.po
+++ b/po/an.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=hitori&";
-"keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2015-05-03 21:53+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2015-05-03 23:03+0200\n"
 "Last-Translator: Daniel <entaltoaragon gmail com>\n"
 "Language-Team: Aragonese <softaragones googlegroups com>\n"
@@ -20,31 +20,34 @@ msgstr ""
 "X-Generator: Pootle 2.5.1.1\n"
 "X-POOTLE-MTIME: 1430690597.000000\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:1 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
 #. Translators: the brief summary of the application as it appears in a software center.
-#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "Chugar a o chuego de puzle Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
-#: ../data/hitori.desktop.in.h:4
+#: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzle;chuego;lochica;reixeta;tablero;"
 
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "GNOME Hitori"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:6
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "Hitori ye un chuego de lochica semellant a o Sudoku."
 
-#: ../data/hitori.appdata.xml.in.h:7
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
@@ -56,125 +59,120 @@ msgstr ""
 "grandarias de tablero y puede colocar marcadors en as celdas ta aduyar-le a "
 "trobar a soluciÃ³n. Si tiene problemas, o chuego puede dar-le una pista."
 
-#: ../data/hitori-menus.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "Chuego _nuevo"
 
-#: ../data/hitori-menus.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "_Grandaria d'o tablero"
 
-#: ../data/hitori-menus.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori-menus.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori-menus.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori-menus.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori-menus.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori-menus.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori-menus.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "Ad_uya"
 
-#: ../data/hitori-menus.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "_Arredol de"
 
-#: ../data/hitori-menus.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "Desfer o zaguer movimiento"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "Refer un movimiento"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "Obtener una pista ta o siguient movimiento"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "Grandaria d'o tablero"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "A grandaria d'o tablero, en caixetas."
 
-#: ../src/interface.c:630
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "No se podiÃ³ amostrar o conteniu de la aduya"
 
-#: ../src/interface.c:654
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:655
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Un puzle de lochica diseÃ±ado orichinalment por Nikoli"
 
-#: ../src/interface.c:657
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Daniel Martinez <entaltoaragon gmail com>, 2015"
 
-#: ../src/interface.c:661
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Pachina web d'Hitori"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "Activar modo de depuraciÃ³n"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Alimentar a cheneraciÃ³n de tablers"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Chugar una partida d'Hitori"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "No se podioron analisar as opcions d'a linia de comandos: %s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "Quiere aturar a partida actual?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "Seguir _chugando"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "Ha ganau con un tiempo de %02u:%02u!"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "Chugar _unatra vegada"
diff --git a/po/ar.po b/po/ar.po
index b58dbe5..5eba241 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=hitori&keywords=I18N+L10N&component=General\n";
-"POT-Creation-Date: 2015-04-17 10:16+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2015-08-27 16:07+0100\n"
 "Last-Translator: Abderrahim Kitouni <a kitouni gmail com>\n"
 "Language-Team: Arabic <doc arabeyes org>\n"
@@ -19,162 +20,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && 
n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:1 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Ù‡ÙŠØªÙˆØ±ÙŠ"
 
 #. Translators: the brief summary of the application as it appears in a software center.
-#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "Ø§Ù„Ø¹Ø¨ Ù„Ø¹Ø¨Ø© Ø£ØØ¬ÙŠØ© Ù‡ÙŠØªÙˆØ±ÙŠ"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
-#: ../data/hitori.desktop.in.h:4
+#: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "Ø£ØØ¬ÙŠØ©;Ù„Ø¹Ø¨Ø©;Ù…Ù†Ø·Ù‚;Ø´Ø¨ÙƒØ©;puzzle;game;logic;grid;"
 
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "Ø¬Ù†ÙˆÙ… Ù‡ÙŠØªÙˆØ±ÙŠ"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:6
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "Ù‡ÙŠØªÙˆØ±ÙŠ Ù„Ø¹Ø¨Ø© Ù…Ù†Ø·Ù‚ Ø´Ø¨ÙŠÙ‡Ø© Ø¨Ø§Ù„Ù„Ù‘Ø¹Ø¨Ø© Ø§Ù„Ø´Ù‘Ø¹Ø¨ÙŠÙ‘Ø© Ø³ÙˆØ¯ÙˆÙƒÙˆ."
 
-#: ../data/hitori.appdata.xml.in.h:7
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
 "board are supported, and you can place markers on cells to help work out the "
 "solution. If you get stuck, the game can give you a hint."
-msgstr "Ø³ØªÙ„Ø¹Ø¨ Ø¶Ø¯Ù‘ Ø§Ù„ÙˆÙ‚Øª Ù…ØØ§ÙˆÙ„Ø§ Ø¥Ø²Ø§Ù„Ø© ÙƒÙ„Ù‘ Ø§Ù„Ø£Ø±Ù‚Ø§Ù… Ø§Ù„Ù…ØªÙƒØ±Ù‘Ø±Ø© ÙÙŠ ÙƒÙ„Ù‘ ØµÙÙ‘ ÙˆØ¹Ù…ÙˆØ¯ Ø¨Ø£Ø³Ø±Ø¹ Ù…Ø§ ÙŠÙ…ÙƒÙ†. Ø¹Ø¯Ù‘Ø© Ù…Ù‚Ø§Ø³Ø§Øª Ù„Ù„ÙˆØØ© 
Ù…Ø¯Ø¹ÙˆÙ…Ø©ØŒ ÙˆÙŠÙ…ÙƒÙ†Ùƒ ÙˆØ¶Ø¹ Ø§Ù„Ø¹Ù„Ø§Ù…Ø§Øª Ø¹Ù„Ù‰ Ø§Ù„Ø®Ù„Ø§ÙŠØ§ Ù„Ù…Ø³Ø§Ø¹Ø¯ØªÙƒ ÙÙŠ ÙÙƒÙ‘ Ø§Ù„Ø£ØØ¬ÙŠØ©. Ø¥Ù† Ø¹Ù„Ù‚Øª ÙŠÙ…ÙƒÙ† Ù„Ù„Ù‘Ø¹Ø¨Ø© Ø¥Ø¹Ø·Ø§Ø¦Ùƒ ØªÙ„Ù…ÙŠØØ§ Ù…Ø§."
+msgstr ""
+"Ø³ØªÙ„Ø¹Ø¨ Ø¶Ø¯Ù‘ Ø§Ù„ÙˆÙ‚Øª Ù…ØØ§ÙˆÙ„Ø§ Ø¥Ø²Ø§Ù„Ø© ÙƒÙ„Ù‘ Ø§Ù„Ø£Ø±Ù‚Ø§Ù… Ø§Ù„Ù…ØªÙƒØ±Ù‘Ø±Ø© ÙÙŠ ÙƒÙ„Ù‘ ØµÙÙ‘ ÙˆØ¹Ù…ÙˆØ¯ Ø¨Ø£Ø³Ø±Ø¹ Ù…Ø§ "
+"ÙŠÙ…ÙƒÙ†. Ø¹Ø¯Ù‘Ø© Ù…Ù‚Ø§Ø³Ø§Øª Ù„Ù„ÙˆØØ© Ù…Ø¯Ø¹ÙˆÙ…Ø©ØŒ ÙˆÙŠÙ…ÙƒÙ†Ùƒ ÙˆØ¶Ø¹ Ø§Ù„Ø¹Ù„Ø§Ù…Ø§Øª Ø¹Ù„Ù‰ Ø§Ù„Ø®Ù„Ø§ÙŠØ§ Ù„Ù…Ø³Ø§Ø¹Ø¯ØªÙƒ ÙÙŠ "
+"ÙÙƒÙ‘ Ø§Ù„Ø£ØØ¬ÙŠØ©. Ø¥Ù† Ø¹Ù„Ù‚Øª ÙŠÙ…ÙƒÙ† Ù„Ù„Ù‘Ø¹Ø¨Ø© Ø¥Ø¹Ø·Ø§Ø¦Ùƒ ØªÙ„Ù…ÙŠØØ§ Ù…Ø§."
 
-#: ../data/hitori-menus.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "Ù„Ø¹Ø¨Ø© _Ø¬Ø¯ÙŠØ¯Ø©"
 
-#: ../data/hitori-menus.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "Ù…_Ù‚Ø§Ø³ Ø§Ù„Ù„ÙˆØØ©"
 
-#: ../data/hitori-menus.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori-menus.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori-menus.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori-menus.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori-menus.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori-menus.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori-menus.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "Ù…_Ø³Ø§Ø¹Ø¯Ø©"
 
-#: ../data/hitori-menus.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "_Ø¹Ù†"
 
-#: ../data/hitori-menus.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "Ø£_Ù†Ù‡Ù"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "ØªØ±Ø§Ø¬Ø¹ Ø¹Ù† Ø¢Ø®Ø± ØØ±ÙƒØ©"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "Ø£Ø¹Ø¯ ØØ±ÙƒØ©"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "Ø§ØØµÙ„ Ø¹Ù„Ù‰ Ù…Ø³Ø§Ø¹Ø¯Ø© Ù„Ù„ØØ±ÙƒØ© Ø§Ù„ØªÙ‘Ø§Ù„ÙŠØ©"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "Ù…Ù‚Ø§Ø³ Ø§Ù„Ù„Ù‘ÙˆØØ©"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "Ù…Ù‚Ø§Ø³ Ø§Ù„Ù„Ù‘ÙˆØØ© (Ø¨Ø§Ù„Ø®Ù„Ø§ÙŠØ§)."
 
-#: ../src/interface.c:630
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "ØªØ¹Ø°Ù‘Ø± Ø¹Ø±Ø¶ Ù…ØØªÙˆÙŠØ§Øª Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©"
 
-#: ../src/interface.c:654
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "ØÙ‚ÙˆÙ‚ Ø§Ù„Ù†Ù‘Ø³Ø® Â© 2007â€“2010 Ù„ÙÙ€ Philip Withnall"
 
-#: ../src/interface.c:655
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Ø£ØØ¬ÙŠØ© Ù…Ù†Ø·Ù‚ Ù…ØµÙ…Ù‘Ù…Ù‡Ø§ Ø§Ù„Ø£Ø³Ø§Ø³ÙŠÙ‘ Ù‡Ùˆ Ù†ÙŠÙƒÙˆÙ„ÙŠ"
 
-#: ../src/interface.c:657
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "ÙØ±ÙŠÙ‚ Ø¹Ø±Ø¨Ø¢ÙŠØ² Ù„Ù„ØªØ±Ø¬Ù…Ø© http://www.arabeyes.org:\n";
 "ØµÙØ§ Ø§Ù„ÙÙ„ÙŠØ¬\t<safa1996alfulaij gmail com>\n"
 "yassine birig\t<birigy gmail com>"
 
-#: ../src/interface.c:661
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Ù…ÙˆÙ‚Ø¹ ÙˆÙØ¨ Ù‡ÙŠØªÙˆØ±ÙŠ"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "Ù…ÙƒÙ‘Ù† ÙˆØ¶Ø¹ Ø§Ù„ØªÙ†Ù‚ÙŠØ"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "ØºØ°Ù‘ Ù…ÙˆÙ„Ø¯ Ø§Ù„Ù„ÙˆØØ©"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Ø§Ù„Ø¹Ø¨ Ù„Ø¹Ø¨Ø© Ù‡ÙŠØªÙˆØ±ÙŠ"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "ØªØ¹Ø°Ù‘Ø± ØªØÙ„ÙŠÙ„ Ø®ÙŠØ§Ø±Ø§Øª Ø³Ø·Ø± Ø§Ù„Ø£ÙˆØ§Ù…Ø±: %s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "Ø£ØªØ±ÙŠØ¯ Ø¥ÙŠÙ‚Ø§Ù Ø§Ù„Ù„Ù‘Ø¹Ø¨Ø© Ø§Ù„ØØ§Ù„ÙŠØ©ØŸ"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "ØªØ§Ø¨Ø¹ Ø§Ù„Ù„Ù‘Ø¹_Ø¨"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "Ù„Ù‚Ø¯ Ø±Ø¨ØØª ÙÙŠ Ø²Ù…Ù† %02u:%02u!"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "Ø§Ù„Ø¹Ø¨ Ù…_Ø¬Ø¯Ù‘Ø¯Ù‹Ø§"
diff --git a/po/as.po b/po/as.po
index a3c5e9d..180e8ba 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2014-08-27 09:20+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2014-08-27 22:10+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: Assamese <kde-i18n-doc kde org>\n"
@@ -19,170 +19,165 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:12 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
-#: ../data/hitori.desktop.in.h:2
+#. Translators: the brief summary of the application as it appears in a software center.
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "Hitori à¦¸à¦¾à¦à¦¥à§° à¦–à§‡à¦² à¦–à§‡à¦²à¦•"
 
+#: data/org.gnome.Hitori.desktop.in:6
+msgid "puzzle;game;logic;grid;"
+msgstr ""
+
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "GNOME Hitori"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "Hitori à¦œà¦¨à¦ªà§à§°à¦¿à§Ÿ à¦–à§‡à¦² Sudoku à§° à¦¸à§ˆà¦¤à§‡ à¦¸à¦¦à§ƒà¦¶ à¦à¦Ÿà¦¾ à¦¯à§Œà¦•à§à¦¤à¦¿à¦• à¦–à§‡à¦²à¥¤"
 
-#: ../data/hitori.appdata.xml.in.h:5
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
 "board are supported, and you can place markers on cells to help work out the "
 "solution. If you get stuck, the game can give you a hint."
 msgstr ""
-"à¦†à¦ªà§à¦¨à¦¿ à¦¸à¦®à§Ÿà§° à¦¬à¦¿à¦ªà¦•à§à¦·à§‡ à¦à¦‡ à¦–à§‡à¦²à¦–à¦¨ à¦–à§‡à¦²à§‡, à¦¯'à¦¤ à¦†à¦ªà§à¦¨à¦¿ à¦†à¦Ÿà¦¾à¦‡à¦¤à¦•à§ˆ à¦•à¦® à¦¸à¦®à§Ÿà¦¤ à¦ªà§à§°à¦¤à¦¿ à¦¶à¦¾à§°à§€ à¦†à§°à§ "
-"à¦¸à§à¦¤à¦®à§à¦à¦¤ "
-"à¦ªà§à§°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿ à¦¸à¦‚à¦–à§à¦¯à¦¾ à¦†à¦¤à§°à§‹à§±à¦¾à§° à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦•à§°à§‡à¥¤ à¦–à§‡à¦² à¦¬à§°à§à¦¡à§° à¦•à§‡à¦‡à¦¬à¦¾à¦Ÿà¦¾à¦“ à¦†à¦•à¦¾à§° à¦¸à¦®à§°à§à¦¥à¦¿à¦¤, à¦†à§°à§ "
-"à¦†à¦ªà§à¦¨à¦¿ à¦¸à¦®à¦¾à¦§à¦¾à¦¨à§° "
-"à¦¬à¦¾à¦¬à§‡ à¦•à§‹à¦·à¦¬à§‹à§°à¦¤ à¦šà¦¿à¦¹à§à¦¨à¦• à¦¦à¦¿à¦¬ à¦ªà¦¾à§°à§‡à¥¤ à¦¯à¦¦à¦¿ à¦†à¦ªà§à¦¨à¦¿ à¦«à¦šà¦¿ à¦¯à¦¾à¦¬, à¦–à§‡à¦²à§‡ à¦†à¦ªà§‹à¦¨à¦¾à¦• à¦¸à¦¹à¦¾à§Ÿ à¦•à§°à¦¿à¦¬ à¦ªà¦¾à§°à§‡à¥¤"
+"à¦†à¦ªà§à¦¨à¦¿ à¦¸à¦®à§Ÿà§° à¦¬à¦¿à¦ªà¦•à§à¦·à§‡ à¦à¦‡ à¦–à§‡à¦²à¦–à¦¨ à¦–à§‡à¦²à§‡, à¦¯'à¦¤ à¦†à¦ªà§à¦¨à¦¿ à¦†à¦Ÿà¦¾à¦‡à¦¤à¦•à§ˆ à¦•à¦® à¦¸à¦®à§Ÿà¦¤ à¦ªà§à§°à¦¤à¦¿ à¦¶à¦¾à§°à§€ à¦†à§°à§ à¦¸à§à¦¤à¦®à§à¦à¦¤ "
+"à¦ªà§à§°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿ à¦¸à¦‚à¦–à§à¦¯à¦¾ à¦†à¦¤à§°à§‹à§±à¦¾à§° à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦•à§°à§‡à¥¤ à¦–à§‡à¦² à¦¬à§°à§à¦¡à§° à¦•à§‡à¦‡à¦¬à¦¾à¦Ÿà¦¾à¦“ à¦†à¦•à¦¾à§° à¦¸à¦®à§°à§à¦¥à¦¿à¦¤, à¦†à§°à§ à¦†à¦ªà§à¦¨à¦¿ "
+"à¦¸à¦®à¦¾à¦§à¦¾à¦¨à§° à¦¬à¦¾à¦¬à§‡ à¦•à§‹à¦·à¦¬à§‹à§°à¦¤ à¦šà¦¿à¦¹à§à¦¨à¦• à¦¦à¦¿à¦¬ à¦ªà¦¾à§°à§‡à¥¤ à¦¯à¦¦à¦¿ à¦†à¦ªà§à¦¨à¦¿ à¦«à¦šà¦¿ à¦¯à¦¾à¦¬, à¦–à§‡à¦²à§‡ à¦†à¦ªà§‹à¦¨à¦¾à¦• à¦¸à¦¹à¦¾à§Ÿ à¦•à§°à¦¿à¦¬ "
+"à¦ªà¦¾à§°à§‡à¥¤"
 
-#: ../data/hitori.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "à¦¨à¦¤à§à¦¨ à¦–à§‡à¦² (_N)"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "à¦¬à§°à§à¦¡à§° à¦†à¦•à¦¾à§° (_S)"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "à¦¸à¦¹à¦¾à§Ÿ (_H)"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "à¦¬à¦¿à¦·à§Ÿà§‡ (_A)"
 
-#: ../data/hitori.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "à¦ªà§à§°à¦¸à§à¦¥à¦¾à¦¨ à¦•à§°à¦• (_Q)"
 
-#: ../data/hitori.ui.h:13
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "à¦†à¦ªà§‹à¦¨à¦¾à§° à¦¸à§°à§à¦¬à¦¶à§‡à¦· à¦ªà¦¾à¦² à¦¬à¦¾à¦¤à¦¿à¦² à¦•à§°à¦•"
 
-#: ../data/hitori.ui.h:14
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "à¦à¦Ÿà¦¾ à¦ªà¦¾à¦² à¦ªà§à¦¨à§° à¦•à§°à¦•"
 
-#: ../data/hitori.ui.h:15
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "à¦†à¦ªà§‹à¦¨à¦¾à§° à¦ªà§°à§±à§°à§à¦¤à§€ à¦ªà¦¾à¦²à§° à¦¬à¦¾à¦¬à§‡ à¦à¦Ÿà¦¾ à¦‡à¦‚à¦—à¦¿à¦¤ à¦ªà¦¾à¦“à¦•"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "à¦¬à§°à§à¦¡à§° à¦†à¦•à¦¾à§°"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "à¦¬à§°à§à¦¡à§° à¦†à¦•à¦¾à§°, à¦•à§‹à¦·à¦¬à§‹à§°à¦¤à¥¤"
 
-#: ../src/interface.c:87
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "UI à¦«à¦¾à¦‡à¦² â€œ%sâ€ à¦²'à¦¡ à¦•à§°à¦¿à¦¬ à¦ªà§°à¦¾ à¦¨à¦—à¦²"
-
-#: ../src/interface.c:661
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "à¦¸à¦¹à¦¾à§Ÿ à¦¸à¦®à¦²à¦¸à¦®à§‚à¦¹à¦• à¦ªà§à§°à¦¦à¦¾à¦¨ à¦•à§°à¦¿à¦¬ à¦ªà§°à¦¾ à¦¨à¦—à¦²"
 
-#: ../src/interface.c:685
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "à¦¸à§à¦¬à¦¤à§à¦¬à¦¾à¦§à¦¿à¦•à¦¾à§° Â© à§¨à§¦à§¦à§-à§¨à§¦à§§à§¦ à¦«à¦¿à¦²à¦¿à¦ª à§±à¦¿à¦¥à¦¨à¦¾à¦²"
 
-#: ../src/interface.c:686
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Nikoli à¦¦à§à¦¬à¦¾à§°à¦¾ à¦ªà§à§°à¦•à§ƒà¦¤à¦¤à§‡ à§°à§‚à¦ªà¦¾à¦™à§à¦•à¦¿à¦¤ à¦à¦Ÿà¦¾ à¦¯à§Œà¦•à§à¦¤à¦¿à¦• à¦¸à¦¾à¦à¦¥à§°"
 
-#: ../src/interface.c:688
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "à¦¨à§€à¦²à¦®à¦¦à§à¦¯à§à¦¤à¦¿ à¦—à§‹à¦¸à§à¦¬à¦¾à¦®à§€ (ngoswami redhat com)"
 
-#: ../src/interface.c:692
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori à§±à§‡à¦¬à¦›à¦¾à¦‡à¦Ÿ"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "à¦¡à¦¿à¦¬à¦¾à¦— à¦…à§±à¦¸à§à¦¥à¦¾ à¦¸à¦¾à¦®à§°à§à¦¥à¦¬à¦¾à¦¨ à¦•à§°à¦•"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "à¦¬à§°à§à¦¡ à¦¸à§ƒà¦œà¦¨à§° à¦¸à¦®à§Ÿà¦¤ à¦à¦Ÿà¦¾ à¦¨à¦®à§à¦¬à§°à¦• à¦›à§€à¦¡ à§°à§‚à¦ªà§‡ à¦¬à¦¾à¦›à¦•"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Hitori à§° à¦à¦Ÿà¦¾ à¦–à§‡à¦² à¦–à§‡à¦²à¦•"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "à¦•à¦®à¦¾à¦¨à§à¦¡ à¦²à¦¾à¦‡à¦¨ à¦¬à¦¿à¦•à¦²à§à¦ªà¦¸à¦®à§‚à¦¹à¦• à¦¬à¦¿à¦¶à§à¦²à§‡à¦·à¦£ à¦•à§°à¦¿à¦¬ à¦ªà§°à¦¾ à¦¨à¦—à¦²: %s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "à¦†à¦ªà§à¦¨à¦¿ à¦¬à§°à§à¦¤à¦®à¦¾à¦¨ à¦–à§‡à¦² à¦¬à¦¨à§à¦§ à¦•à§°à¦¿à¦¬ à¦–à§‹à¦œà§‡ à¦¨à§‡?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "à¦–à§‡à¦²à¦¿ à¦¥à¦¾à¦•à¦• (_P)"
 
-#. Translators: this is the format for the timer label. The first parameter is the number of minutes which 
have
-#. * elapsed since the start of the game; the second parameter is the number of seconds. In between is the 
ratio
-#. * character and a LTR mark to force minutes on the left in RTL locales. You can probably leave this 
unchanged.
-#: ../src/main.c:382
-#, c-format
-msgid "%02uâˆ¶â€Ž%02u"
-msgstr "%02uâˆ¶â€Ž%02u"
-
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "à¦†à¦ªà§à¦¨à¦¿ %02u:%02u à¦¸à¦®à§Ÿà¦¤ à¦–à§‡à¦²à¦–à¦¨ à¦œà¦¿à¦•à¦¿à¦›à§‡!"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "à¦†à¦•à§Œ à¦–à§‡à¦²à¦• (_P)"
 
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "UI à¦«à¦¾à¦‡à¦² â€œ%sâ€ à¦²'à¦¡ à¦•à§°à¦¿à¦¬ à¦ªà§°à¦¾ à¦¨à¦—à¦²"
+
+#~ msgid "%02uâˆ¶â€Ž%02u"
+#~ msgstr "%02uâˆ¶â€Ž%02u"
diff --git a/po/be.po b/po/be.po
index 23bd718..6196baf 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-04-25 08:11+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-04-25 11:32+0300\n"
 "Last-Translator: Jim <vlma tut by>, 2017\n"
 "Language-Team: Belarusian <i18n-bel-gnome googlegroups com>\n"
@@ -29,12 +29,10 @@ msgstr "Ð“Ñ–ÑÑ‚Ð¾Ñ€Ñ‹Ñ"
 msgid "Play the Hitori puzzle game"
 msgstr "Ð“ÑƒÐ»ÑÑ†ÑŒ Ñƒ Ð³ÑƒÐ»ÑŒÐ½ÑŽ ÐŸÐ°Ð·Ð»Ñ‹ Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "Ð¿Ð°Ð·Ð»;Ð³ÑƒÐ»ÑŒÐ½Ñ;Ð»Ð¾Ð³Ñ–ÐºÐ°;ÑÐµÑ‚ÐºÐ°;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,23 +124,23 @@ msgstr "ÐŸÐ°Ð¼ÐµÑ€ Ð¿Ð¾Ð»Ñ"
 msgid "The size of the board, in cells."
 msgstr "ÐŸÐ°Ð¼ÐµÑ€ Ð¿Ð¾Ð»Ñ, Ñƒ ÐºÐ»ÐµÑ‚ÐºÐ°Ñ…."
 
-#: src/interface.c:642
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Ð”Ð°Ð¿Ð°Ð¼Ð¾Ð³Ð° Ð½ÐµÐ´Ð°ÑÑ‚ÑƒÐ¿Ð½Ð°Ñ"
 
-#: src/interface.c:666
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Ð£ÑÐµ Ð¿Ñ€Ð°Ð²Ñ‹ Ð°Ð±Ð°Ñ€Ð¾Ð½ÐµÐ½Ñ‹Ñ Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:667
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Ð›ÑÐ³Ñ–Ñ‡Ð½Ñ‹ Ð¿Ð°Ð·Ð» ÑÑ‚Ð²Ð¾Ñ€Ð°Ð½Ñ‹ Nikoli"
 
-#: src/interface.c:669
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Jim <vlma tut by>"
 
-#: src/interface.c:673
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Ð¥Ð°Ñ‚Ð½ÑÑ ÑÑ‚Ð°Ñ€Ð¾Ð½ÐºÐ° Hitori"
 
@@ -150,17 +148,14 @@ msgstr "Ð¥Ð°Ñ‚Ð½ÑÑ ÑÑ‚Ð°Ñ€Ð¾Ð½ÐºÐ° Hitori"
 msgid "Enable debug mode"
 msgstr "Ð£ÐºÐ»ÑŽÑ‡Ñ‹Ñ†ÑŒ Ñ€ÑÐ¶Ñ‹Ð¼ Ð½Ð°Ð»Ð°Ð´ÐºÑ–"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "ÐŸÐ°Ñ‡Ð°Ñ†ÑŒ ÑÑ‚Ð²Ð°Ñ€ÑÐ½Ð½Ðµ Ð¿Ð¾Ð»Ñ"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Ð“ÑƒÐ»ÑÑ†ÑŒ Ñƒ Ð³ÑƒÐ»ÑŒÐ½ÑŽ Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -174,8 +169,6 @@ msgstr "Ð’Ñ‹ Ð¶Ð°Ð´Ð°ÐµÑ†Ðµ ÑÐ¿Ñ‹Ð½Ñ–Ñ†ÑŒ Ð±ÑÐ³ÑƒÑ‡ÑƒÑŽ Ð³ÑƒÐ»ÑŒÐ½ÑŽ?"
 msgid "Keep _Playing"
 msgstr "ÐŸÑ€Ð°Ñ†ÑÐ³Ð²Ð°Ñ†ÑŒ _Ð³ÑƒÐ»ÑŒÐ½ÑŽ"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/bg.po b/po/bg.po
index ef46c55..9700403 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-09-02 12:57+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-09-03 10:12+0300\n"
 "Last-Translator:  Alexander Shopov <ash kambanaria org>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
@@ -27,14 +27,12 @@ msgstr "Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 msgid "Play the Hitori puzzle game"
 msgstr "ÐÐ±ÑÑ‚Ñ€Ð°ÐºÑ‚Ð½Ð° Ð³Ð»Ð°Ð²Ð¾Ð±Ð»ÑŠÑÐºÐ°Ð½Ð¸Ñ†Ð° Ñ Ñ‡Ð¸ÑÐ»Ð°"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr ""
 "Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ°;Ð·Ð°Ð³Ð°Ð´ÐºÐ°;Ð³Ð»Ð°Ð²Ð¾Ð±Ð»ÑŠÑÐºÐ°Ð½Ð¸Ñ†Ð°;Ð¿ÑŠÐ·ÐµÐ»;Ñ†Ð¸Ñ„Ñ€Ð¸;Ñ‡Ð¸ÑÐ»Ð°;Ð´ÑŠÑÐºÐ°;puzzle;game;logic;"
 "grid;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -156,17 +154,14 @@ msgstr "Ð¡Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° Ð½Ð° Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 msgid "Enable debug mode"
 msgstr "Ð˜Ð·Ñ‡Ð¸ÑÑ‚Ð²Ð°Ð½Ðµ Ð½Ð° Ð³Ñ€ÐµÑˆÐºÐ¸"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€ Ð·Ð° Ð¿Ð¾Ð·Ð¸Ñ†Ð¸ÑÑ‚Ð° Ð½Ð° Ð´ÑŠÑÐºÐ°Ñ‚Ð°"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "â€” Ð¸Ð³Ñ€Ð°Ñ‚Ð° Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -180,8 +175,6 @@ msgstr "Ð˜ÑÐºÐ°Ñ‚Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ñ€Ð¸ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ‚Ð° Ð¸Ð³Ñ€Ð°?"
 msgid "Keep _Playing"
 msgstr "_ÐŸÑ€Ð¾Ð´ÑŠÐ»Ð¶Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¸Ð³Ñ€Ð°Ñ‚Ð°"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/bs.po b/po/bs.po
index 6c1b923..6e99b28 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2015-02-26 22:39+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2015-02-27 10:26+0100\n"
 "Last-Translator: Samir Ribic <samir ribic etf unsa ba>\n"
 "Language-Team: Bosnian <bs li org>\n"
@@ -19,31 +19,34 @@ msgstr ""
 "X-Generator: Launchpad (build 17341)\n"
 "X-Launchpad-Export-Date: 2015-02-15 06:11+0000\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:12 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
 #. Translators: the brief summary of the application as it appears in a software center.
-#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "Igraj Hitori logiÄku igru"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
-#: ../data/hitori.desktop.in.h:4
+#: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;game;logic;grid;igra;zagonetka;logika;mreÅ¾a;"
 
-#. Translators: the nami of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
+#. Translators: the name of the application as it appears in a software center
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "GNOME Hitori"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:6
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "Hitori je logiÄka igra sliÄna popularnoj igri Sudoku."
 
-#: ../data/hitori.appdata.xml.in.h:7
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
@@ -55,133 +58,126 @@ msgstr ""
 "podrÅ¾ano, i moÅ¾ete postaviti oznake na poljima kako bi ste razmislili o "
 "rjeÅ¡enju. Ukoliko ne znaze Å¡ta dalje, igra Ä‡e vam predloÅ¾iti potez."
 
-#: ../data/hitori.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "_Nova Igra"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "VeliÄina _ploÄe"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5x5"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6x6"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7x7"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8x8"
 
-#: ../data/hitori.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9x9"
 
-#: ../data/hitori.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10x10"
 
-#: ../data/hitori.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "_PomoÄ‡"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "_O programu"
 
-#: ../data/hitori.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#: ../data/hitori.ui.h:13
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "PoniÅ¡ti posljednji potez"
 
-#: ../data/hitori.ui.h:14
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "Ponovi potez"
 
-#: ../data/hitori.ui.h:15
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "TraÅ¾i savjet za sljedeÄ‡i potez"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "VeliÄina table"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "VeliÄina table, u poljima."
 
-#: ../src/interface.c:87
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "UI datoteka \"%s\" nije mogla biti uÄitana"
-
-#: ../src/interface.c:661
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "SadrÅ¾aj pomoÄ‡i nije mogao biti prikazan"
 
-#: ../src/interface.c:685
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:686
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "LogiÄka igra koju je dizajnirao Nikoli"
 
-#: ../src/interface.c:688
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "   Nedim Hozic https://launchpad.net/~nedimhozic\n";
 "  Omar Dervisevic https://launchpad.net/~omardervisevic\n";
 "  Samir RibiÄ‡ https://launchpad.net/~megaribi";
 
-#: ../src/interface.c:692
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori Website"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "OmoguÄ‡iti mod otklanjanja neispravnosti"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Sjeme generiranja ploÄe"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Igraj igru od Hitori-a"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "Opcije komandne linije nisu mogle biti raÅ¡Älanjene: %s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "Da li Å¾elite zustaviti tekuÄ‡u igru?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "Nastavi _igrati"
 
-#. Translators: The first parameter is the number of minutes which have elapsed sinci the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "Pobijedili ste u vremenu: %02u:%02u!"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "_Igraj ponovo"
+
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "UI datoteka \"%s\" nije mogla biti uÄitana"
diff --git a/po/ca.po b/po/ca.po
index a410ad7..8b0d132 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Hitori\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-06-27 20:39+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2014-09-05 00:21+0200\n"
 "Last-Translator: Gil Forcada <gilforcada guifi net>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -28,12 +28,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Jugueu al trencaclosques Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "trencaclosques;puzle;joc;lÃ²gica;graella;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -148,17 +146,14 @@ msgstr "Lloc web del Hitori"
 msgid "Enable debug mode"
 msgstr "Habilita mode de depuraciÃ³"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Llavor pel generador de taulers"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Jugueu una partida del Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -172,8 +167,6 @@ msgstr "Voleu aturar la partida actual?"
 msgid "Keep _Playing"
 msgstr "_Continua jugant"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/ca valencia po b/po/ca valencia po
index c19066c..fba047c 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Hitori\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-05 00:23+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2014-09-05 00:21+0200\n"
 "Last-Translator: Gil Forcada <gilforcada guifi net>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -17,25 +18,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:12 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
-#: ../data/hitori.desktop.in.h:2
+#. Translators: the brief summary of the application as it appears in a software center.
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "Jugueu al trencaclosques Hitori"
 
+#: data/org.gnome.Hitori.desktop.in:6
+msgid "puzzle;game;logic;grid;"
+msgstr ""
+
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "GNOME Hitori"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "El Hitori Ã©s un joc de lÃ²gica similar al popular Sukodu."
 
-#: ../data/hitori.appdata.xml.in.h:5
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
@@ -47,138 +57,126 @@ msgstr ""
 "diferent mida, i podeu posar els marcadors a les celes per ajudar-vos a "
 "trobar la soluciÃ³. Si vos quedeu bloquejats, el joc vos pot donar una pista."
 
-#: ../data/hitori.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "_Joc nou"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "Mida del tauler"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../data/hitori.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "I_x"
 
-#: ../data/hitori.ui.h:13
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "DesfÃ©s l'Ãºltim moviment"
 
-#: ../data/hitori.ui.h:14
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "Torna a fer el moviment"
 
-#: ../data/hitori.ui.h:15
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "Obtingueu un suggeriment per al vostre proper moviment"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "Mida del tauler"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "La mida del tauler, en celÂ·les."
 
-#: ../src/interface.c:87
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "No s'ha pogut carregar el fitxer d'interfÃcie d'usuari Â«%sÂ»"
-
-#: ../src/interface.c:661
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "No s'han pogut mostrar els continguts de l'ajuda"
 
-#: ../src/interface.c:685
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:686
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Un trencaclosques lÃ²gic dissenyat originalment per Nikoli."
 
-#: ../src/interface.c:688
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Jordi Mas i Hernandez <jmas softcatala org>"
 
-#: ../src/interface.c:692
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Lloc web del Hitori"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "Habilita mode de depuraciÃ³"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Llavor pel generador de taulers"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Jugueu una partida del Hitori"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "No s'han pogut analitzar les opcions de la lÃnia d'ordes: Â«%sÂ»\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "Voleu parar la partida actual?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "_Continua jugant"
 
-#. Translators: this is the format for the timer label. The first parameter is the number of minutes which 
have
-#. * elapsed since the start of the game; the second parameter is the number of seconds. In between is the 
ratio
-#. * character and a LTR mark to force minutes on the left in RTL locales. You can probably leave this 
unchanged.
-#: ../src/main.c:382
-#, c-format
-msgid "%02uâˆ¶â€Ž%02u"
-msgstr "%02uâˆ¶â€Ž%02u"
-
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "Heu guanyat en un temps de %02u:%02u!"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "Jug_a de nou"
+
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "No s'ha pogut carregar el fitxer d'interfÃcie d'usuari Â«%sÂ»"
+
+#~ msgid "%02uâˆ¶â€Ž%02u"
+#~ msgstr "%02uâˆ¶â€Ž%02u"
diff --git a/po/cs.po b/po/cs.po
index 592c251..93dd93e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2016-12-25 17:45+0100\n"
 "Last-Translator: Marek ÄŒernockÃ½ <marek manet cz>\n"
 "Language-Team: ÄeÅ¡tina <gnome-cs-list gnome org>\n"
@@ -30,12 +30,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "HrÃ¡t logickou hru Hitori."
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "hlavolam;hra;logickÃ¡;mÅ™ÃÅ¾ka;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,23 +124,23 @@ msgstr "Velikost hracÃ desky"
 msgid "The size of the board, in cells."
 msgstr "Velikost hracÃ desky udanÃ¡ v poÄtu polÃÄek."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Nelze zobrazit obsah nÃ¡povÄ›dy"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "LogickÃ½ hlavolam pÅ¯vodnÄ› pochÃ¡zejÃcÃ od Nikoli."
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Marek ÄŒernockÃ½ <marek manet cz>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "WebovÃ© strÃ¡nky Hitori"
 
@@ -150,17 +148,14 @@ msgstr "WebovÃ© strÃ¡nky Hitori"
 msgid "Enable debug mode"
 msgstr "Povolit reÅ¾im ladÄ›nÃ"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "PoÄÃ¡teÄnÃ ÄÃslo pro generovÃ¡nÃ hracÃ desky"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "â€“ hrÃ¡t hru Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -174,8 +169,6 @@ msgstr "Opravdu chcete zastavit souÄasnou hru?"
 msgid "Keep _Playing"
 msgstr "_PokraÄovat ve hÅ™e"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/da.po b/po/da.po
index 8d62cd2..5469e51 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-01-18 22:09+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-02-24 15:29+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -27,12 +27,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "LÃ¦g puslespillet Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "tÃ¦nkespil;puslespil;spil;logik;gitter;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -123,19 +121,19 @@ msgstr "BrÃ¦tstÃ¸rrelse"
 msgid "The size of the board, in cells."
 msgstr "StÃ¸rrelsen pÃ¥ brÃ¦ttet i celler."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "HjÃ¦lpeindholdet kunne ikke vises"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Ophavsret Â© 2007-2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Et logisk puslespil oprindeligt designet af Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Joe Hansen <joedalton2 yahoo dk>, 2009, 2010, 2011, 2013, 2017.\n"
@@ -143,7 +141,7 @@ msgstr ""
 "Dansk-gruppen <dansk dansk-gruppen dk>\n"
 "Mere info: http://www.dansk-gruppen.dk";
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitoris hjemmeside"
 
@@ -151,17 +149,14 @@ msgstr "Hitoris hjemmeside"
 msgid "Enable debug mode"
 msgstr "SlÃ¥ fejlsÃ¸gningstilstand til"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Grundlagstal for brÃ¦toprettelsen"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Spil Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -175,8 +170,6 @@ msgstr "Ã˜nsker du at stoppe det aktuelle spil?"
 msgid "Keep _Playing"
 msgstr "FortsÃ¦t med at _spille"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
@@ -185,4 +178,3 @@ msgstr "Du har vundet. Din tid blev %02u:%02u!"
 #: src/rules.c:273
 msgid "_Play Again"
 msgstr "_Nyt spil"
-
diff --git a/po/de.po b/po/de.po
index 35f3cf7..c436b32 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2016-12-29 11:51+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mario blaettermann gmail com>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
@@ -27,12 +27,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Das Hitori-Puzzle spielen"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;spiel;logik,gitter;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -124,26 +122,26 @@ msgstr "SpielfeldgrÃ¶ÃŸe"
 msgid "The size of the board, in cells."
 msgstr "Die GrÃ¶ÃŸe des Spielfelds in Zellen."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Die Hilfe konnte nicht angezeigt werden."
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2012 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Ein von Nikoli entworfenes Logikspiel"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Mario BlÃ¤ttermann <mario blaettermann gmail com>\n"
 "Christian Kirbach <christian kirbach gmail com>\n"
 "Bernd Homuth <dev hmt im>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori-Webseite"
 
@@ -151,17 +149,14 @@ msgstr "Hitori-Webseite"
 msgid "Enable debug mode"
 msgstr "Fehlerdiagnose aktivieren"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Basiszahl zur Spielfelderzeugung wÃ¤hlen"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "â€“ ein Hitori-Puzzle spielen"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -175,8 +170,6 @@ msgstr "MÃ¶chten Sie das aktuelle Spiel wirklich beenden?"
 msgid "Keep _Playing"
 msgstr "_Weiterspielen"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/el.po b/po/el.po
index d7ae627..6ea5def 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori.master.el\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-03-20 19:12+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-04-06 13:01+0300\n"
 "Last-Translator: Tom Tryfonidis <tomtryf gnome org>\n"
 "Language-Team: Greek, Modern (1453-) <opensuse-translation-el opensuse org>\n"
@@ -27,12 +27,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Î Î±Î¯Î¾Ï„Îµ Ï„Î¿ Ï€Î±Î¹Ï‡Î½Î¯Î´Î¹ Ï€Î±Î¶Î» Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "Î³ÏÎ¯Ï†Î¿Ï‚;Ï€Î±Î¹Ï‡Î½Î¯Î´Î¹;Î»Î¿Î³Î¹ÎºÎ®;Ï€Î»ÎÎ³Î¼Î±;puzzle;game;logic;grid;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,19 +124,19 @@ msgstr "ÎœÎÎ³ÎµÎ¸Î¿Ï‚ Ï€Î¯Î½Î±ÎºÎ±"
 msgid "The size of the board, in cells."
 msgstr "Î¤Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Ï„Î¿Ï… Ï€Î¯Î½Î±ÎºÎ±, ÏƒÎµ ÎºÎµÎ»Î¹Î¬."
 
-#: src/interface.c:642
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Î¤Î± Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î± Î²Î¿Î®Î¸ÎµÎ¹Î±Ï‚ Î´Îµ Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½"
 
-#: src/interface.c:666
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Î Î½ÎµÏ…Î¼Î±Ï„Î¹ÎºÎ¬ Î´Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:667
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "ÎˆÎ½Î± Ï€Î±Î¹Ï‡Î½Î¯Î´Î¹ Î»Î¿Î³Î¹ÎºÎ®Ï‚ ÏƒÏ‡ÎµÎ´Î¹Î±ÏƒÎ¼ÎÎ½Î¿ Î±Ï€ÏŒ Ï„Î¿Î½ Nikoli"
 
-#: src/interface.c:669
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Î•Î»Î»Î·Î½Î¹ÎºÎ® Î¼ÎµÏ„Î±Ï†ÏÎ±ÏƒÏ„Î¹ÎºÎ® Î¿Î¼Î¬Î´Î± GNOME\n"
@@ -148,7 +146,7 @@ msgstr ""
 "Î“Î¹Î± Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚, ÎµÏ€Î¹ÏƒÎºÎµÏ†Î¸ÎµÎ¯Ï„Îµ Ï„Î·Î½ ÏƒÎµÎ»Î¯Î´Î±\n"
 "http://gnome.gr/";
 
-#: src/interface.c:673
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Î™ÏƒÏ„ÏŒÏ„Î¿Ï€Î¿Ï‚ Ï„Î¿Ï… Hitori"
 
@@ -156,17 +154,14 @@ msgstr "Î™ÏƒÏ„ÏŒÏ„Î¿Ï€Î¿Ï‚ Ï„Î¿Ï… Hitori"
 msgid "Enable debug mode"
 msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î±Ï€Î¿ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰ÏƒÎ·Ï‚"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ seed Î³Î¹Î± Ï„Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Ï€Î¯Î½Î±ÎºÎ±."
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Î Î±Î¯Î¾Ï„Îµ ÎÎ½Î± Ï€Î±Î¹Ï‡Î½Î¯Î´Î¹ Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -180,8 +175,6 @@ msgstr "Î˜ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±ÎºÏŒÏˆÎµÏ„Îµ Ï„Î¿ Ï„ÏÎÏ‡Î¿Î½ Ï€Î±Î¹Ï‡Î½Î¯Î´Î¹;
 msgid "Keep _Playing"
 msgstr "Î•_Î¾Î±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ· Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/en_GB.po b/po/en_GB.po
index d079e6d..cf7d54a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-21 15:24+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2007-09-03 16:09+0100\n"
 "Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
 "Language-Team: British English <en li org>\n"
@@ -17,31 +18,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:12 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
 #. Translators: the brief summary of the application as it appears in a software center.
-#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "Play the Hitori puzzle game"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
-#: ../data/hitori.desktop.in.h:4
+#: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;game;logic;grid;"
 
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "GNOME Hitori"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:6
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "Hitori is a logic game similar to the popular game of Sudoku."
 
-#: ../data/hitori.appdata.xml.in.h:7
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
@@ -53,134 +57,127 @@ msgstr ""
 "board are supported, and you can place markers on cells to help work out the "
 "solution. If you get stuck, the game can give you a hint."
 
-#: ../data/hitori.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "_New Game"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "Board _Size"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "_Help"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "_About"
 
-#: ../data/hitori.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../data/hitori.ui.h:13
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "Undo your last move"
 
-#: ../data/hitori.ui.h:14
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "Redo a move"
 
-#: ../data/hitori.ui.h:15
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "Get a hint for your next move"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "Board size"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "The size of the board, in cells."
 
-#: ../src/interface.c:87
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "UI file â€œ%sâ€ could not be loaded"
-
-#: ../src/interface.c:661
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "The help contents could not be displayed"
 
-#: ../src/interface.c:685
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:686
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "A logic puzzle originally designed by Nikoli."
 
-#: ../src/interface.c:688
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Philip Withnall <philip tecnocode co uk>"
 
-#: ../src/interface.c:692
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori Website"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "Enable debug mode"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Seed the board generation"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Play a game of Hitori"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "Command line options could not be parsed: %s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "Do you want to stop the current game?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "Keep _Playing"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "Youâ€™ve won in a time of %02u:%02u!"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "_Play Again"
 
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "UI file â€œ%sâ€ could not be loaded"
+
 #~ msgid "%02uâˆ¶â€Ž%02u"
 #~ msgstr "%02uâˆ¶â€Ž%02u"
 
diff --git a/po/eo.po b/po/eo.po
index aff5663..19027ff 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=hitori";
-"&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2015-02-03 10:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2015-02-08 00:41+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
 "Language-Team: Esperanto <gnome-l10n-eo lists launchpad net>\n"
@@ -20,31 +20,34 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:12 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitorio"
 
 #. Translators: the brief summary of the application as it appears in a software center.
-#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "Ludi la Hitori-puzlon"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
-#: ../data/hitori.desktop.in.h:4
+#: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzlo;ludo;logiko;krado;"
 
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "GNOME Hitorio"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:6
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "Hitorio estas logika ludo, simila al la populara ludo Sudoko."
 
-#: ../data/hitori.appdata.xml.in.h:7
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
@@ -56,133 +59,126 @@ msgstr ""
 "tabulo estas subtenataj kaj vi povas meti signojn sur Ä‰elon por helpi trovi "
 "la solvon. Se vi akiras senmoviÄi, la ludo povas doni al vi sugeston."
 
-#: ../data/hitori.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "_Nova ludo"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "Tabula _grando"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "_Helpo"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "_Pri"
 
-#: ../data/hitori.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "_Forlasi"
 
-#: ../data/hitori.ui.h:13
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "Malfari vian lastan movon"
 
-#: ../data/hitori.ui.h:14
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "Refari movon"
 
-#: ../data/hitori.ui.h:15
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "Konsileto pri via sekva movo"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "Tabula grando"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 #, fuzzy
 msgid "The size of the board, in cells."
 msgstr "La tabula grando, je Ä‰eloj."
 
-#: ../src/interface.c:87
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "Ne eblis ÅarÄi la UI-dosieron â€œ%sâ€"
-
-#: ../src/interface.c:661
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Ne eblis vidigi la helpa enhavo"
 
-#: ../src/interface.c:685
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Kopirajto Â© 2007â€“2010 Philip WITHNALL"
 
-#: ../src/interface.c:686
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Logika puzlo originale desegnita de Nikoli"
 
-#: ../src/interface.c:688
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Daniel PUENTES\n"
 "Kristjan SCHMIDT"
 
-#: ../src/interface.c:692
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Retejo de Hitorio"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "EnÅalti sencimigan reÄimon"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr ""
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Ludi Hitorion"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "Ne eblis sintakse analizi la opciojn de komanda linio: %s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "Äˆu vi volas Ä‰esi la aktualan ludon?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "DaÅrigi _ludon"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, fuzzy, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "Vi venkis je %02u:%02u!"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "_Ludi denove"
+
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "Ne eblis ÅarÄi la UI-dosieron â€œ%sâ€"
diff --git a/po/es.po b/po/es.po
index 13fd027..2c06bfb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-01-11 10:06+0100\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: es <gnome-es-list gnome org>\n"
@@ -29,12 +29,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Jugar al juego de puzle Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzle;juego;lÃ³gica;rejilla;tablero;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -125,23 +123,23 @@ msgstr "TamaÃ±o del tablero"
 msgid "The size of the board, in cells."
 msgstr "El tamaÃ±o del tablero, en casillas."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "No se pudo mostrar el contenido de la ayuda"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Un puzle de lÃ³gica diseÃ±ado originalmente por Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2007-2008"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "PÃ¡gina web de Hitori"
 
@@ -149,17 +147,14 @@ msgstr "PÃ¡gina web de Hitori"
 msgid "Enable debug mode"
 msgstr "Activar modo de depuraciÃ³n"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Alimentar la generaciÃ³n de tableros"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Jugar una partida de Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -173,8 +168,6 @@ msgstr "Â¿Quiere parar la partida actual?"
 msgid "Keep _Playing"
 msgstr "Seguir _jugando"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/eu.po b/po/eu.po
index b1c0386..f23e333 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-01-18 22:09+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-02-19 13:30+0100\n"
 "Last-Translator: IÃ±aki LarraÃ±aga Murgoitio <dooteo zundan com>\n"
 "Language-Team: Basque <librezale librezale eus>\n"
@@ -29,12 +29,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Jokatu Hitori puzzlera"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzlea;jokoa;logika;sareta;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,23 +124,23 @@ msgstr "Taularen tamaina"
 msgid "The size of the board, in cells."
 msgstr "Taularen tamaina (gelaxketan)."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Ezin izan da laguntzaren edukia bistaratu"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright-a Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Jatorrian Nikoli-k diseinatutako logika-puzzlea"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "IÃ±aki LarraÃ±aga Murgoitio <dooteo zundan com>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori-ren webgunea"
 
@@ -150,17 +148,14 @@ msgstr "Hitori-ren webgunea"
 msgid "Enable debug mode"
 msgstr "Gaitu arazketa modua"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Hazia (taula sortzeko)"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Jokatu Hitori jokora"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -174,8 +169,6 @@ msgstr "Uneko jokoa gelditzea nahi duzu?"
 msgid "Keep _Playing"
 msgstr "_Jarraitu jokatzen"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/fa.po b/po/fa.po
index dc66835..341e9e6 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-06-27 20:39+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-09-22 23:14+0330\n"
 "Last-Translator: Arash Mousavi <mousavi arash gmail com>\n"
 "Language-Team: \n"
-"Language: fa_IR\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,12 +28,10 @@ msgstr "Ù‡ÛŒØªÙˆØ±ÛŒ"
 msgid "Play the Hitori puzzle game"
 msgstr "Ø¨Ø§Ø²ÛŒ Ù¾Ø§Ø²Ù„Ù Ù‡ÛŒØªÙˆØ±ÛŒ Ø±Ø§ Ø¨Ø§Ø²ÛŒ Ú©Ù†ÛŒØ¯"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;game;logic;grid;Ù¾Ø§Ø²Ù„;Ø¨Ø§Ø²ÛŒ;Ù…Ù†Ø·Ù‚;Ø´Ø¨Ú©Ù‡;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -149,17 +147,14 @@ msgstr "Ù¾Ø§ÛŒÚ¯Ø§Ù‡ ÙˆØ¨ Ù‡ÛŒØªÙˆØ±ÛŒ"
 msgid "Enable debug mode"
 msgstr "ÙØ¹Ø§Ù„â€ŒØ³Ø§Ø²ÛŒ ØØ§Ù„Øª Ø±ÙØ¹â€ŒØ§Ø´Ú©Ø§Ù„"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Ø¹Ø¯Ø¯ Ø§ØªÙØ§Ù‚ÛŒ Ø¨Ø±Ø§ÛŒ Ø³Ø§Ø®Øª ØªØ®ØªÙ‡ Ø¨Ø§Ø²ÛŒ"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Ø§Ù†Ø¬Ø§Ù… ÛŒÚ© Ø¨Ø§Ø²ÛŒ Ù‡ÛŒØªÙˆØ±ÛŒ"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -173,8 +168,6 @@ msgstr "Ø¢ÛŒØ§ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ú©Ù‡ Ø¨Ø§Ø²ÛŒ ÙØ¹Ù„ÛŒ Ø±Ø§ Ù…ØªÙˆÙ‚Ù Ú©Ù†ÛŒ
 msgid "Keep _Playing"
 msgstr "Ø§Ø¯Ø§Ù…Ù‡ Ø¯Ø§Ø¯Ù† _Ø¨Ø§Ø²ÛŒ"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/fi.po b/po/fi.po
index fd3a8a7..6d74459 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2016-12-25 14:54+0200\n"
 "Last-Translator: Jiri GrÃ¶nroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
@@ -29,12 +29,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Pelaa Hitori-pulmapeliÃ¤"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;game;logic;grid;pulma;peli;logiikka;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -125,23 +123,23 @@ msgstr "Laudan koko"
 msgid "The size of the board, in cells."
 msgstr "Laudan koko soluissa."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Ohjeen sisÃ¤llÃ¶n nÃ¤yttÃ¤minen epÃ¤onnistui"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "TekijÃ¤noikeus Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Alkujaan Nikolin suunnittelema logiikkapeli."
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Jiri GrÃ¶nroos"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitorin verkkosivusto"
 
@@ -149,17 +147,14 @@ msgstr "Hitorin verkkosivusto"
 msgid "Enable debug mode"
 msgstr "KÃ¤ytÃ¤ vianetsintÃ¤tilaa"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Esiasteuta laudan luonti"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Pelaa Hitori-peliÃ¤"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -173,8 +168,6 @@ msgstr "Haluatko lopettaa nykyisen pelin?"
 msgid "Keep _Playing"
 msgstr "Jatka _pelaamista"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/fr.po b/po/fr.po
index c3ae96f..81a9ced 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori.HEAD\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-06-27 20:39+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-09-08 15:43+0100\n"
 "Last-Translator: Charles Monzat <superboa hotmail fr>\n"
 "Language-Team: FranÃ§ais <GNOME French Team <gnomefr traduc org>>\n"
@@ -31,12 +31,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Jouer au casse-tÃªte Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "casse-tÃªte;jeu;logique;grille;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -155,17 +153,14 @@ msgstr "Site Web de Hitori"
 msgid "Enable debug mode"
 msgstr "Activer le mode dÃ©bogage"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Germe de nombre alÃ©atoire pour la gÃ©nÃ©ration du plateau"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Jouer Ã  une partie de Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -179,8 +174,6 @@ msgstr "Voulez-vous arrÃªter cette partieÂ ?"
 msgid "Keep _Playing"
 msgstr "Continuer Ã  _jouer"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/fur.po b/po/fur.po
index 24247e4..879d0b9 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2016-12-28 22:32+0100\n"
 "Last-Translator: Fabio Tomat <f t public gmail com>\n"
 "Language-Team: Friulian <fur li org>\n"
@@ -27,12 +27,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Zuie al berdei Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;zÃ»c;logjiche;gridele;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -122,23 +120,23 @@ msgstr "Dimension taule"
 msgid "The size of the board, in cells."
 msgstr "La dimension de taule in celis."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "I contignÃ»ts dal jutori no puedin jessi mostrÃ¢ts"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Un berdei di logjiche progjetÃ¢t in origjin di Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Fabio Tomat <f t publig gmail com>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "SÃ®t web di Hitori"
 
@@ -146,17 +144,14 @@ msgstr "SÃ®t web di Hitori"
 msgid "Enable debug mode"
 msgstr "Abilite modalitÃ¢t debug"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Gjenerazion de taule cun seed"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Zuie a Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -170,8 +165,6 @@ msgstr "VÃ»stu fermÃ¢ le partide?"
 msgid "Keep _Playing"
 msgstr "Continue _Zuie"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/gl.po b/po/gl.po
index ef59aea..3220e3e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-02-26 21:50+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-03-11 03:43+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
@@ -30,12 +30,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Xogue ao xogo de crebacabezas Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "quebracabezas;xogo;lÃ³xica;grella;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,23 +124,23 @@ msgstr "TamaÃ±o do taboleiro"
 msgid "The size of the board, in cells."
 msgstr "O tamaÃ±o do taboleiro, en celas."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Non foi posÃbel mostrar os contidos da axuda."
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Un crebacabezas lÃ³xico orixinalmente deseÃ±ado por Nikoli."
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Fran Dieguez <frandieguez gnome org>, 2014-2015."
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "PÃ¡xina web de Hitori"
 
@@ -150,17 +148,14 @@ msgstr "PÃ¡xina web de Hitori"
 msgid "Enable debug mode"
 msgstr "Activar modo de depuraciÃ³n"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Alimentar a xeraciÃ³n de taboleiros"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Xogar un xogo de Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -174,8 +169,6 @@ msgstr "Quere deter o xogo actual?"
 msgid "Keep _Playing"
 msgstr "Seguir _xogando"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/he.po b/po/he.po
index 7a80c01..2df935e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Hitori\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-17 00:50+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2015-02-17 00:51+0200\n"
 "Last-Translator: Yosef Or Boczko <yoseforb gmail com>\n"
 "Language-Team: ×¢×‘×¨×™×ª <>\n"
@@ -22,31 +23,34 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:12 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "×”×™×˜×•×¨×™"
 
 #. Translators: the brief summary of the application as it appears in a software center.
-#: ../data/hitori.desktop.in.h:2 ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "×œ×©×—×§ ×‘×ž×©×—×§ ×”×—×©×™×‘×” ×”×™×˜×•×¨×™"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
-#: ../data/hitori.desktop.in.h:4
+#: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "×ª×¦×¨×£;×¤××–×œ;×ž×©×—×§;×œ×•×’×™×§×”;×”×™×’×™×•×Ÿ;×”×’×™×•×Ÿ;×¨×©×ª;"
 
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "×”×™×˜×•×¨×™ GNOME"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:6
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "×”×™×˜×•×¨×™ ×”×•× ×ž×©×—×§ ×—×©×™×‘×” ×¤×©×•×˜ ×”×“×•×ž×” ×œ×ž×©×—×§ ×”×¤×•×¤×•×œ×¨×™ ×¡×•×“×•×§×•."
 
-#: ../data/hitori.appdata.xml.in.h:7
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
@@ -57,136 +61,129 @@ msgstr ""
 "×”×§×¦×¨ ×‘×™×•×ª×¨. ×’×“×œ×™× ×©×•× ×™× ×©×œ ×œ×•×— ×”×ž×©×—×§ × ×ª×ž×›×™×, ×•× ×™×ª×Ÿ ×œ×ž×§× ×¡×ž× ×™× ×¢×œ ×ª××™× ×›×“×™ "
 "×œ×¢×–×•×¨ ×œ×”×’×™×¢ ×œ×¤×ª×¨×•×Ÿ. ×× × ×ª×§×¢×ª, × ×™×ª×Ÿ ×œ×§×‘×œ ×¨×ž×– ×ž×”×ž×©×—×§."
 
-#: ../data/hitori.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "×ž×©×—×§ _×—×“×©"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "_×’×•×“×œ ×”×œ×•×—"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "×¢_×–×¨×”"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "×¢×œ _××•×“×•×ª"
 
-#: ../data/hitori.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "×™_×¦×™××”"
 
-#: ../data/hitori.ui.h:13
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "×‘×™×˜×•×œ ×”×ž×”×œ×š ×”××—×¨×•×Ÿ ×©×œ×š"
 
-#: ../data/hitori.ui.h:14
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "×‘×™×¦×•×¢ ×—×•×–×¨ ×©×œ ×ž×”×œ×š"
 
-#: ../data/hitori.ui.h:15
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "×§×‘×œ×ª ×¨×ž×– ×œ×ž×”×œ×š ×”×‘× ×©×œ×š"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "Board size"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "The size of the board, in cells."
 
-#: ../src/interface.c:87
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "×œ× × ×™×ª×Ÿ ×œ×˜×¢×•×Ÿ ××ª ×§×•×‘×¥ ×ž× ×©×§ ×”×ž×©×ª×ž×© â€ž%sâ€œ"
-
-#: ../src/interface.c:661
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "×œ× × ×™×ª×Ÿ ×œ×”×¦×™×’ ××ª ×ª×›× ×™ ×”×¢×–×¨×”"
 
-#: ../src/interface.c:685
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "×›×œ ×”×–×›×•×™×•×ª ×©×ž×•×¨×•×ª Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:686
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "×ž×©×—×§ ×—×©×™×‘×” ×©×ª×•×›× ×Ÿ ×‘×ž×§×•×¨ ×¢×œ ×™×“×™ × ×™×§×•×œ×™"
 
-#: ../src/interface.c:688
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "×™×¨×•×Ÿ ×©×”×¨×‘× ×™ <sh yaron gmail com>\n"
 "×™×•×¡×£ ××•×¨ ×‘×•×¦×³×§×• <yoseforb gnome org>"
 
-#: ../src/interface.c:692
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "×”××ª×¨ ×©×œ ×”×™×˜×•×¨×™"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "Enable debug mode"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Seed the board generation"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Play a game of Hitori"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "Command line options could not be parsed: %s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "×”×× ×‘×¨×¦×•× ×š ×œ×¢×¦×•×¨ ××ª ×”×ž×©×—×§ ×”× ×•×›×—×™?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "×œ×”×ž×©×™×š _×œ×©×—×§"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "× ×™×¦×—×ª ×‘×–×ž×Ÿ ×©×œ %02u:%02u!"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "×œ_×©×—×§ ×©×•×‘"
 
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "×œ× × ×™×ª×Ÿ ×œ×˜×¢×•×Ÿ ××ª ×§×•×‘×¥ ×ž× ×©×§ ×”×ž×©×ª×ž×© â€ž%sâ€œ"
+
 #~ msgid "%02uâˆ¶â€Ž%02u"
 #~ msgstr "%02uâˆ¶â€Ž%02u"
 
diff --git a/po/hu.po b/po/hu.po
index b98ac3b..a27ef95 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2016-12-29 11:08+0100\n"
 "Last-Translator: MeskÃ³ BalÃ¡zs <meskobalazs gmail com>\n"
 "Language-Team: Hungarian <openscope at gmail dot com>\n"
@@ -30,12 +30,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "JapÃ¡n eredetÅ± logikai jÃ¡tÃ©k a szÃ¡mokkal"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "fejtÃ¶rÅ‘;puzzle;jÃ¡tÃ©k;logika;rÃ¡cs;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,25 +124,25 @@ msgstr "A tÃ¡bla mÃ©rete"
 msgid "The size of the board, in cells."
 msgstr "A tÃ¡bla mÃ©rete cellÃ¡kban."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "A sÃºgÃ³ tartalma nem jelenÃthetÅ‘ meg"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Eredetileg Nikoli Ã¡ltal megalkotott logikai jÃ¡tÃ©k"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Kelemen GÃ¡bor <kelemeng at gnome dot hu>\n"
 "NÃ©meth TamÃ¡s <ntomasz at uhuklub dot hu>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "A Hitori honlapja"
 
@@ -152,17 +150,14 @@ msgstr "A Hitori honlapja"
 msgid "Enable debug mode"
 msgstr "HibakeresÅ‘ Ã¼zemmÃ³d bekapcsolÃ¡sa"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "TÃ¡blagenerÃ¡lÃ¡s kezdÅ‘Ã©rtÃ©ke"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr " - JÃ¡tsszon egyet a Hitorival"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -176,8 +171,6 @@ msgstr "Meg akarja Ã¡llÃtani az aktuÃ¡lis jÃ¡tÃ©kot?"
 msgid "Keep _Playing"
 msgstr "_JÃ¡tÃ©k folytatÃ¡sa"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/id.po b/po/id.po
index d8b511a..8d6434e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:31+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-01-15 17:46+0700\n"
 "Last-Translator: Kukuh Syafaat <syafaatkukuh gmail com>\n"
 "Language-Team: INDONESIA <gnome i15n org>\n"
@@ -29,12 +29,11 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Mainkan permainan menyusun gambar Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "teka teki;permainan;logic;grid;"
 
-#: data/org.gnome.Hitori.desktop.in:8
+#: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
 
@@ -125,26 +124,26 @@ msgstr "Ukuran papan"
 msgid "The size of the board, in cells."
 msgstr "Ukuran papan, dalam sel."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Isi bantuan tidak dapat ditampilkan"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Hak Cipta Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Teka-teki logika yang dirancang oleh Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Imam Musthaqim <userindesign gmail com>, 2009\n"
 "Andika Triwidada <andika gmail com>, 2012, 2014\n"
 "Kukuh Syafaat <syafaatkukuh gmail com>, 2017."
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Situs Web Hitori"
 
@@ -152,17 +151,14 @@ msgstr "Situs Web Hitori"
 msgid "Enable debug mode"
 msgstr "Aktifkan mode perunutan"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Tentukan sumber untuk pembuatan papan"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Mainkan Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -176,8 +172,6 @@ msgstr "Anda ingin menghentikan permainan saat ini?"
 msgid "Keep _Playing"
 msgstr "Tetap _Bermain"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/it.po b/po/it.po
index 19f2523..ce6d38f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-01-18 22:09+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-01-19 13:10+0100\n"
 "Last-Translator: Gianvito Cavasoli <gianvito gmx it>\n"
 "Language-Team: Italiano <gnome-it-list gnome org>\n"
@@ -29,12 +29,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Gioca al rompicapo Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;rompicapo;gioco;logica;griglia;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -125,23 +123,23 @@ msgstr "Dimensione tavola"
 msgid "The size of the board, in cells."
 msgstr "La dimensione tavola, in celle."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "I contenuti dell'aiuto non possono essere visualizzati"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Un rompicapo di logica progettato orginalmente da Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Milo Casagrande <milo milo name>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Sito web"
 
@@ -149,17 +147,14 @@ msgstr "Sito web"
 msgid "Enable debug mode"
 msgstr "Abilita modalitÃ  debug"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Generazione della tavola con seed"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Gioca a Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -173,8 +168,6 @@ msgstr "Fermare la partita attuale?"
 msgid "Keep _Playing"
 msgstr "_Continua partita"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/ko.po b/po/ko.po
index 34f4de1..c619436 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-06-27 20:39+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-09-02 16:04+0900\n"
 "Last-Translator: Junyoul Lim <purum postech ac kr>\n"
 "Language-Team: GNOME Korea <gnome-kr googlegroups com>\n"
@@ -31,12 +31,10 @@ msgstr "ížˆí† ë¦¬"
 msgid "Play the Hitori puzzle game"
 msgstr "ížˆí† ë¦¬ í¼ì¦ ê²Œìž„ì„ í”Œë ˆì´í•©ë‹ˆë‹¤"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;í¼ì¦;game;ê²Œìž„;logic;ë¡œì§;ë…¼ë¦¬;grid;ê·¸ë¦¬ë“œ;ê²©ìž;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -153,17 +151,14 @@ msgstr "ížˆí† ë¦¬ í™ˆíŽ˜ì´ì§€"
 msgid "Enable debug mode"
 msgstr "ë””ë²„ê¹… ëª¨ë“œ ì‚¬ìš©"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "ë³´ë“œ ìƒì„± ì‹œë“œ"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- ížˆí† ë¦¬ ê²Œìž„ í”Œë ˆì´"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -177,8 +172,6 @@ msgstr "í˜„ìž¬ ê²Œìž„ì„ ì¤‘ì§€í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
 msgid "Keep _Playing"
 msgstr "ê³„ì† í”Œë ˆì´(_P)"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/lt.po b/po/lt.po
index 9433b2a..95db291 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-01-07 13:56+0200\n"
 "Last-Translator: Aurimas ÄŒernius <aurisc4 gmail com>\n"
 "Language-Team: LietuviÅ³ <gnome-lt lists akl lt>\n"
@@ -30,12 +30,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Å½aiskite Hitori galvosÅ«kiÅ³ Å¾aidimÄ…"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "galvosÅ«kis;Å¾aidimas;logika;tinklelis;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -127,25 +125,25 @@ msgstr "Lentos dydis"
 msgid "The size of the board, in cells."
 msgstr "Lentos dydis langeliais."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Å½inyno turinio nepavyko parodyti"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "AutorinÄ—s teisÄ—s Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Loginis galvosÅ«kis, kurÄ¯ pirmas sukÅ«rÄ— Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "IÅ¡vertÄ—:\n"
 "Aurimas ÄŒernius <aurisc4 gmail com>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori tinklalapis"
 
@@ -153,17 +151,14 @@ msgstr "Hitori tinklalapis"
 msgid "Enable debug mode"
 msgstr "Ä®jungti derinimo veiksenÄ…"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Lentos generavimo sÄ—kla"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Å¾aisti Hitori Å¾aidimÄ…"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -177,8 +172,6 @@ msgstr "Ar norite sustabdyti dabartinÄ¯ Å¾aidimÄ…?"
 msgid "Keep _Playing"
 msgstr "TÄ™sti _Å¾aidimÄ…"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/lv.po b/po/lv.po
index 5b6e773..56738d7 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=hitori";
-"&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-02-26 08:18+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-03-20 21:10+0200\n"
 "Last-Translator: RÅ«dolfs Mazurs <rudolfs mazurs gmail com>\n"
 "Language-Team: Latvian <lata-l10n googlegroups com>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 2.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :"
-" 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
@@ -28,12 +28,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "SpÄ“lÄ“t Hitori prÄta spÄ“li"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "mÄ«kla;spÄ“le;loÄ£ika;reÅ¾Ä£is;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -124,23 +122,23 @@ msgstr "GaldiÅ†a izmÄ“rs"
 msgid "The size of the board, in cells."
 msgstr "SpÄ“les galdiÅ†a izmÄ“rs, Å¡Å«nÄs."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "NeizdevÄs parÄdÄ«t palÄ«dzÄ«bas saturu"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "AutortiesÄ«bas Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "PrÄta spÄ“le, ko sÄkotnÄ“ji veidojis Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "RÅ«dolfs Mazurs <rudolfs mazurs gmail com>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori tÄ«mekÄ¼a vietne"
 
@@ -148,17 +146,14 @@ msgstr "Hitori tÄ«mekÄ¼a vietne"
 msgid "Enable debug mode"
 msgstr "AktivÄ“t atkÄ¼Å«doÅ¡anas reÅ¾Ä«mu"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "'SÄ“kla' galdiÅ†a Ä£enerÄ“Å¡anai"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- SpÄ“lÄ“t Hitori spÄ“li"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -172,8 +167,6 @@ msgstr "Vai vÄ“laties beigt Å¡o spÄ“li?"
 msgid "Keep _Playing"
 msgstr "Tur_pinÄt spÄ“lÄ“t"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
@@ -182,4 +175,3 @@ msgstr "JÅ«s uzvarÄ“jÄt ar laiku %02u:%02u!"
 #: src/rules.c:273
 msgid "_Play Again"
 msgstr "S_pÄ“lÄ“t vÄ“lreiz:"
-
diff --git a/po/ml.po b/po/ml.po
index a84be19..abf863f 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -11,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=hitori";
-"&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-04-30 22:22+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-08-06 11:30+0530\n"
 "Last-Translator: Anish Sheela <aneesh nl gmail com>\n"
 "Language-Team: Swatantra Malayalam Computing <discuss lists smc org in>\n"
@@ -34,12 +34,10 @@ msgstr "à´¹à´¿à´±àµà´±àµ‹à´±à´¿"
 msgid "Play the Hitori puzzle game"
 msgstr "à´¹à´¿à´±àµà´±àµ‹à´±à´¿ à´ªà´¸à´¿à´²àµâ€ à´•à´³à´¿à´•àµà´•àµà´•"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;game;logic;grid;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -61,9 +59,9 @@ msgid ""
 "board are supported, and you can place markers on cells to help work out the "
 "solution. If you get stuck, the game can give you a hint."
 msgstr ""
-"à´•à´´à´¿à´¯àµà´¨àµà´¨à´¤àµà´° à´µàµ‡à´—à´¤àµà´¤à´¿à´²àµâ€ à´“à´°àµ‹ à´µà´°à´¿à´¯à´¿à´²àµ†à´¯àµà´‚ à´¨à´¿à´°à´¯à´¿à´²àµ†à´¯àµà´‚ à´¡àµà´¯àµ‚à´ªàµà´²à´¿à´•àµà´•àµ‡à´±àµà´±àµ à´¸à´‚à´–àµà´¯à´•à´³àµâ€ "
-"à´¨àµ€à´•àµà´•à´‚ à´šàµ†à´¯àµà´¯àµà´•à´¯à´¾à´£àµ à´²à´•àµà´·àµà´¯à´‚. à´ªàµà´°à´¶àµà´¨à´ªà´°à´¿à´¹à´¾à´°à´¤àµà´¤à´¿à´¨à´¾à´¯à´¿ à´“à´°àµ‹ à´¸àµ†à´²àµà´²à´¿à´²àµà´‚ à´…à´Ÿà´¯à´¾à´³à´™àµà´™à´³àµâ€ "
-"à´¸àµà´¥à´¾à´ªà´¿à´•àµà´•à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£àµ. à´•à´³à´¿à´¯à´¿à´²àµâ€ à´¤à´Ÿà´¸à´®àµà´£àµà´Ÿà´¾à´¯à´¾à´²àµâ€ à´¸àµ‚à´šà´¨à´•à´³àµâ€ à´²à´àµà´¯à´®à´¾à´£àµ."
+"à´•à´´à´¿à´¯àµà´¨àµà´¨à´¤àµà´° à´µàµ‡à´—à´¤àµà´¤à´¿à´²àµâ€ à´“à´°àµ‹ à´µà´°à´¿à´¯à´¿à´²àµ†à´¯àµà´‚ à´¨à´¿à´°à´¯à´¿à´²àµ†à´¯àµà´‚ à´¡àµà´¯àµ‚à´ªàµà´²à´¿à´•àµà´•àµ‡à´±àµà´±àµ à´¸à´‚à´–àµà´¯à´•à´³àµâ€ à´¨àµ€à´•àµà´•à´‚ à´šàµ†à´¯àµà´¯àµà´•à´¯à´¾à´£àµ "
+"à´²à´•àµà´·àµà´¯à´‚. à´ªàµà´°à´¶àµà´¨à´ªà´°à´¿à´¹à´¾à´°à´¤àµà´¤à´¿à´¨à´¾à´¯à´¿ à´“à´°àµ‹ à´¸àµ†à´²àµà´²à´¿à´²àµà´‚ à´…à´Ÿà´¯à´¾à´³à´™àµà´™à´³àµâ€ à´¸àµà´¥à´¾à´ªà´¿à´•àµà´•à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£àµ. à´•à´³à´¿à´¯à´¿à´²àµâ€ "
+"à´¤à´Ÿà´¸à´®àµà´£àµà´Ÿà´¾à´¯à´¾à´²àµâ€ à´¸àµ‚à´šà´¨à´•à´³àµâ€ à´²à´àµà´¯à´®à´¾à´£àµ."
 
 #: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
@@ -155,17 +153,14 @@ msgstr "à´¹à´¿à´±àµà´±àµ‹à´±à´¿ à´µàµ†à´¬àµà´¸àµˆà´±àµà´±àµ"
 msgid "Enable debug mode"
 msgstr "à´¡àµ€à´¬à´—àµ à´®àµ‹à´¡àµ à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´ªàµà´ªà´¿à´•àµà´•àµà´•"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "à´¬àµ‹à´°àµâ€à´¡àµ à´‰à´£àµà´Ÿà´¾à´•àµà´•à´¾à´¨àµà´³àµà´³ à´¸à´‚à´–àµà´¯"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- à´¹à´¿à´±àµà´±àµ‹à´±à´¿ -à´•à´³à´¿à´•àµà´•àµà´•"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -179,8 +174,6 @@ msgstr "à´‡à´ªàµà´ªàµ‹à´´à´¤àµà´¤àµ† à´•à´³à´¿ à´…à´µà´¸à´¾à´¨à´¿à´ªàµà´ªà´¿
 msgid "Keep _Playing"
 msgstr "à´•à´³à´¿à´šàµà´šàµà´•àµŠà´£àµà´Ÿàµ‡à´¯à´¿à´°à´¿à´•àµà´•àµà´• (_P)"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/nb.po b/po/nb.po
index b17ecc9..9130d24 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori 3.23.x\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=hitori&keywords=I18N+L10N&component=General\n";
-"POT-Creation-Date: 2017-01-18 22:09+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-02-19 17:52+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian bokmÃ¥l <i18n-nb lister ping uio no>\n"
@@ -26,12 +27,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Spill det populÃ¦re puslespillet Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puslespill;spill;logikk;rutenett;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -122,25 +121,25 @@ msgstr "StÃ¸rrelse pÃ¥ brett"
 msgid "The size of the board, in cells."
 msgstr "StÃ¸rrelse pÃ¥ brettet i celler."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Klarte ikke Ã¥ vise hjelpinnholdet"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Opphavsrett Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Logisk puslespill som opprinnelig ble laget av Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas <kmaraas gnome org>\n"
 "Espen Stefansen <espens svn gnome org>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori nettsted"
 
@@ -148,17 +147,14 @@ msgstr "Hitori nettsted"
 msgid "Enable debug mode"
 msgstr "SlÃ¥ pÃ¥ feilsÃ¸kingsmodus"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Sett utgangstall for generering av brett"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Spill en runde med Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -172,8 +168,6 @@ msgstr "Vil du stoppe dette spillet?"
 msgid "Keep _Playing"
 msgstr "Fortsett s_pillet"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/ne.po b/po/ne.po
index a96cf0b..da67473 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=hitori&keywords=I18N+L10N&component=General\n";
-"POT-Creation-Date: 2014-09-18 09:26+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2014-09-23 21:56+0400\n"
 "Last-Translator: Pawan Chitrakar <chautari gmail com>\n"
 "Language-Team: Nepali Translation Team <chautari gmail com>\n"
@@ -19,164 +20,166 @@ msgstr ""
 "X-Poedit-Language: Nepali\n"
 "X-Poedit-Country: NEPAL\n"
 
-#: ../data/hitori.desktop.in.h:1
-#: ../data/hitori.ui.h:12
-#: ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "à¤¹à¤¿à¤Ÿà¥‹à¤°à¤¿"
 
-#: ../data/hitori.desktop.in.h:2
+#. Translators: the brief summary of the application as it appears in a software center.
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "à¤¹à¤¿à¤Ÿà¥‹à¤°à¤¿ à¤–à¥‡à¤² à¤–à¥‡à¤²à¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
 
+#: data/org.gnome.Hitori.desktop.in:6
+msgid "puzzle;game;logic;grid;"
+msgstr ""
+
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "à¤œà¤¿à¤¨à¥‹à¤® à¤¹à¤¿à¤Ÿà¥‹à¤°à¤¿"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr ""
 
-#: ../data/hitori.appdata.xml.in.h:5
-msgid "You play the game against the clock, aiming to eliminate all the duplicate numbers in each row and 
column in the fastest time. Multiple sizes of game board are supported, and you can place markers on cells to 
help work out the solution. If you get stuck, the game can give you a hint."
+#: data/org.gnome.Hitori.appdata.xml.in:17
+msgid ""
+"You play the game against the clock, aiming to eliminate all the duplicate "
+"numbers in each row and column in the fastest time. Multiple sizes of game "
+"board are supported, and you can place markers on cells to help work out the "
+"solution. If you get stuck, the game can give you a hint."
 msgstr ""
 
-#: ../data/hitori.ui.h:1
-#: ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "à¤¨à¤¯à¤¾à¤ à¤–à¥‡à¤²"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "à¤¬à¥‹à¤°à¥à¤¡à¤•à¥‹ à¤†à¤•à¤¾à¤°"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "à¥«Ã—à¥«"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "à¥¬Ã—à¥¬"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "à¥xà¥"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "à¥®Ã—à¥®"
 
-#: ../data/hitori.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "à¥¯Ã—à¥¯"
 
-#: ../data/hitori.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "à¥§à¥¦Ã—à¥§à¥¦"
 
-#: ../data/hitori.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "à¤®à¤¦à¥à¤¦à¤¤"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "à¤¬à¤¾à¤°à¥‡à¤®à¤¾"
 
-#: ../data/hitori.ui.h:11
-#: ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "à¤…à¤¨à¥à¤¤à¥à¤¯ à¤—à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
 
-#: ../data/hitori.ui.h:13
+#: data/hitori.ui:29
 #, fuzzy
 msgid "Undo your last move"
 msgstr "à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ à¤šà¤¾à¤² à¤¹à¥‹ à¥¤"
 
-#: ../data/hitori.ui.h:14
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "à¤šà¤¾à¤² à¤°à¤¿à¤¡à¥‚ à¤—à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
 
-#: ../data/hitori.ui.h:15
+#: data/hitori.ui:75
 #, fuzzy
 msgid "Get a hint for your next move"
 msgstr "à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ à¤ªà¤›à¤¿à¤²à¥à¤²à¥‹ à¤šà¤¾à¤²à¤•à¤¾ à¤²à¤¾à¤—à¤¿ à¤à¤‰à¤Ÿà¤¾ à¤‡à¤¶à¤¾à¤°à¤¾ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ à¤—à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "à¤¬à¥‹à¤°à¥à¤¡à¤•à¥‹ à¤†à¤•à¤¾à¤°"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 #, fuzzy
 msgid "The size of the board, in cells."
 msgstr "à¤¬à¤¿à¤¨à¥à¤¦à¥à¤¹à¤°à¥à¤®à¤¾ à¤µà¤°à¥à¤£à¤•à¥‹ à¤†à¤•à¤¾à¤°"
 
-#: ../src/interface.c:87
-#, fuzzy, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "â€œ%sâ€ à¤•à¥‹ à¤°à¥à¤ªà¤®à¤¾ à¤«à¤¾à¤‡à¤² à¤¬à¤šà¤¤ à¤—à¤°à¥à¤¨ à¤¸à¤•à¥‡à¤¨ à¥¤"
-
-#: ../src/interface.c:661
+#: src/interface.c:649
 #, fuzzy
 msgid "The help contents could not be displayed"
 msgstr "à¤«à¥‹à¤²à¥à¤¡à¤° à¤¸à¤¾à¤®à¤—à¥à¤°à¥€à¤¹à¤°à¥‚ à¤ªà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ à¤—à¤°à¥à¤¨ à¤¸à¤•à¤¿à¤à¤¨ à¥¤"
 
-#: ../src/interface.c:685
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© à¥¨à¥¦à¥¦à¥â€“à¥¨à¥¦à¥§à¥¦ à¤«à¤¿à¤²à¤¿à¤ª à¤¹à¥à¤µà¤¿à¤¥à¤¨à¤²"
 
-#: ../src/interface.c:686
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr ""
 
-#: ../src/interface.c:688
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Pawan Chitrakar < chautari gmail com >"
 
-#: ../src/interface.c:692
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "à¤¹à¤¿à¤Ÿà¥‹à¤°à¤¿ à¤µà¥‡à¤¬à¤¸à¤¾à¤‡à¤Ÿ"
 
-#: ../src/main.c:209
+#: src/main.c:209
 #, fuzzy
 msgid "Enable debug mode"
 msgstr "à¤¡à¤¿à¤¬à¤— à¤¶à¥ˆà¤²à¥€ à¤–à¥à¤²à¥à¤²à¤¾"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 #, fuzzy
 msgid "Seed the board generation"
 msgstr " ~a à¤²à¤¾à¤ˆ à¤¬à¥‹à¤°à¥à¤¡ à¤¬à¤¾à¤¹à¤¿à¤° à¤¸à¤¾à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "à¤¹à¤¿à¤Ÿà¥‹à¤°à¤¿ à¤–à¥‡à¤² à¤–à¥‡à¤²à¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "à¤†à¤¦à¥‡à¤¶-à¤°à¥‡à¤–à¤¾ à¤µà¤¿à¤•à¤²à¥à¤ª à¤ªà¤¦ à¤µà¤°à¥à¤£à¤¨ à¤—à¤°à¥à¤¨ à¤¸à¤•à¥‡à¤¨%s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "à¤¹à¤¾à¤²à¤•à¥‹ à¤–à¥‡à¤² à¤°à¥‹à¤•à¥à¤¨à¥à¤¹à¥‹à¤¸à¥?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 #, fuzzy
 msgid "Keep _Playing"
 msgstr "à¤ªà¥à¤²à¥‡ à¤à¤à¤•à¥‹ à¤›à¥ˆà¤¨"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr ""
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "à¤«à¥‡à¤°à¤¿ à¤–à¥‡à¤²à¥à¤¨à¥à¤¹à¥‹à¤¸"
 
+#, fuzzy
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "â€œ%sâ€ à¤•à¥‹ à¤°à¥à¤ªà¤®à¤¾ à¤«à¤¾à¤‡à¤² à¤¬à¤šà¤¤ à¤—à¤°à¥à¤¨ à¤¸à¤•à¥‡à¤¨ à¥¤"
diff --git a/po/nl.po b/po/nl.po
index 3bed37c..388419d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-04-30 22:22+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-09-11 18:47+0200\n"
 "Last-Translator: Nathan Follens <nthn unseen is>\n"
 "Language-Team: Dutch <gnome-nl-list gnome org>\n"
@@ -29,12 +29,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Speel het Hitori-puzzelspel"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;game;logic;grid;puzzel;spel;logica;grid;rooster;raster;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -154,17 +152,14 @@ msgstr "Hitori-website"
 msgid "Enable debug mode"
 msgstr "Debugmodus inschakelen"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Seed voor bordaanmaak"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Speel een spel Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -178,8 +173,6 @@ msgstr "Wilt u het huidige spel beÃ«indigen?"
 msgid "Keep _Playing"
 msgstr "Blijven s_pelen"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/oc.po b/po/oc.po
index 63565c0..9f5b48d 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-05-05 19:54+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2016-05-05 21:46+0200\n"
 "Last-Translator: CÃ©dric Valmary (totenoc.eu) <cvalmary yahoo fr>\n"
 "Language-Team: Tot En Ã’c\n"
@@ -21,33 +21,34 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/org.gnome.Hitori.desktop.in.h:1 ../data/hitori.ui.h:1
-#: ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
 #. Translators: the brief summary of the application as it appears in a software center.
-#: ../data/org.gnome.Hitori.desktop.in.h:2
-#: ../data/org.gnome.Hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "Jogar al copacap Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
-#: ../data/org.gnome.Hitori.desktop.in.h:4
+#: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "copacap;jÃ²c;logica;grasilha;"
 
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/org.gnome.Hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "GNOME Hitori"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/org.gnome.Hitori.appdata.xml.in.h:6
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "Hitori es un jÃ²c de logica similar al popular jÃ²c de Sudoku."
 
-#: ../data/org.gnome.Hitori.appdata.xml.in.h:7
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
@@ -60,127 +61,122 @@ msgstr ""
 "d'ajudar a trobar una solucion. Se sÃ¨tz blocat, lo jÃ²c vos pÃ²t donar un "
 "indici."
 
-#: ../data/hitori-menus.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "_NovÃ¨la partida"
 
-#: ../data/hitori-menus.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "_Talha del platÃ¨u"
 
-#: ../data/hitori-menus.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori-menus.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori-menus.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori-menus.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori-menus.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori-menus.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori-menus.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "Ajud_a"
 
-#: ../data/hitori-menus.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "_A prepaus"
 
-#: ../data/hitori-menus.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "_Quitar"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "Anullar vÃ²stre darriÃ¨r movement"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "Refar un movement"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "ObtÃ©ner un indici per vÃ²stre movement que ven"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "Talha del platÃ¨u"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "Talha del platÃ¨u, en cellulas"
 
-#: ../src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Impossible d'afichar lo contengut de l'ajuda"
 
-#: ../src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Un copacap de logica concebut a l'origina per Nikoli."
 
-#: ../src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "CÃ©dric Valmary (totenoc.eu) <cvalmary yahoo fr>, 2016"
 
-#: ../src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Site Web de Hitori"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "Activar lo mÃ²de desbugatge"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "GÃ¨rme de nombre aleatÃ²ri per la generacion del platÃ¨u"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Jogar a una partida de Hitori"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "Impossible d'analisar las opcions de la linha de comandaÂ : %s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "VolÃ¨tz arrestar aquesta partidaÂ ?"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "Contunhar de _jogar"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "AvÃ¨tz resolgut lo puzzle en %02u:%02uÂ !"
 
 # ... o Jogar a NovÃ¨l, c'est a voir.
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "_Rejogar"
 
diff --git a/po/pa.po b/po/pa.po
index 66e8dd0..ee64c74 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=hitori&component=general\n"
-"POT-Creation-Date: 2009-06-07 21:45+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2009-06-16 06:36+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjab-l10n list sf net>\n"
@@ -19,141 +19,203 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:8 ../src/main.c:196
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "à¨¹à©€à¨Ÿà©‹à¨°à©€"
 
-#: ../data/hitori.desktop.in.h:2
+#. Translators: the brief summary of the application as it appears in a software center.
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "à¨¹à©€à¨Ÿà©‹à¨°à©€ à¨¬à©à¨à¨¾à¨°à¨¤ à¨–à©‡à¨¡ à¨–à©‡à¨¡à©‹"
 
-#: ../data/hitori.ui.h:1
-msgid "10Ã—10"
-msgstr "10Ã—10"
+#: data/org.gnome.Hitori.desktop.in:6
+msgid "puzzle;game;logic;grid;"
+msgstr ""
+
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
+#. Translators: the name of the application as it appears in a software center
+#: data/org.gnome.Hitori.appdata.xml.in:9
+#, fuzzy
+msgid "GNOME Hitori"
+msgstr "à¨¹à©€à¨Ÿà©‹à¨°à©€"
 
-#: ../data/hitori.ui.h:2
+#. Translators: These are the application description paragraphs in the AppData file.
+#: data/org.gnome.Hitori.appdata.xml.in:16
+msgid "Hitori is a logic game similar to the popular game of Sudoku."
+msgstr ""
+
+#: data/org.gnome.Hitori.appdata.xml.in:17
+msgid ""
+"You play the game against the clock, aiming to eliminate all the duplicate "
+"numbers in each row and column in the fastest time. Multiple sizes of game "
+"board are supported, and you can place markers on cells to help work out the "
+"solution. If you get stuck, the game can give you a hint."
+msgstr ""
+
+#: data/hitori-menus.ui:8 src/main.c:305
+#, fuzzy
+msgid "_New Game"
+msgstr "à¨–à©‡à¨¡(_G)"
+
+#: data/hitori-menus.ui:12
+msgid "Board _Size"
+msgstr "à¨¬à©‹à¨°à¨¡ à¨¸à¨¾à¨ˆà¨œà¨¼(_S)"
+
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:7
-msgid "Board _Size"
-msgstr "à¨¬à©‹à¨°à¨¡ à¨¸à¨¾à¨ˆà¨œà¨¼(_S)"
-
-#: ../data/hitori.ui.h:9
-msgid "_Game"
-msgstr "à¨–à©‡à¨¡(_G)"
+#: data/hitori-menus.ui:41
+msgid "10Ã—10"
+msgstr "10Ã—10"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "à¨®à©±à¨¦à¨¦(_H)"
 
-#: ../data/hitori.ui.h:11
-msgid "_Hint"
-msgstr "à¨¹à¨¿à©°à¨Ÿ(_H)"
-
-#: ../data/hitori.ui.h:12
-msgid "_Settings"
-msgstr "à¨¸à©ˆà¨Ÿà¨¿à©°à¨—(_S)"
-
-#: ../src/interface.c:64
-#, c-format
-msgid "UI file \"%s/hitori/hitori.ui\" could not be loaded."
-msgstr "UI à¨«à¨¾à¨‡à¨² \"%s/hitori/hitori.ui\" à¨¨à¨¹à©€à¨‚ à¨²à©‹à¨¡ à¨•à©€à¨¤à©€ à¨œà¨¾ à¨¸à¨•à©€à¥¤"
+#: data/hitori-menus.ui:55
+msgid "_About"
+msgstr ""
 
-#: ../src/interface.c:220
-msgid "You've won!"
-msgstr "à¨¤à©à¨¸à©€à¨‚ à¨œà¨¿à©±à¨¤ à¨—à¨!"
+#: data/hitori-menus.ui:59 src/rules.c:272
+msgid "_Quit"
+msgstr ""
 
-#: ../src/interface.c:514
-msgid "The help contents could not be displayed."
-msgstr "à¨®à©±à¨¦à¨¦ à¨¸à¨®à©±à¨—à¨°à©€ à¨¹à¨¾à¨²à©‡ à¨¨à¨¹à©€à¨‚ à¨µà©‡à¨–à¨¾à¨ˆ à¨œà¨¾ à¨¸à¨•à©€à¥¤"
+#: data/hitori.ui:29
+msgid "Undo your last move"
+msgstr ""
 
-#: ../src/interface.c:536
-msgid ""
-"Hitori is free software: you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation, either version 3 of the License, or (at your option) any later "
-"version."
+#: data/hitori.ui:51
+msgid "Redo a move"
 msgstr ""
-"à¨¹à©€à¨Ÿà©‹à¨°à©€ à¨ªà¨°à©‹à¨—à¨°à¨¾à¨® à¨‡à©±à¨• à¨®à©à¨«à¨¤ à¨¸à¨¾à¨«à¨Ÿà¨µà©‡à¨…à¨° à¨¹à©ˆ, à¨œà¨¿à¨¸ à¨¨à©‚à©° à¨¤à©à¨¸à©€à¨‚ à¨—à¨¨à©‚ à¨œà¨°à¨¨à¨² à¨ªà¨¬à¨²à¨¿à¨• à¨²à¨¾à¨ˆà¨¸à©ˆà¨‚à¨¸, "
-"à¨œà¨¿à¨¸ à¨¨à©‚à©° à¨«à¨°à©€ à¨¸à¨¾à¨«à¨Ÿà¨µà©‡à¨…à¨° à¨«à¨¾à¨Šà¨¨à¨¡à©‡à¨¸à¨¼à¨¨ à¨¨à©‡ à¨¤à¨¿à¨†à¨° à¨•à©€à¨¤à¨¾ à¨¹à©ˆ, à¨¦à©‡ à¨µà¨°à¨œà¨¨ à©¨ à¨œà¨¾à¨‚ à¨¨à¨µà©‡à¨‚ à¨¦à©€à¨†à¨‚ "
-"à¨¸à¨¼à¨°à¨¤à¨¾à¨‚ "
-"(à¨‰à¨¹ à¨¤à©à¨¹à¨¾à¨¡à©€ à¨†à¨ªà¨£à©€ à¨®à¨°à¨œà¨¼à©€ à¨¹à©ˆ) à¨…à¨§à©€à¨¨ à¨µà©°à¨¡ à¨…à¨¤à©‡/à¨œà¨¾à¨‚ à¨¸à©‹à¨§ à¨¸à¨•à¨¦à©‡ à¨¹à©‹à¥¤"
 
-#: ../src/interface.c:540
-msgid ""
-"Hitori is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
+#: data/hitori.ui:75
+msgid "Get a hint for your next move"
 msgstr ""
-"à¨¹à¨¿à¨Ÿà©‹à¨°à©€ à¨ªà¨°à©‹à¨—à¨°à¨¾à¨® à¨¨à©‚à©° à¨‡à¨¹ à¨®à©°à¨¨ à¨•à©‡ à¨µà©°à¨¡à¨¿à¨† à¨œà¨¾ à¨°à¨¿à¨¹à¨¾ à¨¹à©ˆ à¨•à¨¿ à¨‡à¨¹ à¨«à¨¾à¨‡à¨¦à©‡à¨®à©°à¨¦ à¨°à¨¹à©‡à¨—à¨¾, "
-"à¨ªà¨° à¨‡à¨¸ à¨¦à©€ à¨•à©‹à¨ˆ à¨µà¨¾à¨°à©°à¨Ÿà©€ à¨¨à¨¹à©€à¨‚ à¨²à¨ˆ à¨œà¨¾ à¨°à¨¹à©€ à¨¹à©ˆ, à¨•à¨¿à¨¸à©‡ à¨–à¨¾à¨¸ à¨•à©°à¨® à¨²à¨ˆ à¨…à¨¨à©à¨•à©‚à¨² à¨¹à©‹à¨£ "
-"à¨œà¨¾à¨‚ à¨ à©€à¨• à¨¤à¨°à©à¨¹à¨¾à¨‚ à¨•à©°à¨® à¨•à¨°à¨¨ à¨¦à©€ à¨µà©€ à¨•à©‹à¨ˆ à¨—à¨¾à¨°à©°à¨Ÿà©€ à¨¨à¨¹à©€à¨‚ à¨¹à©ˆà¥¤ à¨¹à©‹à¨° à¨µà©‡à¨°à¨µà©‡ à¨²à¨ˆ à¨—à¨¨à©‚ à¨œà¨°à¨¨à¨² à¨ªà¨¬à¨²à¨¿à¨• "
-"à¨²à¨¾à¨‡à¨¸à©ˆà¨‚à¨¸ à¨¨à©‚à©° à¨ªà©œà©à¨¹à©‹à¥¤"
 
-#: ../src/interface.c:544
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Hitori.  If not, see <http://www.gnu.org/licenses/>."
+#: data/org.gnome.hitori.gschema.xml:6
+#, fuzzy
+msgid "Board size"
+msgstr "à¨¬à©‹à¨°à¨¡ à¨¸à¨¾à¨ˆà¨œà¨¼(_S)"
+
+#: data/org.gnome.hitori.gschema.xml:7
+msgid "The size of the board, in cells."
 msgstr ""
-"à¨¤à©à¨¸à©€à¨‚ à¨—à¨¨à©‚ à¨œà¨°à¨¨à¨² à¨ªà¨¬à¨²à¨¿à¨• à¨²à¨¾à¨ˆà¨¸à©ˆà¨‚à¨¸ à¨¦à©€ à¨•à¨¾à¨ªà©€ à¨¨à©‚à©° à¨¹à©€à¨Ÿà©‹à¨°à©€ à¨¨à¨¾à¨² à¨²à¨µà©‹à¨—à©‡à¥¤ à¨œà©‡ à¨¨à¨¹à©€à¨‚ à¨¤à¨¾à¨‚ "
-"<http://www.gnu.org/licenses/> à¨µà©‡à¨–à©‹à¥¤"
 
-#: ../src/interface.c:556
-msgid "Copyright Â© 2007â€“2009 Philip Withnall"
+#: src/interface.c:649
+#, fuzzy
+msgid "The help contents could not be displayed"
+msgstr "à¨®à©±à¨¦à¨¦ à¨¸à¨®à©±à¨—à¨°à©€ à¨¹à¨¾à¨²à©‡ à¨¨à¨¹à©€à¨‚ à¨µà©‡à¨–à¨¾à¨ˆ à¨œà¨¾ à¨¸à¨•à©€à¥¤"
+
+#: src/interface.c:673
+#, fuzzy
+msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2009 Philip Withnall"
 
-#: ../src/interface.c:557
-msgid "A logic puzzle designed by Nikoli."
+#: src/interface.c:674
+#, fuzzy
+msgid "A logic puzzle originally designed by Nikoli"
 msgstr "à¨¨à©€à¨•à©‹à¨²à©€ à¨µà¨²à©‹à¨‚ à¨¡à¨¿à¨œà¨¼à¨¾à¨‡à¨¨ à¨•à©€à¨¤à©€ à¨²à¨¾à¨œà¨¿à¨• à¨¬à©à¨à¨¾à¨°à¨¤"
 
-#: ../src/interface.c:560
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "à¨…à¨®à¨¨à¨ªà¨°à©€à¨¤ à¨¸à¨¿à©°à¨˜ à¨†à¨²à¨®\n"
 "Punjabi OpenSource Team\n"
 "http://www.satluj.com";
 
-#: ../src/interface.c:564
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "à¨¹à©€à¨Ÿà©‹à¨°à©€ à¨µà©ˆà¨¬à¨¸à¨¾à¨ˆà¨Ÿ"
 
-#: ../src/main.c:74
-msgid "Do you want to stop the current game?"
-msgstr "à¨•à©€ à¨¤à©à¨¸à©€à¨‚ à¨®à©Œà¨œà©‚à¨¦à¨¾ à¨–à©‡à¨¡ à¨°à©‹à¨•à¨£à©€ à¨šà¨¾à¨¹à©à©°à¨¦à©‡ à¨¹à©‹?"
-
-#: ../src/main.c:182
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "à¨¡à©€à¨¬à©±à¨— à¨®à©‹à¨¡ à¨šà¨¾à¨²à©‚"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:184
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "à¨¬à©‹à¨°à¨¡ à¨œà¨¨à¨°à©‡à¨¸à¨¼à¨¨ à¨¤à¨¿à¨†à¨° à¨•à¨°à©‹"
 
-#. Options
-#: ../src/main.c:200
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- à¨¹à©€à¨Ÿà©‹à¨°à©€ à¨¦à©€ à¨–à©‡à¨¡ à¨–à©‡à¨¡à©‹"
 
-#: ../src/main.c:210
-msgid "Command-line options could not be parsed."
+#: src/main.c:235
+#, fuzzy, c-format
+msgid "Command line options could not be parsed: %s\n"
 msgstr "à¨•à¨®à¨¾à¨‚à¨¡ à¨²à¨¾à¨ˆà¨¨ à¨šà©‹à¨£à¨¾à¨‚ à¨ªà¨¾à¨°à¨¸ à¨¨à¨¹à©€à¨‚ à¨•à©€à¨¤à©€à¨†à¨‚ à¨œà¨¾ à¨¸à¨•à©€à¨†à¨‚à¥¤"
 
+#: src/main.c:301
+msgid "Do you want to stop the current game?"
+msgstr "à¨•à©€ à¨¤à©à¨¸à©€à¨‚ à¨®à©Œà¨œà©‚à¨¦à¨¾ à¨–à©‡à¨¡ à¨°à©‹à¨•à¨£à©€ à¨šà¨¾à¨¹à©à©°à¨¦à©‡ à¨¹à©‹?"
+
+#: src/main.c:304
+msgid "Keep _Playing"
+msgstr ""
+
+#: src/rules.c:267
+#, c-format
+msgid "Youâ€™ve won in a time of %02u:%02u!"
+msgstr ""
+
+#: src/rules.c:273
+msgid "_Play Again"
+msgstr ""
+
+#~ msgid "_Hint"
+#~ msgstr "à¨¹à¨¿à©°à¨Ÿ(_H)"
+
+#~ msgid "_Settings"
+#~ msgstr "à¨¸à©ˆà¨Ÿà¨¿à©°à¨—(_S)"
+
+#~ msgid "UI file \"%s/hitori/hitori.ui\" could not be loaded."
+#~ msgstr "UI à¨«à¨¾à¨‡à¨² \"%s/hitori/hitori.ui\" à¨¨à¨¹à©€à¨‚ à¨²à©‹à¨¡ à¨•à©€à¨¤à©€ à¨œà¨¾ à¨¸à¨•à©€à¥¤"
+
+#~ msgid "You've won!"
+#~ msgstr "à¨¤à©à¨¸à©€à¨‚ à¨œà¨¿à©±à¨¤ à¨—à¨!"
+
+#~ msgid ""
+#~ "Hitori is free software: you can redistribute it and/or modify it under "
+#~ "the terms of the GNU General Public License as published by the Free "
+#~ "Software Foundation, either version 3 of the License, or (at your option) "
+#~ "any later version."
+#~ msgstr ""
+#~ "à¨¹à©€à¨Ÿà©‹à¨°à©€ à¨ªà¨°à©‹à¨—à¨°à¨¾à¨® à¨‡à©±à¨• à¨®à©à¨«à¨¤ à¨¸à¨¾à¨«à¨Ÿà¨µà©‡à¨…à¨° à¨¹à©ˆ, à¨œà¨¿à¨¸ à¨¨à©‚à©° à¨¤à©à¨¸à©€à¨‚ à¨—à¨¨à©‚ à¨œà¨°à¨¨à¨² à¨ªà¨¬à¨²à¨¿à¨• à¨²à¨¾à¨ˆà¨¸à©ˆà¨‚à¨¸, à¨œà¨¿à¨¸ à¨¨à©‚à©° à¨«à¨°à©€ "
+#~ "à¨¸à¨¾à¨«à¨Ÿà¨µà©‡à¨…à¨° à¨«à¨¾à¨Šà¨¨à¨¡à©‡à¨¸à¨¼à¨¨ à¨¨à©‡ à¨¤à¨¿à¨†à¨° à¨•à©€à¨¤à¨¾ à¨¹à©ˆ, à¨¦à©‡ à¨µà¨°à¨œà¨¨ à©¨ à¨œà¨¾à¨‚ à¨¨à¨µà©‡à¨‚ à¨¦à©€à¨†à¨‚ à¨¸à¨¼à¨°à¨¤à¨¾à¨‚ (à¨‰à¨¹ à¨¤à©à¨¹à¨¾à¨¡à©€ à¨†à¨ªà¨£à©€ "
+#~ "à¨®à¨°à¨œà¨¼à©€ à¨¹à©ˆ) à¨…à¨§à©€à¨¨ à¨µà©°à¨¡ à¨…à¨¤à©‡/à¨œà¨¾à¨‚ à¨¸à©‹à¨§ à¨¸à¨•à¨¦à©‡ à¨¹à©‹à¥¤"
+
+#~ msgid ""
+#~ "Hitori is distributed in the hope that it will be useful, but WITHOUT ANY "
+#~ "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+#~ "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+#~ "details."
+#~ msgstr ""
+#~ "à¨¹à¨¿à¨Ÿà©‹à¨°à©€ à¨ªà¨°à©‹à¨—à¨°à¨¾à¨® à¨¨à©‚à©° à¨‡à¨¹ à¨®à©°à¨¨ à¨•à©‡ à¨µà©°à¨¡à¨¿à¨† à¨œà¨¾ à¨°à¨¿à¨¹à¨¾ à¨¹à©ˆ à¨•à¨¿ à¨‡à¨¹ à¨«à¨¾à¨‡à¨¦à©‡à¨®à©°à¨¦ à¨°à¨¹à©‡à¨—à¨¾, à¨ªà¨° à¨‡à¨¸ à¨¦à©€ à¨•à©‹à¨ˆ "
+#~ "à¨µà¨¾à¨°à©°à¨Ÿà©€ à¨¨à¨¹à©€à¨‚ à¨²à¨ˆ à¨œà¨¾ à¨°à¨¹à©€ à¨¹à©ˆ, à¨•à¨¿à¨¸à©‡ à¨–à¨¾à¨¸ à¨•à©°à¨® à¨²à¨ˆ à¨…à¨¨à©à¨•à©‚à¨² à¨¹à©‹à¨£ à¨œà¨¾à¨‚ à¨ à©€à¨• à¨¤à¨°à©à¨¹à¨¾à¨‚ à¨•à©°à¨® à¨•à¨°à¨¨ à¨¦à©€ à¨µà©€ à¨•à©‹à¨ˆ "
+#~ "à¨—à¨¾à¨°à©°à¨Ÿà©€ à¨¨à¨¹à©€à¨‚ à¨¹à©ˆà¥¤ à¨¹à©‹à¨° à¨µà©‡à¨°à¨µà©‡ à¨²à¨ˆ à¨—à¨¨à©‚ à¨œà¨°à¨¨à¨² à¨ªà¨¬à¨²à¨¿à¨• à¨²à¨¾à¨‡à¨¸à©ˆà¨‚à¨¸ à¨¨à©‚à©° à¨ªà©œà©à¨¹à©‹à¥¤"
+
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with Hitori.  If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "à¨¤à©à¨¸à©€à¨‚ à¨—à¨¨à©‚ à¨œà¨°à¨¨à¨² à¨ªà¨¬à¨²à¨¿à¨• à¨²à¨¾à¨ˆà¨¸à©ˆà¨‚à¨¸ à¨¦à©€ à¨•à¨¾à¨ªà©€ à¨¨à©‚à©° à¨¹à©€à¨Ÿà©‹à¨°à©€ à¨¨à¨¾à¨² à¨²à¨µà©‹à¨—à©‡à¥¤ à¨œà©‡ à¨¨à¨¹à©€à¨‚ à¨¤à¨¾à¨‚ <http://www.gnu.";
+#~ "org/licenses/> à¨µà©‡à¨–à©‹à¥¤"
diff --git a/po/pl.po b/po/pl.po
index 3ae3b87..3fd1ff1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-06-27 20:39+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-08-31 01:21+0200\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag gmail com>\n"
 "Language-Team: Polish <community-poland mozilla org>\n"
@@ -29,12 +29,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Gra logiczna Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;puzle;gra;logiczna;siatka;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -151,17 +149,14 @@ msgstr "Witryna gry Hitori"
 msgid "Enable debug mode"
 msgstr "WÅ‚Ä…cza tryb debugowania"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Ziarno generowania planszy"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "â€” gra logiczna Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -175,8 +170,6 @@ msgstr "ZatrzymaÄ‡ bieÅ¼Ä…cÄ… grÄ™?"
 msgid "Keep _Playing"
 msgstr "_Graj dalej"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/pt.po b/po/pt.po
index b2ef056..ee1ec40 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Hitori\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-01-02 10:02+0000\n"
 "Last-Translator: Tiago Santos <tiagofsantos81 sapo pt>\n"
 "Language-Team: PortuguÃªs <gnome_pt yahoogroups com>\n"
@@ -30,12 +30,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Jogue os puzzles Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;jogo;lÃ³gica;grelha;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,23 +124,23 @@ msgstr "Tamanho do tabuleiro"
 msgid "The size of the board, in cells."
 msgstr "O tamanho do tabuleiro, em cÃ©lulas."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "ImpossÃvel mostrar o conteÃºdo da ajuda"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Um jogo de lÃ³gica originalmente desenhado por Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Pedro Albuquerque <palbuquerque73 gmail com>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "PÃ¡gina Web do Hitori"
 
@@ -150,17 +148,14 @@ msgstr "PÃ¡gina Web do Hitori"
 msgid "Enable debug mode"
 msgstr "Ativar modo de depuraÃ§Ã£o"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Semente de geraÃ§Ã£o do tabuleiro"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- jogar um jogo de Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -174,8 +169,6 @@ msgstr "Quer parar o jogo atual?"
 msgid "Keep _Playing"
 msgstr "_Continuar a jogar"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 906a4fa..dfce6d5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=hitori&";
-"keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2016-12-26 06:42-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff gnome org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome com>\n"
@@ -31,12 +31,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Jogue o quebra-cabeÃ§a Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "quebra cabeÃ§a;quebra-cabeÃ§a;jogo;lÃ³gica;grade;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -128,25 +126,25 @@ msgstr "Tamanho do tabuleiro"
 msgid "The size of the board, in cells."
 msgstr "O tamanho do tabuleiro, em cÃ©lulas."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "O conteÃºdo de ajuda nÃ£o pode ser exibido"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Um quebra-cabeÃ§a lÃ³gico criado por Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Og Maciel <ogmaciel gnome org>\n"
 "Flamarion Jorge <jorge flamarion gmail com>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Website do Hitori"
 
@@ -154,17 +152,14 @@ msgstr "Website do Hitori"
 msgid "Enable debug mode"
 msgstr "Habilitar o modo de depuraÃ§Ã£o"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Escolha um nÃºmero para gerar o tabuleiro"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Jogar uma partida de Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -178,8 +173,6 @@ msgstr "VocÃª deseja parar o jogo atual?"
 msgid "Keep _Playing"
 msgstr "Continuar jo_gando"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/ro.po b/po/ro.po
index c76fb32..cfd9c1c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=hitori";
-"&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-06-19 10:21+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2012-02-11 22:02+0200\n"
 "Last-Translator: Daniel È˜erbÄƒnescu <daniel serbanescu tk>\n"
 "Language-Team: Echipa de traducere Ã®n limba romÃ¢nÄƒ Gnome RomÃ¢nia <gnomero-"
@@ -22,146 +22,199 @@ msgstr ""
 "X-Generator: Virtaal 0.7.0\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:8 ../src/main.c:237
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
-#: ../data/hitori.desktop.in.h:2
+#. Translators: the brief summary of the application as it appears in a software center.
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "JoacÄƒ puzzle-ul Hitori"
 
-#: ../data/hitori.ui.h:1
-msgid "10Ã—10"
-msgstr "10x10"
+#: data/org.gnome.Hitori.desktop.in:6
+msgid "puzzle;game;logic;grid;"
+msgstr ""
+
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
+#. Translators: the name of the application as it appears in a software center
+#: data/org.gnome.Hitori.appdata.xml.in:9
+#, fuzzy
+msgid "GNOME Hitori"
+msgstr "Hitori"
 
-#: ../data/hitori.ui.h:2
+#. Translators: These are the application description paragraphs in the AppData file.
+#: data/org.gnome.Hitori.appdata.xml.in:16
+msgid "Hitori is a logic game similar to the popular game of Sudoku."
+msgstr ""
+
+#: data/org.gnome.Hitori.appdata.xml.in:17
+msgid ""
+"You play the game against the clock, aiming to eliminate all the duplicate "
+"numbers in each row and column in the fastest time. Multiple sizes of game "
+"board are supported, and you can place markers on cells to help work out the "
+"solution. If you get stuck, the game can give you a hint."
+msgstr ""
+
+#: data/hitori-menus.ui:8 src/main.c:305
+#, fuzzy
+msgid "_New Game"
+msgstr "_Joc"
+
+#: data/hitori-menus.ui:12
+msgid "Board _Size"
+msgstr "_Dimensiunea tablei"
+
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:7
-msgid "Board _Size"
-msgstr "_Dimensiunea tablei"
-
-#: ../data/hitori.ui.h:9
-msgid "_Game"
-msgstr "_Joc"
+#: data/hitori-menus.ui:41
+msgid "10Ã—10"
+msgstr "10x10"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../data/hitori.ui.h:11
-msgid "_Hint"
-msgstr "_Indiciu"
-
-#: ../data/hitori.ui.h:12
-msgid "_Settings"
-msgstr "_ConfigurÄƒri"
+#: data/hitori-menus.ui:55
+msgid "_About"
+msgstr ""
 
-#: ../src/interface.c:72
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "FiÈ™ierul UI â€ž%sâ€ nu a putut fi Ã®ncÄƒrcat"
+#: data/hitori-menus.ui:59 src/rules.c:272
+msgid "_Quit"
+msgstr ""
 
-#: ../src/interface.c:539
-msgid "The help contents could not be displayed"
-msgstr "Textul de ajutor nu a putut fi afiÈ™at"
+#: data/hitori.ui:29
+msgid "Undo your last move"
+msgstr ""
 
-#: ../src/interface.c:560
-msgid ""
-"Hitori is free software: you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation, either version 3 of the License, or (at your option) any later "
-"version."
+#: data/hitori.ui:51
+msgid "Redo a move"
 msgstr ""
-"Hitori este software liber: Ã®l puteÈ›i redistribui È™i/sau modifica Ã®n "
-"conformitate cu termenii LicenÈ›ei Publice Generale GNU, aÈ™a cum este "
-"publicatÄƒ de FundaÈ›ia pentru Software Liber; fie versiunea 3 a LicenÈ›ei, fie "
-"(la latitudinea dumneavoastrÄƒ) orice versiune ulterioarÄƒ."
 
-#: ../src/interface.c:564
-msgid ""
-"Hitori is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
+#: data/hitori.ui:75
+msgid "Get a hint for your next move"
 msgstr ""
-"Hitori este distribuit cu speranÈ›a cÄƒ va fi util, dar FÄ‚RÄ‚ NICI O GARANÈšIE, "
-"fÄƒrÄƒ garanÈ›ie implicitÄƒ de VANDABILITATE È™i CONFORMITATE UNUI ANUMIT SCOP.  "
-"ConsultaÈ›i LicenÈ›a PublicÄƒ GeneralÄƒ GNU pentru detalii."
 
-#: ../src/interface.c:568
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Hitori.  If not, see <http://www.gnu.org/licenses/>."
+#: data/org.gnome.hitori.gschema.xml:6
+#, fuzzy
+msgid "Board size"
+msgstr "_Dimensiunea tablei"
+
+#: data/org.gnome.hitori.gschema.xml:7
+msgid "The size of the board, in cells."
 msgstr ""
-"Ar trebui sÄƒ fi primit o copie a LicenÈ›ei Publice Generale GNU Ã®mpreunÄƒ cu "
-"Hitori; dacÄƒ nu, consultaÈ›i <http://www.gnu.org/licenses/>."
 
-#: ../src/interface.c:580
+#: src/interface.c:649
+msgid "The help contents could not be displayed"
+msgstr "Textul de ajutor nu a putut fi afiÈ™at"
+
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Drepturi de autor Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:581
-msgid "A logic puzzle designed by Nikoli."
+#: src/interface.c:674
+#, fuzzy
+msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Un puzzle de logicÄƒ conceput de Nikoli."
 
-#: ../src/interface.c:583
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Cristian BuzdugÄƒ <cristianbzdg gmail com>"
 
-#: ../src/interface.c:587
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Pagina de internet Hitori"
 
-#: ../src/main.c:76
-msgid "Do you want to stop the current game?"
-msgstr "DoriÈ›i sÄƒ opriÈ›i jocul curent?"
-
-#. Translators: this is the format for the timer label. The first parameter is the number of minutes which 
have elapsed since the start of the
-#. * game; the second parameter is the number of seconds.
-#: ../src/main.c:150
-#, c-format
-msgid "Time: %02u:%02u"
-msgstr "Timp: %02u:%02u"
-
-#: ../src/main.c:226
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "ActiveazÄƒ modul de depanare"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:228
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Cod de generare a tablei"
 
-#. Options
-#: ../src/main.c:241
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- PorniÈ›i un joc de Hitori"
 
-#: ../src/main.c:251
-msgid "Command line options could not be parsed"
+#: src/main.c:235
+#, fuzzy, c-format
+msgid "Command line options could not be parsed: %s\n"
 msgstr "OpÈ›iunile din linia de comandÄƒ nu au putut fi procesate"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:266
-#, c-format
-msgid "You've won in a time of %02u:%02u!"
+#: src/main.c:301
+msgid "Do you want to stop the current game?"
+msgstr "DoriÈ›i sÄƒ opriÈ›i jocul curent?"
+
+#: src/main.c:304
+msgid "Keep _Playing"
+msgstr ""
+
+#: src/rules.c:267
+#, fuzzy, c-format
+msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "AÈ›i cÃ¢È™tigat cu timpul de %02u:%02u!"
+
+#: src/rules.c:273
+msgid "_Play Again"
+msgstr ""
+
+#~ msgid "_Hint"
+#~ msgstr "_Indiciu"
+
+#~ msgid "_Settings"
+#~ msgstr "_ConfigurÄƒri"
+
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "FiÈ™ierul UI â€ž%sâ€ nu a putut fi Ã®ncÄƒrcat"
+
+#~ msgid ""
+#~ "Hitori is free software: you can redistribute it and/or modify it under "
+#~ "the terms of the GNU General Public License as published by the Free "
+#~ "Software Foundation, either version 3 of the License, or (at your option) "
+#~ "any later version."
+#~ msgstr ""
+#~ "Hitori este software liber: Ã®l puteÈ›i redistribui È™i/sau modifica Ã®n "
+#~ "conformitate cu termenii LicenÈ›ei Publice Generale GNU, aÈ™a cum este "
+#~ "publicatÄƒ de FundaÈ›ia pentru Software Liber; fie versiunea 3 a LicenÈ›ei, "
+#~ "fie (la latitudinea dumneavoastrÄƒ) orice versiune ulterioarÄƒ."
+
+#~ msgid ""
+#~ "Hitori is distributed in the hope that it will be useful, but WITHOUT ANY "
+#~ "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+#~ "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+#~ "details."
+#~ msgstr ""
+#~ "Hitori este distribuit cu speranÈ›a cÄƒ va fi util, dar FÄ‚RÄ‚ NICI O "
+#~ "GARANÈšIE, fÄƒrÄƒ garanÈ›ie implicitÄƒ de VANDABILITATE È™i CONFORMITATE UNUI "
+#~ "ANUMIT SCOP.  ConsultaÈ›i LicenÈ›a PublicÄƒ GeneralÄƒ GNU pentru detalii."
+
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with Hitori.  If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Ar trebui sÄƒ fi primit o copie a LicenÈ›ei Publice Generale GNU Ã®mpreunÄƒ "
+#~ "cu Hitori; dacÄƒ nu, consultaÈ›i <http://www.gnu.org/licenses/>."
+
+#~ msgid "Time: %02u:%02u"
+#~ msgstr "Timp: %02u:%02u"
diff --git a/po/ru.po b/po/ru.po
index 5d99eaf..abd3b8f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-02-26 08:18+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-03-14 21:06+0400\n"
 "Last-Translator: Yuri Myasoedov <ymyasoedov yandex ru>\n"
 "Language-Team: Ñ€ÑƒÑÑÐºÐ¸Ð¹ <gnome-cyr gnome org>\n"
@@ -30,12 +30,10 @@ msgstr "Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 msgid "Play the Hitori puzzle game"
 msgstr "Ð˜Ð³Ñ€Ð°-Ð³Ð¾Ð»Ð¾Ð²Ð¾Ð»Ð¾Ð¼ÐºÐ° Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "Ð³Ð¾Ð»Ð¾Ð²Ð¾Ð»Ð¾Ð¼ÐºÐ°;Ð¸Ð³Ñ€Ð°;Ð»Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ°Ñ;Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð°;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -127,23 +125,23 @@ msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ð¿Ð¾Ð»Ñ"
 msgid "The size of the board, in cells."
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ð¿Ð¾Ð»Ñ Ð² ÐºÐ»ÐµÑ‚ÐºÐ°Ñ…."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ ÑÐ¿Ñ€Ð°Ð²ÐºÐ¸"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "ÐÐ²Ñ‚Ð¾Ñ€ÑÐºÐ¸Ðµ Ð¿Ñ€Ð°Ð²Ð° Â© 2007â€“2010 Ð¤Ð¸Ð»Ð¸Ð¿ Ð£Ð¸Ð·Ð½ÑÐ»"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Ð›Ð¾Ð³Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ð³Ð¾Ð»Ð¾Ð²Ð¾Ð»Ð¾Ð¼ÐºÐ°, ÑÐ¾Ð·Ð´Ð°Ð½Ð½Ð°Ñ ÐÐ¸ÐºÐ¾Ð»Ð¸"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Ð®Ñ€Ð¸Ð¹ ÐœÑÑÐ¾ÐµÐ´Ð¾Ð² <ymyasoedov yandex ru>, 2011-2015"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Ð’ÐµÐ±-ÑÐ°Ð¹Ñ‚ Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 
@@ -151,17 +149,14 @@ msgstr "Ð’ÐµÐ±-ÑÐ°Ð¹Ñ‚ Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 msgid "Enable debug mode"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ñ€ÐµÐ¶Ð¸Ð¼ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Ð—Ð°ÑÐµÑÑ‚ÑŒ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸ÑŽ Ð¿Ð¾Ð»Ñ"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "â€” Ð¸Ð³Ñ€Ð°Ñ‚ÑŒ Ð² Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -175,8 +170,6 @@ msgstr "Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¾ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñ‚ÐµÐºÑƒÑ‰ÑƒÑŽ Ð¸Ð³Ñ€Ñƒ?"
 msgid "Keep _Playing"
 msgstr "_ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð³Ñ€Ñƒ"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/sk.po b/po/sk.po
index 3e64e97..02959c6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-01-18 22:09+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-01-22 15:12+0100\n"
 "Last-Translator: DuÅ¡an Kazik <prescott66 gmail com>\n"
 "Language-Team: Slovak <gnome-sk-list gnome org>\n"
@@ -28,12 +28,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Hrajte hru Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "hlavolam;hra;logickÃ¡;logika;mrieÅ¾ka;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,23 +124,23 @@ msgstr "VeÄ¾kosÅ¥ hracej plochy"
 msgid "The size of the board, in cells."
 msgstr "PoÄet buniek hracej plochy."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Obsah pomocnÃka sa nepodarilo zobraziÅ¥"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "AutorskÃ© prÃ¡va Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Hlavolam pÃ´vodne vytvorenÃ½ Nikolim"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "DuÅ¡an Kazik <prescott66 gmail com>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "WebovÃ¡ strÃ¡nka aplikÃ¡cie Hitori"
 
@@ -152,17 +150,14 @@ msgid "Enable debug mode"
 msgstr "PovolÃ reÅ¾im ladenia"
 
 # cmd desc
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "NÃ¡hodnÃ© generovanie hracej plochy"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Play a game of Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -177,8 +172,6 @@ msgstr "Chcete preruÅ¡iÅ¥ aktuÃ¡lnu hru?"
 msgid "Keep _Playing"
 msgstr "PokraÄovaÅ¥ v _hre"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/sl.po b/po/sl.po
index f87949c..251a588 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,13 +8,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-02-14 09:00+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-02-14 09:00+0100\n"
 "Last-Translator: Matej UrbanÄiÄ <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
-"Language: sl_SI\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,12 +32,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Igraj miselno igro Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "sestavljanka;igra;logika;polja;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -128,23 +126,23 @@ msgstr "Velikost ploÅ¡Äe"
 msgid "The size of the board, in cells."
 msgstr "Velikost igralne ploÅ¡Äe v celicah"
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Vsebine pomoÄi ni mogoÄe prikazati"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Avtorske pravice Â© 2007-2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Miselna igra, ki jo je zasnoval Nikoli. "
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Andrej Å½nidarÅ¡iÄ, <andrej znidarsic gmail com>"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "SpletiÅ¡Äe Hitori"
 
@@ -152,17 +150,14 @@ msgstr "SpletiÅ¡Äe Hitori"
 msgid "Enable debug mode"
 msgstr "OmogoÄi razhroÅ¡Äevalni naÄin"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Seme za ustvarjanje ploÅ¡Äe"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Igrajte igro Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -176,8 +171,6 @@ msgstr "Ali Å¾elite konÄati trenutno igro?"
 msgid "Keep _Playing"
 msgstr "Nadaljuj _igranje"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/sr.po b/po/sr.po
index 0e56ca9..68d1514 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=hitori&";
-"keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-01-18 22:09+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-02-21 07:09+0200\n"
 "Last-Translator: ÐœÐ¸Ñ€Ð¾ÑÐ»Ð°Ð² ÐÐ¸ÐºÐ¾Ð»Ð¸Ñ› <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
@@ -28,12 +28,10 @@ msgstr "Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 msgid "Play the Hitori puzzle game"
 msgstr "Ð˜Ð³Ñ€Ð°Ñ˜Ñ‚Ðµ Ð¸Ð³Ñ€Ñƒ ÑÐ»Ð°Ð³Ð°Ð»Ð¸Ñ†Ð° Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "ÑÐ»Ð°Ð³Ð°Ð»Ð¸Ñ†Ð°;Ð¸Ð³Ñ€Ð°;Ð»Ð¾Ð³Ð¸ÐºÐ°;Ð¼Ñ€ÐµÐ¶Ð°;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -125,26 +123,26 @@ msgstr "Ð’ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð° Ñ‚Ð°Ð±Ð»Ðµ"
 msgid "The size of the board, in cells."
 msgstr "Ð’ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð° Ñ‚Ð°Ð±Ð»Ðµ, Ñƒ Ð¿Ð¾Ñ™Ð¸Ð¼Ð°."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð¶ÐµÐ¼ ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜ Ð¿Ð¾Ð¼Ð¾Ñ›Ð¸"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "ÐÑƒÑ‚Ð¾Ñ€ÑÐºÐ° Ð¿Ñ€Ð°Ð²Ð° Â© 2007â€“2010 Ð¤Ð¸Ð»Ð¸Ð¿ Ð’Ð¸Ñ‚Ð½Ð°Ð»"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Ð›Ð¾Ð³Ð¸Ñ‡ÐºÐ° ÑÐ»Ð°Ð³Ð°Ð»Ð¸Ñ†Ð° ÐºÐ¾Ñ˜Ñƒ Ñ˜Ðµ Ð¿Ñ€Ð²Ð¾Ð±Ð¸Ñ‚Ð½Ð¾ Ð¾ÑÐ¼Ð¸ÑÐ»Ð¸Ð¾ ÐÐ¸ÐºÐ¾Ð»Ð¸"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "  ÐœÐ¸Ñ€Ð¾ÑÐ»Ð°Ð² ÐÐ¸ÐºÐ¾Ð»Ð¸Ñ› <miroslavnikolic rocketmail com>  \n"
 "\n"
 "http://prevod.org â€” Ð¿Ñ€ÐµÐ²Ð¾Ð´ Ð½Ð° ÑÑ€Ð¿ÑÐºÐ¸ Ñ˜ÐµÐ·Ð¸Ðº"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Ð’ÐµÐ± ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ˜Ð°"
 
@@ -152,17 +150,14 @@ msgstr "Ð’ÐµÐ± ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ˜Ð°"
 msgid "Enable debug mode"
 msgstr "Ð£ÐºÑ™ÑƒÑ‡ÑƒÑ˜Ðµ ÐºÐ¾Ð´ Ð·Ð° Ñ‚Ñ€Ð°Ð¶ÐµÑšÐµ Ð³Ñ€ÐµÑˆÐ°ÐºÐ°"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Ð¡ÐµÑ˜Ðµ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ˜Ñƒ Ñ‚Ð°Ð±Ð»Ðµ"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "â€” Ð˜Ð³Ñ€Ð°Ñ˜Ñ‚Ðµ Ð¸Ð³Ñ€Ñƒ Ð¥Ð¸Ñ‚Ð¾Ñ€Ð¸"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -176,8 +171,6 @@ msgstr "Ð”Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð·Ð°ÑƒÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ñ‚ÐµÐºÑƒÑ›Ñƒ Ð¸Ð³Ñ€Ñƒ?"
 msgid "Keep _Playing"
 msgstr "_ÐÐ°ÑÑ‚Ð°Ð²Ð¸ Ð¸Ð³Ñ€Ñƒ"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/sr latin po b/po/sr latin po
index c80aeca..8f7a8d6 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -5,18 +5,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=hitori&";
-"keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-01-18 22:09+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-02-21 07:09+0200\n"
 "Last-Translator: Miroslav NikoliÄ‡ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <(nothing)>\n"
-"Language: sr\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
@@ -28,12 +28,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Igrajte igru slagalica Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "slagalica;igra;logika;mreÅ¾a;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -55,11 +53,11 @@ msgid ""
 "board are supported, and you can place markers on cells to help work out the "
 "solution. If you get stuck, the game can give you a hint."
 msgstr ""
-"Vi igrate igru protiv vremena, s ciljem da poniÅ¡tite sve udvostruÄene brojeve "
-"u svakom redu i stupcu u Å¡to kraÄ‡em vremenskom roku. PodrÅ¾ano je nekoliko "
-"veliÄina igraÄke table, a moÅ¾ete da postavljate oznaÄavaÄe na poljima da vam "
-"pomognu u pronalaÅ¾enju reÅ¡enja. Ako li vam negde zapne, igra moÅ¾e da vam "
-"doÅ¡apne savet."
+"Vi igrate igru protiv vremena, s ciljem da poniÅ¡tite sve udvostruÄene "
+"brojeve u svakom redu i stupcu u Å¡to kraÄ‡em vremenskom roku. PodrÅ¾ano je "
+"nekoliko veliÄina igraÄke table, a moÅ¾ete da postavljate oznaÄavaÄe na "
+"poljima da vam pomognu u pronalaÅ¾enju reÅ¡enja. Ako li vam negde zapne, igra "
+"moÅ¾e da vam doÅ¡apne savet."
 
 #: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
@@ -125,26 +123,26 @@ msgstr "VeliÄina table"
 msgid "The size of the board, in cells."
 msgstr "VeliÄina table, u poljima."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "Ne mogu da prikaÅ¾em sadrÅ¾aj pomoÄ‡i"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Autorska prava Â© 2007â€“2010 Filip Vitnal"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "LogiÄka slagalica koju je prvobitno osmislio Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "  Miroslav NikoliÄ‡ <miroslavnikolic rocketmail com>  \n"
 "\n"
 "http://prevod.org â€” prevod na srpski jezik"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Veb stranica Hitorija"
 
@@ -152,17 +150,14 @@ msgstr "Veb stranica Hitorija"
 msgid "Enable debug mode"
 msgstr "UkljuÄuje kod za traÅ¾enje greÅ¡aka"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Seje generaciju table"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "â€” Igrajte igru Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -176,8 +171,6 @@ msgstr "Da li Å¾elite da zaustavite tekuÄ‡u igru?"
 msgid "Keep _Playing"
 msgstr "_Nastavi igru"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/sv.po b/po/sv.po
index c27620d..dd70929 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-12-24 18:33+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2016-12-25 22:31+0100\n"
 "Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -28,12 +28,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Spela pusselspelet Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "pussel;spel;logik;rutnÃ¤t;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -124,19 +122,19 @@ msgstr "BrÃ¤dstorlek"
 msgid "The size of the board, in cells."
 msgstr "BrÃ¤dets storlek i celler."
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "HjÃ¤lpinnehÃ¥llet kunde inte visas"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Ett logiskt pusselspel ursprungligen designat av Nikoli"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po danielnylander se>\n"
@@ -145,7 +143,7 @@ msgstr ""
 "Skicka synpunkter pÃ¥ Ã¶versÃ¤ttningen till\n"
 "<tp-sv listor tp-sv se>."
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Webbplats fÃ¶r Hitori"
 
@@ -153,17 +151,14 @@ msgstr "Webbplats fÃ¶r Hitori"
 msgid "Enable debug mode"
 msgstr "Aktivera felsÃ¶kningslÃ¤get"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "VÃ¤lj frÃ¶ fÃ¶r brÃ¤dgenerering"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Spela en omgÃ¥ng av Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -177,8 +172,6 @@ msgstr "Vill du stoppa det aktuella spelet?"
 msgid "Keep _Playing"
 msgstr "FortsÃ¤tt s_pela"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/tr.po b/po/tr.po
index ed0ec28..86795c5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-06-27 20:39+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-08-13 18:56+0300\n"
 "Last-Translator: Muhammet Kara <muhammetk gmail com>\n"
 "Language-Team: Turkish <gnometurk gnome org>\n"
@@ -30,12 +30,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Hitori bulmaca oyununu oynayÄ±n"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "bulmaca;yapboz;oyun;mantÄ±k;Ä±zgara;tablo;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -152,17 +150,14 @@ msgstr "Hitori Web SayfasÄ±"
 msgid "Enable debug mode"
 msgstr "Hata ayÄ±klama kipini etkinleÅŸtir"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Tahta oluÅŸumu iÃ§in bir baÅŸlatÄ±cÄ± girin"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- Bir Hitori oyunu oyna"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -176,8 +171,6 @@ msgstr "GeÃ§erli oyunu durdurmak istiyor musunuz?"
 msgid "Keep _Playing"
 msgstr "Oynamaya _Devam Et"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/uk.po b/po/uk.po
index fa29b34..a8b093f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=hitori";
-"&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-03-20 19:12+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-03-22 09:22+0300\n"
 "Last-Translator: Daniel Korostil <ted korostiled gmail com>\n"
 "Language-Team: linux.org.ua\n"
@@ -16,8 +16,8 @@ msgstr ""
 "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"
+"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: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
@@ -30,12 +30,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "Ð—Ñ–Ð³Ñ€Ð°Ñ‚Ð¸ Ð³Ð¾Ð»Ð¾Ð²Ð¾Ð»Ð¾Ð¼ÐºÐ° Hitori"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "Ð³Ð¾Ð»Ð¾Ð²Ð¾Ð»Ð¾Ð¼ÐºÐ°;Ð³Ñ€Ð°;Ð»Ð¾Ð³Ñ–Ñ‡Ð½Ð°;ÑÑ–Ñ‚ÐºÐ°;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -126,23 +124,23 @@ msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ€ Ð´Ð¾ÑˆÐºÐ¸"
 msgid "The size of the board, in cells."
 msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ€ Ð´Ð¾ÑˆÐºÐ¸, Ñƒ ÐºÐ¾Ð¼Ñ–Ñ€ÐºÐ°Ñ…."
 
-#: src/interface.c:642
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð²Ð¼Ñ–ÑÑ‚ Ð´Ð¾Ð²Ñ–Ð´ÐºÐ¸"
 
-#: src/interface.c:666
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:667
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Ð›Ð¾Ð³Ñ–Ñ‡Ð½Ð° Ð³Ð¾Ð»Ð¾Ð²Ð¾Ð»Ð¾Ð¼ÐºÐ°, ÑÐºÑƒ Ð¿Ñ€Ð¸Ð´ÑƒÐ¼Ð°Ð² Nikoli"
 
-#: src/interface.c:669
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "ÐœÐ¸ÐºÐ¾Ð»Ð° Ð¢ÐºÐ°Ñ‡ <Stuartlittle1970 gmail com>, 2013."
 
-#: src/interface.c:673
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Ð¡Ð°Ð¹Ñ‚ Hitori"
 
@@ -150,17 +148,14 @@ msgstr "Ð¡Ð°Ð¹Ñ‚ Hitori"
 msgid "Enable debug mode"
 msgstr "Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Ð—Ð°ÑÑ–ÑÑ‚Ð¸ Ð´Ð¾ÑˆÐºÑƒ Ð½Ð°Ð²Ð¼Ð°Ð½Ð½Ñ"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "â€” Ð“Ñ€Ð°Ñ‚Ð¸ Ñƒ Hitori"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -174,8 +169,6 @@ msgstr "Ð—ÑƒÐ¿Ð¸Ð½Ð¸Ñ‚Ð¸ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ñƒ Ð³Ñ€Ñƒ?"
 msgid "Keep _Playing"
 msgstr "_Ð”Ð°Ð»Ñ– Ð³Ñ€Ð°Ñ‚Ð¸"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/vi.po b/po/vi.po
index 8178893..ff18cd3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=hitori&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2011-04-10 10:36+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2011-05-05 20:53+0700\n"
 "Last-Translator: LÃª TrÆ°á»ng An <xinemdungkhoc1 gmail com>\n"
 "Language-Team: Vietnamese <gnomevi-list lists sourceforge net>\n"
@@ -17,130 +18,197 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/hitori.desktop.in.h:1
-#: ../data/hitori.ui.h:8
-#: ../src/main.c:239
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
-#: ../data/hitori.desktop.in.h:2
+#. Translators: the brief summary of the application as it appears in a software center.
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "ChÆ¡i trÃ² chÆ¡i giáº£i Ä‘á»‘ Hitori"
 
-#: ../data/hitori.ui.h:1
-msgid "10Ã—10"
-msgstr "10Ã—10"
+#: data/org.gnome.Hitori.desktop.in:6
+msgid "puzzle;game;logic;grid;"
+msgstr ""
+
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
+#. Translators: the name of the application as it appears in a software center
+#: data/org.gnome.Hitori.appdata.xml.in:9
+#, fuzzy
+msgid "GNOME Hitori"
+msgstr "Hitori"
+
+#. Translators: These are the application description paragraphs in the AppData file.
+#: data/org.gnome.Hitori.appdata.xml.in:16
+msgid "Hitori is a logic game similar to the popular game of Sudoku."
+msgstr ""
+
+#: data/org.gnome.Hitori.appdata.xml.in:17
+msgid ""
+"You play the game against the clock, aiming to eliminate all the duplicate "
+"numbers in each row and column in the fastest time. Multiple sizes of game "
+"board are supported, and you can place markers on cells to help work out the "
+"solution. If you get stuck, the game can give you a hint."
+msgstr ""
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:8 src/main.c:305
+#, fuzzy
+msgid "_New Game"
+msgstr "_TrÃ² chÆ¡i"
+
+#: data/hitori-menus.ui:12
+msgid "Board _Size"
+msgstr "_Cá»¡ bÃ n cá»"
+
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:7
-msgid "Board _Size"
-msgstr "_Cá»¡ bÃ n cá»"
-
-#: ../data/hitori.ui.h:9
-msgid "_Game"
-msgstr "_TrÃ² chÆ¡i"
+#: data/hitori-menus.ui:41
+msgid "10Ã—10"
+msgstr "10Ã—10"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "Trá»£ _giÃºp"
 
-#: ../data/hitori.ui.h:11
-msgid "_Hint"
-msgstr "Gá»£_i Ã½"
+#: data/hitori-menus.ui:55
+msgid "_About"
+msgstr ""
 
-#: ../data/hitori.ui.h:12
-msgid "_Settings"
-msgstr "_Thiáº¿t láºp"
+#: data/hitori-menus.ui:59 src/rules.c:272
+msgid "_Quit"
+msgstr ""
 
-#: ../src/interface.c:72
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "KhÃ´ng thá»ƒ náº¡p táºp tin UI â€œ%sâ€"
+#: data/hitori.ui:29
+msgid "Undo your last move"
+msgstr ""
 
-#: ../src/interface.c:537
-msgid "The help contents could not be displayed"
-msgstr "KhÃ´ng thá»ƒ hiá»‡n ná»™i dung trá»£ giÃºp"
+#: data/hitori.ui:51
+msgid "Redo a move"
+msgstr ""
 
-#: ../src/interface.c:558
-msgid "Hitori is free software: you can redistribute it and/or modify it under the terms of the GNU General 
Public License as published by the Free Software Foundation, either version 3 of the License, or (at your 
option) any later version."
-msgstr "Hitori lÃ  pháº§n má»m tá»± do: báº¡n cÃ³ thá»ƒ phÃ¢n phá»‘i láº¡i nÃ³ vÃ /hoáº·c chá»‰nh sá»a nÃ³ dÆ°á»›i cÃ¡i Ä‘iá»u kiá»‡n cá»§a 
Giáº¥y phÃ©p CÃ´ng cá»™ng chung GNU Ä‘Æ°á»£c phÃ¡t hÃ nh bá»Ÿi Tá»• chá»©c Pháº§n má»m Tá»± do, giáº¥y phÃ©p phiÃªn báº£n 3 hoáº·c má»›i hÆ¡n."
+#: data/hitori.ui:75
+msgid "Get a hint for your next move"
+msgstr ""
+
+#: data/org.gnome.hitori.gschema.xml:6
+#, fuzzy
+msgid "Board size"
+msgstr "_Cá»¡ bÃ n cá»"
 
-#: ../src/interface.c:562
-msgid "Hitori is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
for more details."
-msgstr "Hitori Ä‘Æ°á»£c phÃ¢n phá»‘i vá»›i hy vá»ng nÃ³ sáº½ cÃ³ Ãch, nhÆ°ng KHÃ”NG CÃ“ Sá»° Báº¢O Äáº¢M NÃ€O; "
+#: data/org.gnome.hitori.gschema.xml:7
+msgid "The size of the board, in cells."
+msgstr ""
 
-#: ../src/interface.c:566
-msgid "You should have received a copy of the GNU General Public License along with Hitori.  If not, see 
<http://www.gnu.org/licenses/>."
-msgstr "Báº¡n pháº£i nháºn Ä‘Æ°á»£c má»™t báº£n sao cá»§a Giáº¥y phÃ©p CÃ´ng cá»™ng chung GNU cÃ¹ng vá»›i Hitory. Náº¿u khÃ´ng, xem táº¡i 
<http://www.gnu.org/licenses/>."
+#: src/interface.c:649
+msgid "The help contents could not be displayed"
+msgstr "KhÃ´ng thá»ƒ hiá»‡n ná»™i dung trá»£ giÃºp"
 
-#: ../src/interface.c:578
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Báº£n quyá»n Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:579
-msgid "A logic puzzle designed by Nikoli."
+#: src/interface.c:674
+#, fuzzy
+msgid "A logic puzzle originally designed by Nikoli"
 msgstr "Má»™t trÃ² chÆ¡i logic Ä‘Æ°á»£c thiáº¿t káº¿ bá»Ÿi Nikoli."
 
-#: ../src/interface.c:581
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "LÃª TrÆ°á»ng An <xinemdungkhoc1 gmail com>"
 
-#: ../src/interface.c:585
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Trang web cá»§a Hitori"
 
-#: ../src/main.c:76
-msgid "Do you want to stop the current game?"
-msgstr "Báº¡n cÃ³ muá»‘n dá»«ng trÃ² chÆ¡i?"
-
-#. Translators: this is the format for the timer label. The first parameter is the number of minutes which 
have elapsed since the start of the
-#. * game; the second parameter is the number of seconds.
-#: ../src/main.c:150
-#, c-format
-msgid "Time: %02u:%02u"
-msgstr "Thá»i gian: %02u:%02u"
-
-#: ../src/main.c:226
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "Báºt cháº¿ Ä‘á»™ gá»¡ lá»—i"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:228
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "Máº§m phÃ¡t sinh bÃ n cá»"
 
-#. Options
-#: ../src/main.c:243
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- ChÆ¡i má»™t trÃ² trong Hitory"
 
-#: ../src/main.c:253
-msgid "Command line options could not be parsed"
+#: src/main.c:235
+#, fuzzy, c-format
+msgid "Command line options could not be parsed: %s\n"
 msgstr "KhÃ´ng thá»ƒ phÃ¢n tÃch cÃº phÃ¡p tÃ¹y chá»‰nh báº±ng dÃ²ng lá»‡nh"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:266
-#, c-format
-msgid "You've won in a time of %02u:%02u!"
+#: src/main.c:301
+msgid "Do you want to stop the current game?"
+msgstr "Báº¡n cÃ³ muá»‘n dá»«ng trÃ² chÆ¡i?"
+
+#: src/main.c:304
+msgid "Keep _Playing"
+msgstr ""
+
+#: src/rules.c:267
+#, fuzzy, c-format
+msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "Báº¡n Ä‘Ã£ tháº¯ng trong %02u phÃºt %02u giÃ¢y!"
 
+#: src/rules.c:273
+msgid "_Play Again"
+msgstr ""
+
+#~ msgid "_Hint"
+#~ msgstr "Gá»£_i Ã½"
+
+#~ msgid "_Settings"
+#~ msgstr "_Thiáº¿t láºp"
+
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "KhÃ´ng thá»ƒ náº¡p táºp tin UI â€œ%sâ€"
+
+#~ msgid ""
+#~ "Hitori is free software: you can redistribute it and/or modify it under "
+#~ "the terms of the GNU General Public License as published by the Free "
+#~ "Software Foundation, either version 3 of the License, or (at your option) "
+#~ "any later version."
+#~ msgstr ""
+#~ "Hitori lÃ  pháº§n má»m tá»± do: báº¡n cÃ³ thá»ƒ phÃ¢n phá»‘i láº¡i nÃ³ vÃ /hoáº·c chá»‰nh sá»a "
+#~ "nÃ³ dÆ°á»›i cÃ¡i Ä‘iá»u kiá»‡n cá»§a Giáº¥y phÃ©p CÃ´ng cá»™ng chung GNU Ä‘Æ°á»£c phÃ¡t hÃ nh "
+#~ "bá»Ÿi Tá»• chá»©c Pháº§n má»m Tá»± do, giáº¥y phÃ©p phiÃªn báº£n 3 hoáº·c má»›i hÆ¡n."
+
+#~ msgid ""
+#~ "Hitori is distributed in the hope that it will be useful, but WITHOUT ANY "
+#~ "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+#~ "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+#~ "details."
+#~ msgstr ""
+#~ "Hitori Ä‘Æ°á»£c phÃ¢n phá»‘i vá»›i hy vá»ng nÃ³ sáº½ cÃ³ Ãch, nhÆ°ng KHÃ”NG CÃ“ Sá»° Báº¢O Äáº¢M "
+#~ "NÃ€O; "
+
+#~ msgid ""
+#~ "You should have received a copy of the GNU General Public License along "
+#~ "with Hitori.  If not, see <http://www.gnu.org/licenses/>."
+#~ msgstr ""
+#~ "Báº¡n pháº£i nháºn Ä‘Æ°á»£c má»™t báº£n sao cá»§a Giáº¥y phÃ©p CÃ´ng cá»™ng chung GNU cÃ¹ng vá»›i "
+#~ "Hitory. Náº¿u khÃ´ng, xem táº¡i <http://www.gnu.org/licenses/>."
+
+#~ msgid "Time: %02u:%02u"
+#~ msgstr "Thá»i gian: %02u:%02u"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8f0728a..49a74d5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNOME\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-01-07 11:57+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-01-09 00:13+0800\n"
 "Last-Translator: Mandy Wang <wangmychn gmail com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation lists linux net cn>\n"
@@ -27,12 +27,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "çŽ© Hitori ç›Šæ™ºæ¸¸æˆ"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;game;logic;grid;è§£è°œ;æ¸¸æˆ;é€»è¾‘;ç½‘æ ¼;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -122,25 +120,25 @@ msgstr "é¢æ¿å¤§å°"
 msgid "The size of the board, in cells."
 msgstr "é¢æ¿å¤§å°ï¼Œä¹Ÿå°±æ˜¯æ ¼æ•°ã€‚"
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "å¸®åŠ©å†…å®¹æ— æ³•æ˜¾ç¤º"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "Copyright Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "åŽŸå…ˆç”± Nikoli æ‰€ä½œçš„ä¸€ä¸ªé€»è¾‘ç›Šæ™ºæ¸¸æˆ"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr ""
 "Zhang Miao <mymzhang gmail com>, 2009.\n"
 "Tong Hui <tonghuix gmail com>, 2014."
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori ç½‘ç«™"
 
@@ -148,17 +146,14 @@ msgstr "Hitori ç½‘ç«™"
 msgid "Enable debug mode"
 msgstr "å¯ç”¨è°ƒè¯•æ¨¡å¼"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "è®¾ç½®é¢æ¿ç”Ÿæˆæ‰€ç”¨çš„ç§å"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- è¿›è¡Œä¸€æ¬¡ Hitori æ¸¸æˆ"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -172,8 +167,6 @@ msgstr "æ‚¨è¦åœæ¢å½“å‰æ¸¸æˆä¹ˆï¼Ÿ"
 msgid "Keep _Playing"
 msgstr "ç»§ç»(_P)"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index faf4984..0bb6123 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2014-08-18 23:10+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2014-08-19 20:26+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
@@ -18,164 +18,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.5\n"
 
-#: ../data/hitori.desktop.in.h:1 ../data/hitori.ui.h:12 ../src/main.c:101
+#: data/org.gnome.Hitori.desktop.in:3 data/hitori.ui:12 src/main.c:101
 msgid "Hitori"
 msgstr "Hitori"
 
-#: ../data/hitori.desktop.in.h:2
+#. Translators: the brief summary of the application as it appears in a software center.
+#: data/org.gnome.Hitori.desktop.in:4 data/org.gnome.Hitori.appdata.xml.in:12
 msgid "Play the Hitori puzzle game"
 msgstr "çŽ© Hitori è§£è¬ŽéŠæˆ²"
 
+#: data/org.gnome.Hitori.desktop.in:6
+msgid "puzzle;game;logic;grid;"
+msgstr ""
+
+#: data/org.gnome.Hitori.desktop.in:9
+msgid "org.gnome.Hitori"
+msgstr ""
+
 #. Translators: the name of the application as it appears in a software center
-#: ../data/hitori.appdata.xml.in.h:2
+#: data/org.gnome.Hitori.appdata.xml.in:9
 msgid "GNOME Hitori"
 msgstr "GNOME Hitori"
 
 #. Translators: These are the application description paragraphs in the AppData file.
-#: ../data/hitori.appdata.xml.in.h:4
+#: data/org.gnome.Hitori.appdata.xml.in:16
 msgid "Hitori is a logic game similar to the popular game of Sudoku."
 msgstr "Hitori æ˜¯ä¸€ç¨®é¡žä¼¼æ•¸ç¨çš„é‚è¼¯é¨éŠæˆ²ã€‚"
 
-#: ../data/hitori.appdata.xml.in.h:5
+#: data/org.gnome.Hitori.appdata.xml.in:17
 msgid ""
 "You play the game against the clock, aiming to eliminate all the duplicate "
 "numbers in each row and column in the fastest time. Multiple sizes of game "
 "board are supported, and you can place markers on cells to help work out the "
 "solution. If you get stuck, the game can give you a hint."
-msgstr "ä½ è¦åœ¨æ™‚é™å…§å®ŒæˆéŠæˆ²ï¼Œç›®æ¨™æ˜¯åœ¨æœ€çŸæ™‚é–“å…§æ¸…é™¤æ¯ä¸€æ¬„ã€æ¯ä¸€åˆ—ä¸é‡è¤‡çš„æ•¸å—ã€‚éŠæˆ²ç›¤æ”¯æ´å¤šç¨®å°ºå¯¸ï¼Œä½ å¯ä»¥åœ¨æ ¼åè£æ”¾ä¸Šæ¨™è¨˜ä¾†å”åŠ©æ‰¾å‡ºè§£ç”ã€‚å¦‚æžœä½ å¡é—œäº†ï¼ŒéŠæˆ²å¯ä»¥çµ¦ä½ æç¤ºã€‚"
+msgstr ""
+"ä½ è¦åœ¨æ™‚é™å…§å®ŒæˆéŠæˆ²ï¼Œç›®æ¨™æ˜¯åœ¨æœ€çŸæ™‚é–“å…§æ¸…é™¤æ¯ä¸€æ¬„ã€æ¯ä¸€åˆ—ä¸é‡è¤‡çš„æ•¸å—ã€‚éŠæˆ²"
+"ç›¤æ”¯æ´å¤šç¨®å°ºå¯¸ï¼Œä½ å¯ä»¥åœ¨æ ¼åè£æ”¾ä¸Šæ¨™è¨˜ä¾†å”åŠ©æ‰¾å‡ºè§£ç”ã€‚å¦‚æžœä½ å¡é—œäº†ï¼ŒéŠæˆ²å¯ä»¥"
+"çµ¦ä½ æç¤ºã€‚"
 
-#: ../data/hitori.ui.h:1 ../src/main.c:305
+#: data/hitori-menus.ui:8 src/main.c:305
 msgid "_New Game"
 msgstr "é–‹æ–°å±€(_N)"
 
-#: ../data/hitori.ui.h:2
+#: data/hitori-menus.ui:12
 msgid "Board _Size"
 msgstr "éŠæˆ²ç›¤å¤§å°(_S)"
 
-#: ../data/hitori.ui.h:3
+#: data/hitori-menus.ui:16
 msgid "5Ã—5"
 msgstr "5Ã—5"
 
-#: ../data/hitori.ui.h:4
+#: data/hitori-menus.ui:21
 msgid "6Ã—6"
 msgstr "6Ã—6"
 
-#: ../data/hitori.ui.h:5
+#: data/hitori-menus.ui:26
 msgid "7Ã—7"
 msgstr "7Ã—7"
 
-#: ../data/hitori.ui.h:6
+#: data/hitori-menus.ui:31
 msgid "8Ã—8"
 msgstr "8Ã—8"
 
-#: ../data/hitori.ui.h:7
+#: data/hitori-menus.ui:36
 msgid "9Ã—9"
 msgstr "9Ã—9"
 
-#: ../data/hitori.ui.h:8
+#: data/hitori-menus.ui:41
 msgid "10Ã—10"
 msgstr "10Ã—10"
 
-#: ../data/hitori.ui.h:9
+#: data/hitori-menus.ui:50
 msgid "_Help"
 msgstr "æ±‚åŠ©(_H)"
 
-#: ../data/hitori.ui.h:10
+#: data/hitori-menus.ui:55
 msgid "_About"
 msgstr "é—œæ–¼(_A)"
 
-#: ../data/hitori.ui.h:11 ../src/rules.c:272
+#: data/hitori-menus.ui:59 src/rules.c:272
 msgid "_Quit"
 msgstr "é›¢é–‹(_Q)"
 
-#: ../data/hitori.ui.h:13
+#: data/hitori.ui:29
 msgid "Undo your last move"
 msgstr "é‚„åŽŸä¸Šä¸€æ¥"
 
-#: ../data/hitori.ui.h:14
+#: data/hitori.ui:51
 msgid "Redo a move"
 msgstr "å–æ¶ˆå¾©åŽŸç§»å‹•"
 
-#: ../data/hitori.ui.h:15
+#: data/hitori.ui:75
 msgid "Get a hint for your next move"
 msgstr "çµ¦ä¸‹ä¸€æ¥çš„æç¤º"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:1
+#: data/org.gnome.hitori.gschema.xml:6
 msgid "Board size"
 msgstr "éŠæˆ²ç›¤å¤§å°"
 
-#: ../data/org.gnome.hitori.gschema.xml.h:2
+#: data/org.gnome.hitori.gschema.xml:7
 msgid "The size of the board, in cells."
 msgstr "éŠæˆ²ç›¤å¤§å°ï¼Œä»¥æ ¼åè¨ˆ"
 
-#: ../src/interface.c:87
-#, c-format
-msgid "UI file â€œ%sâ€ could not be loaded"
-msgstr "ç„¡æ³•è¼‰å…¥ UI æª”æ¡ˆã€Œ%sã€"
-
-#: ../src/interface.c:661
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "ç„¡æ³•é¡¯ç¤ºæ±‚åŠ©å…§å®¹"
 
-#: ../src/interface.c:685
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "ç‰ˆæ¬Šæ‰€æœ‰ Â© 2007â€“2010 Philip Withnall"
 
-#: ../src/interface.c:686
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "åŽŸå§‹ç”± Nikoli è¨è¨ˆçš„é‚è¼¯è§£è¬ŽéŠæˆ²"
 
-#: ../src/interface.c:688
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2014"
 
-#: ../src/interface.c:692
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori ç¶²ç«™"
 
-#: ../src/main.c:209
+#: src/main.c:209
 msgid "Enable debug mode"
 msgstr "å•Ÿç”¨é™¤éŒ¯æ¨¡å¼"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
-#: ../src/main.c:211
+#: src/main.c:211
 msgid "Seed the board generation"
 msgstr "éŠæˆ²ç›¤ç”¢ç”Ÿäº‚æ•¸ç¨®å"
 
-#. Options
-#: ../src/main.c:225
+#: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- çŽ© Hitri éŠæˆ²"
 
-#. Print an error
-#: ../src/main.c:235
+#: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
 msgstr "ç„¡æ³•åˆ†æžå‘½ä»¤åˆ—é¸é …ï¼š%s\n"
 
-#: ../src/main.c:301
+#: src/main.c:301
 msgid "Do you want to stop the current game?"
 msgstr "ä½ æ˜¯å¦è¦åœæ¢ç›®å‰çš„éŠæˆ²ï¼Ÿ"
 
-#: ../src/main.c:304
+#: src/main.c:304
 msgid "Keep _Playing"
 msgstr "ç¹¼çºŒçŽ©(_P)"
 
-#. Translators: this is the format for the timer label. The first parameter is the number of minutes which 
have
-#. * elapsed since the start of the game; the second parameter is the number of seconds. In between is the 
ratio
-#. * character and a LTR mark to force minutes on the left in RTL locales. You can probably leave this 
unchanged.
-#: ../src/main.c:382
-#, c-format
-msgid "%02uâˆ¶â€Ž%02u"
-msgstr "%02uâˆ¶â€Ž%02u"
-
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
-#: ../src/rules.c:267
+#: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
 msgstr "ä½ å·²æ–¼ %02u:%02u ç²å‹ï¼"
 
-#: ../src/rules.c:273
+#: src/rules.c:273
 msgid "_Play Again"
 msgstr "å†çŽ©ä¸€æ¬¡(_P)"
+
+#~ msgid "UI file â€œ%sâ€ could not be loaded"
+#~ msgstr "ç„¡æ³•è¼‰å…¥ UI æª”æ¡ˆã€Œ%sã€"
+
+#~ msgid "%02uâˆ¶â€Ž%02u"
+#~ msgstr "%02uâˆ¶â€Ž%02u"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4ecf290..7c039a5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hitori master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=hitori&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-02-26 08:18+0000\n"
+"product=hitori\n"
+"POT-Creation-Date: 2017-10-02 09:08+0100\n"
 "PO-Revision-Date: 2017-02-28 13:53+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <chinese-l10n googlegroups com>\n"
@@ -27,12 +27,10 @@ msgstr "Hitori"
 msgid "Play the Hitori puzzle game"
 msgstr "çŽ© Hitori è§£è¬ŽéŠæˆ²"
 
-#. Translators: Search terms to find this application. Do NOT translate or localise the semicolons! The list 
MUST also end with a semicolon!
 #: data/org.gnome.Hitori.desktop.in:6
 msgid "puzzle;game;logic;grid;"
 msgstr "puzzle;game;logic;grid;ç›Šæ™ºéŠæˆ²;éŠæˆ²;é‚è¼¯;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Hitori.desktop.in:9
 msgid "org.gnome.Hitori"
 msgstr "org.gnome.Hitori"
@@ -122,23 +120,23 @@ msgstr "éŠæˆ²ç›¤å¤§å°"
 msgid "The size of the board, in cells."
 msgstr "éŠæˆ²ç›¤å¤§å°ï¼Œä»¥æ ¼åè¨ˆ"
 
-#: src/interface.c:635
+#: src/interface.c:649
 msgid "The help contents could not be displayed"
 msgstr "ç„¡æ³•é¡¯ç¤ºæ±‚åŠ©å…§å®¹"
 
-#: src/interface.c:659
+#: src/interface.c:673
 msgid "Copyright Â© 2007â€“2010 Philip Withnall"
 msgstr "ç‰ˆæ¬Šæ‰€æœ‰ Â© 2007â€“2010 Philip Withnall"
 
-#: src/interface.c:660
+#: src/interface.c:674
 msgid "A logic puzzle originally designed by Nikoli"
 msgstr "åŽŸå§‹ç”± Nikoli è¨è¨ˆçš„é‚è¼¯è§£è¬ŽéŠæˆ²"
 
-#: src/interface.c:662
+#: src/interface.c:676
 msgid "translator-credits"
 msgstr "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2014"
 
-#: src/interface.c:666
+#: src/interface.c:680
 msgid "Hitori Website"
 msgstr "Hitori ç¶²ç«™"
 
@@ -146,17 +144,14 @@ msgstr "Hitori ç¶²ç«™"
 msgid "Enable debug mode"
 msgstr "å•Ÿç”¨é™¤éŒ¯æ¨¡å¼"
 
-#. Translators: This means to choose a number as the "seed" for random number generation used when creating 
a board
 #: src/main.c:211
 msgid "Seed the board generation"
 msgstr "éŠæˆ²ç›¤ç”¢ç”Ÿäº‚æ•¸ç¨®å"
 
-#. Options
 #: src/main.c:225
 msgid "- Play a game of Hitori"
 msgstr "- çŽ© Hitri éŠæˆ²"
 
-#. Print an error
 #: src/main.c:235
 #, c-format
 msgid "Command line options could not be parsed: %s\n"
@@ -170,8 +165,6 @@ msgstr "æ‚¨æ˜¯å¦è¦åœæ¢ç›®å‰çš„éŠæˆ²ï¼Ÿ"
 msgid "Keep _Playing"
 msgstr "ç¹¼çºŒçŽ©(_P)"
 
-#. Translators: The first parameter is the number of minutes which have elapsed since the start of the game; 
the second parameter is
-#. * the number of seconds.
 #: src/rules.c:267
 #, c-format
 msgid "Youâ€™ve won in a time of %02u:%02u!"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]