diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd66a77..22b5c96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,41 +56,7 @@ include_directories(${INTL_INCLUDE_DIRS})
 link_directories(${INTL_LIBRARY_DIRS})
 
 #INTL INSTALL TRANSLATIONS
-FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
-
-IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
-    MESSAGE("------
-    NOTE: msgfmt not found. Translations will *not* be installed
-------")
-ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
-
-    SET(catalogname rkward)
-
-    FILE(GLOB PO_FILES *.po)
-    SET(GMO_FILES)
-
-    FOREACH(_poFile ${PO_FILES})
-        GET_FILENAME_COMPONENT(_poFileName ${_poFile} NAME)
-        STRING(REGEX REPLACE "^${catalogname}_?" "" _langCode ${_poFileName} )
-        STRING(REGEX REPLACE "\\.po$" "" _langCode ${_langCode} )
-
-        IF( _langCode )
-            GET_FILENAME_COMPONENT(_lang ${_poFile} NAME_WE)
-            SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
-
-            ADD_CUSTOM_COMMAND(OUTPUT ${_gmoFile}
-                    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
-                    DEPENDS ${_poFile})
-            INSTALL(FILES ${_gmoFile} DESTINATION ${LOCALE_INSTALL_DIR}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo)
-            LIST(APPEND GMO_FILES ${_gmoFile})
-        ENDIF( _langCode )
-
-    ENDFOREACH(_poFile ${PO_FILES})
-
-    ADD_CUSTOM_TARGET(translations ALL DEPENDS ${GMO_FILES})
-
-ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE)
-
+GETTEXT_CREATE_TRANSLATIONS(po/adriconf.pot ALL po/en.po po/hr.po po/pt_BR.po)
 
 # Define the executable itself
 add_executable(adriconf main.cpp ${SOURCE_FILES})
diff --git a/GUI.cpp b/GUI.cpp
index 4dc8de3..e4cadf9 100644
--- a/GUI.cpp
+++ b/GUI.cpp
@@ -123,6 +123,9 @@ void GUI::setupLocale() {
     std::locale l = gen("");
     std::locale::global(l);
     std::cout.imbue(l);
+    bindtextdomain("adriconf","/usr/share/locale");
+    textdomain("adriconf");
+
     Glib::ustring langCode(std::use_facet<boost::locale::info>(l).language());
 
     std::cout << Glib::ustring::compose(_("Current language code is %1"), langCode) << std::endl;
diff --git a/po/driconf3.pot b/po/adriconf.pot
similarity index 100%
rename from po/driconf3.pot
rename to po/adriconf.pot
diff --git a/po/en.po b/po/en.po
index 12d2b08..d76182f 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-20 20:12-0300\n"
+"POT-Creation-Date: 2018-03-20 20:13-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,68 +17,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../ConfigurationResolver.cpp:143
-msgid ""
-"User-defined driver '%1' on screen '%2' doesn't have a driver loaded on "
-"system. Configuration removed."
-msgstr "Configuration removed."
+#: ../GUI.cpp:667
+#, fuzzy
+msgid "Add Application app driver widget is not in glade file!"
+msgstr "Main window object is not in glade file!"
 
-#: ../ConfigurationResolver.cpp:211
-msgid ""
-"Driver '%1' doesn't support option '%2' on application '%3'. Option removed."
-msgstr ""
-"Driver '%1' doesn't support option '%2' on application '%3'. Option removed."
+#: ../GUI.cpp:661
+#, fuzzy
+msgid "Add Application app executable widget is not in glade file!"
+msgstr "Main window object is not in glade file!"
 
-#: ../DriConf.glade.h:1
-msgid "_File"
-msgstr "File"
+#: ../GUI.cpp:655
+#, fuzzy
+msgid "Add Application app name widget is not in glade file!"
+msgstr "Main window object is not in glade file!"
 
-#: ../DriConf.glade.h:2
-msgid "_Application"
-msgstr "Application"
+#: ../GUI.cpp:649
+#, fuzzy
+msgid "Add Application dialog is not in glade file!"
+msgstr "Main window object is not in glade file!"
 
-#: ../DriConf.glade.h:3
-msgid "_Help"
-msgstr "Help"
+#: ../GUI.cpp:75
+msgid "Add new"
+msgstr "Add new"
 
-#: ../DriConf.glade.h:4
-msgid "Cancel"
-msgstr "Cancel"
+#: ../GUI.cpp:584
+msgid "An advanced DRI configurator tool."
+msgstr "An advanced DRI configurator tool."
 
-#: ../DriConf.glade.h:5
-#, fuzzy
-msgid "Application name:"
-msgstr "Application name"
+#: ../GUI.cpp:232
+msgid "Application %1 not found "
+msgstr "Application %1 not found "
 
 #: ../DriConf.glade.h:6
 #, fuzzy
 msgid "Application executable:"
 msgstr "Application executable"
 
-#: ../DriConf.glade.h:7
+#: ../DriConf.glade.h:5
 #, fuzzy
-msgid "Driver:"
-msgstr "Driver:"
-
-#: ../GUI.cpp:51
-msgid "Main window object is not in glade file!"
-msgstr "Main window object is not in glade file!"
+msgid "Application name:"
+msgstr "Application name"
 
-#: ../GUI.cpp:75
-msgid "Add new"
-msgstr "Add new"
+#: ../GUI.cpp:633
+msgid "Application removed successfully."
+msgstr "Application removed successfully."
 
-#: ../GUI.cpp:80
-msgid "Remove current Application"
-msgstr "Remove current Application"
+#: ../GUI.cpp:714
+msgid "Application successfully added."
+msgstr "Application successfully added."
 
-#: ../GUI.cpp:104
-msgid "Generating final XML for saving..."
-msgstr "Generating final XML for saving..."
+#: ../DriConf.glade.h:4
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../GUI.cpp:110
-msgid "Writing generated XML: %1"
-msgstr "Writing generated XML: %1"
+#: ../DRIQuery.cpp:27
+msgid "Couldn't open X display"
+msgstr "Couldn't open X display"
 
 #: ../GUI.cpp:128
 #, fuzzy
@@ -89,46 +84,65 @@ msgstr "Current language code is %1"
 msgid "Driver %1 not found"
 msgstr "Driver %1 not found"
 
-#: ../GUI.cpp:232
-msgid "Application %1 not found "
-msgstr "Application %1 not found "
-
 #: ../GUI.cpp:245
 msgid "Driver %1 not found "
 msgstr "Driver %1 not found "
 
-#: ../GUI.cpp:261
-msgid "Notebook object not found in glade file!"
-msgstr "Notebook object not found in glade file!"
+#: ../ConfigurationResolver.cpp:211
+msgid ""
+"Driver '%1' doesn't support option '%2' on application '%3'. Option removed."
+msgstr ""
+"Driver '%1' doesn't support option '%2' on application '%3'. Option removed."
 
-#: ../GUI.cpp:306
-msgid "Option %1 doesn't exist in application %2. Merge failed"
-msgstr "Option %1 doesn't exist in application %2. Merge failed"
+#: ../DriConf.glade.h:7
+#, fuzzy
+msgid "Driver:"
+msgstr "Driver:"
 
-#: ../GUI.cpp:438
-msgid "Use default GPU of screen"
-msgstr "Use default GPU of screen"
+#: ../DRIQuery.cpp:17
+msgid "Error getting function pointers. LibGL must be too old."
+msgstr ""
 
 #: ../GUI.cpp:465
 #, fuzzy
 msgid "Force Application to use GPU"
 msgstr "Application %1 not found "
 
+#: ../GUI.cpp:104
+msgid "Generating final XML for saving..."
+msgstr "Generating final XML for saving..."
+
+#: ../GUI.cpp:51
+msgid "Main window object is not in glade file!"
+msgstr "Main window object is not in glade file!"
+
+#: ../GUI.cpp:261
+msgid "Notebook object not found in glade file!"
+msgstr "Notebook object not found in glade file!"
+
+#: ../GUI.cpp:306
+msgid "Option %1 doesn't exist in application %2. Merge failed"
+msgstr "Option %1 doesn't exist in application %2. Merge failed"
+
 #: ../GUI.cpp:480
 msgid "PRIME Settings"
 msgstr "PRIME Settings"
 
-#: ../GUI.cpp:584
-msgid "An advanced DRI configurator tool."
-msgstr "An advanced DRI configurator tool."
+#: ../GUI.cpp:80
+msgid "Remove current Application"
+msgstr "Remove current Application"
 
 #: ../GUI.cpp:588
 msgid "Source Code"
 msgstr "Source Code"
 
-#: ../GUI.cpp:602
-msgid "Unexpected response code from about dialog: %1"
-msgstr "Unexpected response code from about dialog: %1"
+#: ../GUI.cpp:634
+msgid "The application has been removed."
+msgstr "The application has been removed."
+
+#: ../GUI.cpp:715
+msgid "The application was successfully added. Reloading default app options."
+msgstr "The application was successfully added. Reloading default app options."
 
 #: ../GUI.cpp:619
 msgid "The default application cannot be removed."
@@ -138,58 +152,44 @@ msgstr "The default application cannot be removed."
 msgid "The driver needs a default configuration."
 msgstr "The driver needs a default configuration."
 
-#: ../GUI.cpp:633
-msgid "Application removed successfully."
-msgstr "Application removed successfully."
-
-#: ../GUI.cpp:634
-msgid "The application has been removed."
-msgstr "The application has been removed."
-
-#: ../GUI.cpp:649
-#, fuzzy
-msgid "Add Application dialog is not in glade file!"
-msgstr "Main window object is not in glade file!"
+#: ../DRIQuery.cpp:106 ../DRIQuery.cpp:115
+msgid "Unable to extract configuration for driver %1"
+msgstr "Unable to extract configuration for driver %1"
 
-#: ../GUI.cpp:655
-#, fuzzy
-msgid "Add Application app name widget is not in glade file!"
-msgstr "Main window object is not in glade file!"
+#: ../GUI.cpp:602
+msgid "Unexpected response code from about dialog: %1"
+msgstr "Unexpected response code from about dialog: %1"
 
-#: ../GUI.cpp:661
-#, fuzzy
-msgid "Add Application app executable widget is not in glade file!"
-msgstr "Main window object is not in glade file!"
+#: ../GUI.cpp:438
+msgid "Use default GPU of screen"
+msgstr "Use default GPU of screen"
 
-#: ../GUI.cpp:667
-#, fuzzy
-msgid "Add Application app driver widget is not in glade file!"
-msgstr "Main window object is not in glade file!"
+#: ../ConfigurationResolver.cpp:143
+msgid ""
+"User-defined driver '%1' on screen '%2' doesn't have a driver loaded on "
+"system. Configuration removed."
+msgstr "Configuration removed."
 
 #: ../GUI.cpp:690
 msgid "Validation error"
 msgstr "Validation error"
 
+#: ../GUI.cpp:110
+msgid "Writing generated XML: %1"
+msgstr "Writing generated XML: %1"
+
 #: ../GUI.cpp:692
 msgid "You need to specify the application name, executable and driver."
 msgstr "You need to specify the application name, executable and driver."
 
-#: ../GUI.cpp:714
-msgid "Application successfully added."
-msgstr "Application successfully added."
-
-#: ../GUI.cpp:715
-msgid "The application was successfully added. Reloading default app options."
-msgstr "The application was successfully added. Reloading default app options."
-
-#: ../DRIQuery.cpp:17
-msgid "Error getting function pointers. LibGL must be too old."
-msgstr ""
+#: ../DriConf.glade.h:2
+msgid "_Application"
+msgstr "Application"
 
-#: ../DRIQuery.cpp:27
-msgid "Couldn't open X display"
-msgstr "Couldn't open X display"
+#: ../DriConf.glade.h:1
+msgid "_File"
+msgstr "File"
 
-#: ../DRIQuery.cpp:106 ../DRIQuery.cpp:115
-msgid "Unable to extract configuration for driver %1"
-msgstr "Unable to extract configuration for driver %1"
+#: ../DriConf.glade.h:3
+msgid "_Help"
+msgstr "Help"
diff --git a/po/hr.po b/po/hr.po
index 56c1aaa..c4faab0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -17,69 +17,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: ../ConfigurationResolver.cpp:143
-msgid ""
-"User-defined driver '%1' on screen '%2' doesn't have a driver loaded on "
-"system. Configuration removed."
-msgstr ""
+#: ../GUI.cpp:667
+#, fuzzy
+msgid "Add Application app driver widget is not in glade file!"
+msgstr "Glavnog objekta prozora nema u glade datoteci!"
 
-#: ../ConfigurationResolver.cpp:211
-msgid ""
-"Driver '%1' doesn't support option '%2' on application '%3'. Option removed."
-msgstr ""
-"Upravljački program '%1' ne podržava mogućnost '%2' na aplikaciji '%3'. "
-"Mogućnost uklonjena."
+#: ../GUI.cpp:661
+#, fuzzy
+msgid "Add Application app executable widget is not in glade file!"
+msgstr "Glavnog objekta prozora nema u glade datoteci!"
 
-#: ../DriConf.glade.h:1
-msgid "_File"
-msgstr "_Datoteka"
+#: ../GUI.cpp:655
+#, fuzzy
+msgid "Add Application app name widget is not in glade file!"
+msgstr "Glavnog objekta prozora nema u glade datoteci!"
 
-#: ../DriConf.glade.h:2
-msgid "_Application"
-msgstr "_Aplikacija"
+#: ../GUI.cpp:649
+#, fuzzy
+msgid "Add Application dialog is not in glade file!"
+msgstr "Glavnog objekta prozora nema u glade datoteci!"
 
-#: ../DriConf.glade.h:3
-msgid "_Help"
-msgstr "_Pomoć"
+#: ../GUI.cpp:75
+msgid "Add new"
+msgstr "Dodaj novo"
 
-#: ../DriConf.glade.h:4
-msgid "Cancel"
-msgstr "Odustani"
+#: ../GUI.cpp:584
+msgid "An advanced DRI configurator tool."
+msgstr "Napredni alat za DRI podešavanje."
 
-#: ../DriConf.glade.h:5
-#, fuzzy
-msgid "Application name:"
-msgstr "Naziv aplikacije"
+#: ../GUI.cpp:232
+msgid "Application %1 not found "
+msgstr "Aplikacija %1 nije pronađena "
 
 #: ../DriConf.glade.h:6
 #, fuzzy
 msgid "Application executable:"
 msgstr "Izvršna datoteka aplikacije"
 
-#: ../DriConf.glade.h:7
+#: ../DriConf.glade.h:5
 #, fuzzy
-msgid "Driver:"
-msgstr "Upravljački program"
-
-#: ../GUI.cpp:51
-msgid "Main window object is not in glade file!"
-msgstr "Glavnog objekta prozora nema u glade datoteci!"
+msgid "Application name:"
+msgstr "Naziv aplikacije"
 
-#: ../GUI.cpp:75
-msgid "Add new"
-msgstr "Dodaj novo"
+#: ../GUI.cpp:633
+msgid "Application removed successfully."
+msgstr "Aplikacija je uklonjena uspješno."
 
-#: ../GUI.cpp:80
-msgid "Remove current Application"
-msgstr "Ukloni trenutnu aplikaciju"
+#: ../GUI.cpp:714
+msgid "Application successfully added."
+msgstr "Aplikacija je dodana uspješno."
 
-#: ../GUI.cpp:104
-msgid "Generating final XML for saving..."
-msgstr "Stvaranje konačnog XML-a za spremanje..."
+#: ../DriConf.glade.h:4
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../GUI.cpp:110
-msgid "Writing generated XML: %1"
-msgstr "Zapisivanje stvorenog XML-a: %1"
+#: ../DRIQuery.cpp:27
+msgid "Couldn't open X display"
+msgstr ""
 
 #: ../GUI.cpp:128
 msgid "Current language code is %1"
@@ -89,24 +83,24 @@ msgstr "Trenutni jezični kôd je %1"
 msgid "Driver %1 not found"
 msgstr "Upravljački program %1 nije pronađen"
 
-#: ../GUI.cpp:232
-msgid "Application %1 not found "
-msgstr "Aplikacija %1 nije pronađena "
-
 #: ../GUI.cpp:245
 msgid "Driver %1 not found "
 msgstr "Upravljački program %1 nije pronađen "
 
-#: ../GUI.cpp:261
-msgid "Notebook object not found in glade file!"
-msgstr "Objekta bilješke nema u glade datoteci!"
+#: ../ConfigurationResolver.cpp:211
+msgid ""
+"Driver '%1' doesn't support option '%2' on application '%3'. Option removed."
+msgstr ""
+"Upravljački program '%1' ne podržava mogućnost '%2' na aplikaciji '%3'. "
+"Mogućnost uklonjena."
 
-#: ../GUI.cpp:306
-msgid "Option %1 doesn't exist in application %2. Merge failed"
-msgstr "Mogućnost %1 ne postoji u aplikaciji %2. Spajanje neuspjelo"
+#: ../DriConf.glade.h:7
+#, fuzzy
+msgid "Driver:"
+msgstr "Upravljački program"
 
-#: ../GUI.cpp:438
-msgid "Use default GPU of screen"
+#: ../DRIQuery.cpp:17
+msgid "Error getting function pointers. LibGL must be too old."
 msgstr ""
 
 #: ../GUI.cpp:465
@@ -114,21 +108,43 @@ msgstr ""
 msgid "Force Application to use GPU"
 msgstr "Nova aplikacija"
 
+#: ../GUI.cpp:104
+msgid "Generating final XML for saving..."
+msgstr "Stvaranje konačnog XML-a za spremanje..."
+
+#: ../GUI.cpp:51
+msgid "Main window object is not in glade file!"
+msgstr "Glavnog objekta prozora nema u glade datoteci!"
+
+#: ../GUI.cpp:261
+msgid "Notebook object not found in glade file!"
+msgstr "Objekta bilješke nema u glade datoteci!"
+
+#: ../GUI.cpp:306
+msgid "Option %1 doesn't exist in application %2. Merge failed"
+msgstr "Mogućnost %1 ne postoji u aplikaciji %2. Spajanje neuspjelo"
+
 #: ../GUI.cpp:480
 msgid "PRIME Settings"
 msgstr ""
 
-#: ../GUI.cpp:584
-msgid "An advanced DRI configurator tool."
-msgstr "Napredni alat za DRI podešavanje."
+#: ../GUI.cpp:80
+msgid "Remove current Application"
+msgstr "Ukloni trenutnu aplikaciju"
 
 #: ../GUI.cpp:588
 msgid "Source Code"
 msgstr "Izvorni kôd"
 
-#: ../GUI.cpp:602
-msgid "Unexpected response code from about dialog: %1"
-msgstr "Neočekivani odgovor kôda iz dijaloga o programu: %1"
+#: ../GUI.cpp:634
+msgid "The application has been removed."
+msgstr "Aplikacija je uklonjena."
+
+#: ../GUI.cpp:715
+msgid "The application was successfully added. Reloading default app options."
+msgstr ""
+"Aplikacija je uspješno dodana. Ponovno učitavanje zadanih mogućnosti "
+"aplikacije."
 
 #: ../GUI.cpp:619
 msgid "The default application cannot be removed."
@@ -138,64 +154,48 @@ msgstr "Zadana aplikacija se ne može ukloniti."
 msgid "The driver needs a default configuration."
 msgstr "Upravljački program zahtijeva zadano podešavanje."
 
-#: ../GUI.cpp:633
-msgid "Application removed successfully."
-msgstr "Aplikacija je uklonjena uspješno."
-
-#: ../GUI.cpp:634
-msgid "The application has been removed."
-msgstr "Aplikacija je uklonjena."
-
-#: ../GUI.cpp:649
-#, fuzzy
-msgid "Add Application dialog is not in glade file!"
-msgstr "Glavnog objekta prozora nema u glade datoteci!"
+#: ../DRIQuery.cpp:106 ../DRIQuery.cpp:115
+msgid "Unable to extract configuration for driver %1"
+msgstr ""
 
-#: ../GUI.cpp:655
-#, fuzzy
-msgid "Add Application app name widget is not in glade file!"
-msgstr "Glavnog objekta prozora nema u glade datoteci!"
+#: ../GUI.cpp:602
+msgid "Unexpected response code from about dialog: %1"
+msgstr "Neočekivani odgovor kôda iz dijaloga o programu: %1"
 
-#: ../GUI.cpp:661
-#, fuzzy
-msgid "Add Application app executable widget is not in glade file!"
-msgstr "Glavnog objekta prozora nema u glade datoteci!"
+#: ../GUI.cpp:438
+msgid "Use default GPU of screen"
+msgstr ""
 
-#: ../GUI.cpp:667
-#, fuzzy
-msgid "Add Application app driver widget is not in glade file!"
-msgstr "Glavnog objekta prozora nema u glade datoteci!"
+#: ../ConfigurationResolver.cpp:143
+msgid ""
+"User-defined driver '%1' on screen '%2' doesn't have a driver loaded on "
+"system. Configuration removed."
+msgstr ""
 
 #: ../GUI.cpp:690
 msgid "Validation error"
 msgstr "Greška provjere"
 
+#: ../GUI.cpp:110
+msgid "Writing generated XML: %1"
+msgstr "Zapisivanje stvorenog XML-a: %1"
+
 #: ../GUI.cpp:692
 msgid "You need to specify the application name, executable and driver."
 msgstr ""
 "Morate navesti naziv aplikacije, izvršnu datoteku i upravljački program."
 
-#: ../GUI.cpp:714
-msgid "Application successfully added."
-msgstr "Aplikacija je dodana uspješno."
-
-#: ../GUI.cpp:715
-msgid "The application was successfully added. Reloading default app options."
-msgstr ""
-"Aplikacija je uspješno dodana. Ponovno učitavanje zadanih mogućnosti "
-"aplikacije."
-
-#: ../DRIQuery.cpp:17
-msgid "Error getting function pointers. LibGL must be too old."
-msgstr ""
+#: ../DriConf.glade.h:2
+msgid "_Application"
+msgstr "_Aplikacija"
 
-#: ../DRIQuery.cpp:27
-msgid "Couldn't open X display"
-msgstr ""
+#: ../DriConf.glade.h:1
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ../DRIQuery.cpp:106 ../DRIQuery.cpp:115
-msgid "Unable to extract configuration for driver %1"
-msgstr ""
+#: ../DriConf.glade.h:3
+msgid "_Help"
+msgstr "_Pomoć"
 
 #~ msgid "Save"
 #~ msgstr "Spremi"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d5def03..96fea64 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-20 20:12-0300\n"
+"POT-Creation-Date: 2018-03-20 20:13-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,70 +17,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../ConfigurationResolver.cpp:143
-msgid ""
-"User-defined driver '%1' on screen '%2' doesn't have a driver loaded on "
-"system. Configuration removed."
-msgstr ""
-"Driver '%1' definido pelo usuário na tela '%2' não possui um driver "
-"carregado no sistema. Configuração removida."
+#: ../GUI.cpp:667
+#, fuzzy
+msgid "Add Application app driver widget is not in glade file!"
+msgstr "Objeto window principal não está no arquivo glade!"
 
-#: ../ConfigurationResolver.cpp:211
-msgid ""
-"Driver '%1' doesn't support option '%2' on application '%3'. Option removed."
-msgstr ""
-"Driver '%1' não suporta a opção '%2' na aplicação '%3'. Opção será removida."
+#: ../GUI.cpp:661
+#, fuzzy
+msgid "Add Application app executable widget is not in glade file!"
+msgstr "Objeto window principal não está no arquivo glade!"
 
-#: ../DriConf.glade.h:1
-msgid "_File"
-msgstr "Arquivo"
+#: ../GUI.cpp:655
+#, fuzzy
+msgid "Add Application app name widget is not in glade file!"
+msgstr "Objeto window principal não está no arquivo glade!"
 
-#: ../DriConf.glade.h:2
-msgid "_Application"
-msgstr "Aplicação"
+#: ../GUI.cpp:649
+#, fuzzy
+msgid "Add Application dialog is not in glade file!"
+msgstr "Objeto window principal não está no arquivo glade!"
 
-#: ../DriConf.glade.h:3
-msgid "_Help"
-msgstr "Ajuda"
+#: ../GUI.cpp:75
+msgid "Add new"
+msgstr "Adicionar novo"
 
-#: ../DriConf.glade.h:4
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../GUI.cpp:584
+msgid "An advanced DRI configurator tool."
+msgstr "Uma ferramenta de configuração de DRI avançada."
 
-#: ../DriConf.glade.h:5
-#, fuzzy
-msgid "Application name:"
-msgstr "Nome da aplicação"
+#: ../GUI.cpp:232
+msgid "Application %1 not found "
+msgstr "Aplicação %1 não encontrada"
 
 #: ../DriConf.glade.h:6
 #, fuzzy
 msgid "Application executable:"
 msgstr "Executável da aplicação"
 
-#: ../DriConf.glade.h:7
+#: ../DriConf.glade.h:5
 #, fuzzy
-msgid "Driver:"
-msgstr "Driver:"
-
-#: ../GUI.cpp:51
-msgid "Main window object is not in glade file!"
-msgstr "Objeto window principal não está no arquivo glade!"
+msgid "Application name:"
+msgstr "Nome da aplicação"
 
-#: ../GUI.cpp:75
-msgid "Add new"
-msgstr "Adicionar novo"
+#: ../GUI.cpp:633
+msgid "Application removed successfully."
+msgstr "Aplicação removida com sucesso."
 
-#: ../GUI.cpp:80
-msgid "Remove current Application"
-msgstr "Remover aplicação atual"
+#: ../GUI.cpp:714
+msgid "Application successfully added."
+msgstr "Aplicação adicionada com sucesso."
 
-#: ../GUI.cpp:104
-msgid "Generating final XML for saving..."
-msgstr "Gerando XML final para salvar..."
+#: ../DriConf.glade.h:4
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../GUI.cpp:110
-msgid "Writing generated XML: %1"
-msgstr "Escrevendo XML gerado: %1"
+#: ../DRIQuery.cpp:27
+msgid "Couldn't open X display"
+msgstr "Falhou ao abrir uma conexão com o servidor X"
 
 #: ../GUI.cpp:128
 #, fuzzy
@@ -91,46 +84,67 @@ msgstr "Código de lingua atual é %1"
 msgid "Driver %1 not found"
 msgstr "Driver %1 não encontrado"
 
-#: ../GUI.cpp:232
-msgid "Application %1 not found "
-msgstr "Aplicação %1 não encontrada"
-
 #: ../GUI.cpp:245
 msgid "Driver %1 not found "
 msgstr "Driver %1 não encontrado "
 
-#: ../GUI.cpp:261
-msgid "Notebook object not found in glade file!"
-msgstr "Objeto Notebook não encontrado no arquivo glade!"
+#: ../ConfigurationResolver.cpp:211
+msgid ""
+"Driver '%1' doesn't support option '%2' on application '%3'. Option removed."
+msgstr ""
+"Driver '%1' não suporta a opção '%2' na aplicação '%3'. Opção será removida."
 
-#: ../GUI.cpp:306
-msgid "Option %1 doesn't exist in application %2. Merge failed"
-msgstr "Opção %1 não existe na aplicação %2. Mesclagem falhou"
+#: ../DriConf.glade.h:7
+#, fuzzy
+msgid "Driver:"
+msgstr "Driver:"
 
-#: ../GUI.cpp:438
-msgid "Use default GPU of screen"
-msgstr "Usar GPU padrão da tela"
+#: ../DRIQuery.cpp:17
+msgid "Error getting function pointers. LibGL must be too old."
+msgstr "Erro ao obter ponteiros de funções. LibGL deve ser muito velha."
 
 #: ../GUI.cpp:465
 #, fuzzy
 msgid "Force Application to use GPU"
 msgstr "Aplicação %1 não encontrada"
 
+#: ../GUI.cpp:104
+msgid "Generating final XML for saving..."
+msgstr "Gerando XML final para salvar..."
+
+#: ../GUI.cpp:51
+msgid "Main window object is not in glade file!"
+msgstr "Objeto window principal não está no arquivo glade!"
+
+#: ../GUI.cpp:261
+msgid "Notebook object not found in glade file!"
+msgstr "Objeto Notebook não encontrado no arquivo glade!"
+
+#: ../GUI.cpp:306
+msgid "Option %1 doesn't exist in application %2. Merge failed"
+msgstr "Opção %1 não existe na aplicação %2. Mesclagem falhou"
+
 #: ../GUI.cpp:480
 msgid "PRIME Settings"
 msgstr "Configurações PRIME"
 
-#: ../GUI.cpp:584
-msgid "An advanced DRI configurator tool."
-msgstr "Uma ferramenta de configuração de DRI avançada."
+#: ../GUI.cpp:80
+msgid "Remove current Application"
+msgstr "Remover aplicação atual"
 
 #: ../GUI.cpp:588
 msgid "Source Code"
 msgstr "Código Fonte"
 
-#: ../GUI.cpp:602
-msgid "Unexpected response code from about dialog: %1"
-msgstr "Código de resposta do dialogo inesperado: %1"
+#: ../GUI.cpp:634
+msgid "The application has been removed."
+msgstr "A aplicação foi removida."
+
+#: ../GUI.cpp:715
+msgid "The application was successfully added. Reloading default app options."
+msgstr ""
+"A aplicação foi adicionada com sucesso. Recarregando opções da aplicação "
+"padrão."
 
 #: ../GUI.cpp:619
 msgid "The default application cannot be removed."
@@ -140,60 +154,46 @@ msgstr "A aplicação padrão não pode ser removida."
 msgid "The driver needs a default configuration."
 msgstr "O driver precisa de uma aplicação padrão."
 
-#: ../GUI.cpp:633
-msgid "Application removed successfully."
-msgstr "Aplicação removida com sucesso."
-
-#: ../GUI.cpp:634
-msgid "The application has been removed."
-msgstr "A aplicação foi removida."
-
-#: ../GUI.cpp:649
-#, fuzzy
-msgid "Add Application dialog is not in glade file!"
-msgstr "Objeto window principal não está no arquivo glade!"
+#: ../DRIQuery.cpp:106 ../DRIQuery.cpp:115
+msgid "Unable to extract configuration for driver %1"
+msgstr "Incapaz de extrair uma configuração para o driver %1"
 
-#: ../GUI.cpp:655
-#, fuzzy
-msgid "Add Application app name widget is not in glade file!"
-msgstr "Objeto window principal não está no arquivo glade!"
+#: ../GUI.cpp:602
+msgid "Unexpected response code from about dialog: %1"
+msgstr "Código de resposta do dialogo inesperado: %1"
 
-#: ../GUI.cpp:661
-#, fuzzy
-msgid "Add Application app executable widget is not in glade file!"
-msgstr "Objeto window principal não está no arquivo glade!"
+#: ../GUI.cpp:438
+msgid "Use default GPU of screen"
+msgstr "Usar GPU padrão da tela"
 
-#: ../GUI.cpp:667
-#, fuzzy
-msgid "Add Application app driver widget is not in glade file!"
-msgstr "Objeto window principal não está no arquivo glade!"
+#: ../ConfigurationResolver.cpp:143
+msgid ""
+"User-defined driver '%1' on screen '%2' doesn't have a driver loaded on "
+"system. Configuration removed."
+msgstr ""
+"Driver '%1' definido pelo usuário na tela '%2' não possui um driver "
+"carregado no sistema. Configuração removida."
 
 #: ../GUI.cpp:690
 msgid "Validation error"
 msgstr "Erro de validação"
 
+#: ../GUI.cpp:110
+msgid "Writing generated XML: %1"
+msgstr "Escrevendo XML gerado: %1"
+
 #: ../GUI.cpp:692
 msgid "You need to specify the application name, executable and driver."
 msgstr "Você precisa especificar o nome da aplicação, executável e driver."
 
-#: ../GUI.cpp:714
-msgid "Application successfully added."
-msgstr "Aplicação adicionada com sucesso."
-
-#: ../GUI.cpp:715
-msgid "The application was successfully added. Reloading default app options."
-msgstr ""
-"A aplicação foi adicionada com sucesso. Recarregando opções da aplicação "
-"padrão."
-
-#: ../DRIQuery.cpp:17
-msgid "Error getting function pointers. LibGL must be too old."
-msgstr "Erro ao obter ponteiros de funções. LibGL deve ser muito velha."
+#: ../DriConf.glade.h:2
+msgid "_Application"
+msgstr "Aplicação"
 
-#: ../DRIQuery.cpp:27
-msgid "Couldn't open X display"
-msgstr "Falhou ao abrir uma conexão com o servidor X"
+#: ../DriConf.glade.h:1
+msgid "_File"
+msgstr "Arquivo"
 
-#: ../DRIQuery.cpp:106 ../DRIQuery.cpp:115
-msgid "Unable to extract configuration for driver %1"
-msgstr "Incapaz de extrair uma configuração para o driver %1"
+#: ../DriConf.glade.h:3
+msgid "_Help"
+msgstr "Ajuda"