diff --git a/locale/pacman_mirrors.pot b/locale/pacman_mirrors.pot
index 489ff27a2759232c45b65427081033ba1adb57e8..e0fb06a31bc17b4bab1ed7711ceb808dee3f1101 100644
--- a/locale/pacman_mirrors.pot
+++ b/locale/pacman_mirrors.pot
@@ -4,14 +4,13 @@
# project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: pacman-mirrors 2.0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-08-17 19:43+0200\n"
+"POT-Creation-Date: 2017-01-12 10:45+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Hugo Posnic <huluti@manjaro.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -19,169 +18,183 @@ msgstr ""
"Generated-By: Babel 2.3.4\n"
#: pacman_mirrors/pacman_mirrors.py:80
+#, python-brace-format
msgid "Warning: Cannot read file '{filename}': {error}"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:116
+#: pacman_mirrors/pacman_mirrors.py:118
msgid "generate new mirrorlist"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:120
+#: pacman_mirrors/pacman_mirrors.py:122
msgid "generation method"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:124
+#: pacman_mirrors/pacman_mirrors.py:126
msgid "branch name"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:127
+#: pacman_mirrors/pacman_mirrors.py:129
msgid "comma separated list of countries where mirrors will be used"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:131
+#: pacman_mirrors/pacman_mirrors.py:133
+msgid "detect country using geolocation, ignored if '--country' is used"
+msgstr ""
+
+#: pacman_mirrors/pacman_mirrors.py:137
msgid "PATH"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:132
+#: pacman_mirrors/pacman_mirrors.py:138
msgid "mirrors list path"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:135
+#: pacman_mirrors/pacman_mirrors.py:141
msgid "FILE"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:136
+#: pacman_mirrors/pacman_mirrors.py:142
msgid "output file"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:139
+#: pacman_mirrors/pacman_mirrors.py:145
msgid "SECONDS"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:140
+#: pacman_mirrors/pacman_mirrors.py:146
msgid "server maximum waiting time"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:143
+#: pacman_mirrors/pacman_mirrors.py:149
msgid ""
-"don't generate mirrorlist if NoUpdate is set to True in the configuration"
-" file"
+"don't generate mirrorlist if NoUpdate is set to True in the configuration "
+"file"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:148
+#: pacman_mirrors/pacman_mirrors.py:154
msgid "interactively generate a custom mirrorlist"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:152
+#: pacman_mirrors/pacman_mirrors.py:158
msgid "print the pacman-mirrors version"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:164
+#: pacman_mirrors/pacman_mirrors.py:170
msgid "Error: Must have root privileges."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:200
+#: pacman_mirrors/pacman_mirrors.py:239
+#, python-brace-format
msgid ""
-"Warning: Custom mirrors file '{path}' doesn't exists. Querying all "
-"servers."
+"argument -c/--country: unknown country '{country}'\n"
+"Available countries are: {country_list}"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:249
+#: pacman_mirrors/pacman_mirrors.py:319
+#, python-brace-format
msgid ""
-"argument -c/--country: unknown country '{country}'\n"
-"Available countries are: {country_list}"
+"Warning: Custom mirrors file '{path}' doesn't exists. Querying all servers."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:298
+#: pacman_mirrors/pacman_mirrors.py:343
msgid ":: Querying servers, this may take some time..."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:332
+#: pacman_mirrors/pacman_mirrors.py:375
+#, python-brace-format
msgid "Error: Failed to reach the server: {reason}"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:336
+#: pacman_mirrors/pacman_mirrors.py:379
+#, python-brace-format
msgid "Error: The server couldn't fulfill the request: {code}"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:339
+#: pacman_mirrors/pacman_mirrors.py:384
msgid "Error: Failed to reach the server: Timeout."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:343
+#: pacman_mirrors/pacman_mirrors.py:388
msgid "Error: Cannot read server response: HTTPException."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:369
+#: pacman_mirrors/pacman_mirrors.py:412
msgid "Warning: Wrong date format in 'state' file."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:391 pacman_mirrors/pacman_mirrors.py:427
+#: pacman_mirrors/pacman_mirrors.py:431 pacman_mirrors/pacman_mirrors.py:466
+#, python-brace-format
msgid "Error: Cannot read file '{filename}': {error}"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:405
+#: pacman_mirrors/pacman_mirrors.py:446
msgid ":: Randomizing server list..."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:443
+#: pacman_mirrors/pacman_mirrors.py:483
msgid "Error: No server available !"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:464 pacman_mirrors/pacman_mirrors.py:561
+#: pacman_mirrors/pacman_mirrors.py:503 pacman_mirrors/pacman_mirrors.py:593
+#, python-brace-format
msgid ":: Generated and saved '{output_file}' mirrorlist."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:467 pacman_mirrors/pacman_mirrors.py:509
-#: pacman_mirrors/pacman_mirrors.py:566
+#: pacman_mirrors/pacman_mirrors.py:506 pacman_mirrors/pacman_mirrors.py:541
+#: pacman_mirrors/pacman_mirrors.py:598
+#, python-brace-format
msgid "Error: Cannot write file '{filename}': {error}"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:530
+#: pacman_mirrors/pacman_mirrors.py:562
+#, python-brace-format
msgid "Error: Cannot update file '{filename}': {error}"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:544
+#: pacman_mirrors/pacman_mirrors.py:577
msgid "User generated mirror list"
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:563
+#: pacman_mirrors/pacman_mirrors.py:595
+#, python-brace-format
msgid ":: Saved personalized list of mirrors in '{custom_file}'."
msgstr ""
-#: pacman_mirrors/pacman_mirrors.py:581
-msgid "Warning: Cannot remove 'Custom' country in the configuration file: {error}"
+#: pacman_mirrors/pacman_mirrors.py:614
+#, python-brace-format
+msgid ""
+"Warning: Cannot remove 'Custom' country in the configuration file: {error}"
msgstr ""
-#: pacman_mirrors/pacman_mirrors_gui.py:68
-msgid "Previous page"
+#: pacman_mirrors/pacman_mirrors_gui.py:32
+msgid "List of mirrors sorted by response time"
msgstr ""
-#: pacman_mirrors/pacman_mirrors_gui.py:74
-msgid "Next page"
+#: pacman_mirrors/pacman_mirrors_gui.py:52
+msgid "Use?"
msgstr ""
-#: pacman_mirrors/pacman_mirrors_gui.py:121
-msgid "Mirrors list sorted by response time"
+#: pacman_mirrors/pacman_mirrors_gui.py:54
+msgid "Last sync (hh:mm)"
msgstr ""
-#: pacman_mirrors/pacman_mirrors_gui.py:124
-msgid "List of selected mirrors"
+#: pacman_mirrors/pacman_mirrors_gui.py:54
+msgid "URL"
msgstr ""
-#: pacman_mirrors/pacman_mirrors_gui.py:131
-msgid "Select by clicking mirrors to prepare your custom list"
+#: pacman_mirrors/pacman_mirrors_gui.py:54
+msgid "Country"
msgstr ""
-#: pacman_mirrors/pacman_mirrors_gui.py:171
-msgid "Show custom list"
+#: pacman_mirrors/pacman_mirrors_gui.py:60
+msgid "Tick mirrors to prepare your custom list"
msgstr ""
-#: pacman_mirrors/pacman_mirrors_gui.py:175
-msgid "Back to main list"
+#: pacman_mirrors/pacman_mirrors_gui.py:61
+msgid "Cancel"
msgstr ""
-#: pacman_mirrors/pacman_mirrors_gui.py:178
-msgid "Done"
+#: pacman_mirrors/pacman_mirrors_gui.py:63
+msgid "Confirm selection"
msgstr ""
-