10 files changed, 378 insertions, 146 deletions

diff --git a/po/de.po b/po/de.po
index 2b6a02d..aa8956d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,17 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rockwork\n"
+<<<<<<< HEAD
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+"PO-Revision-Date: 2016-01-12 09:52+0000\n"
+=======
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
 "PO-Revision-Date: 2016-02-15 06:05+0000\n"
+>>>>>>> refs/heads/rockwork
 "Last-Translator: Michael Zanetti <michael.zanetti@canonical.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
+=======
 "X-Launchpad-Export-Date: 2016-02-16 05:44+0000\n"
 "X-Generator: Launchpad (build 17925)\n"
 "Language: de\n"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -58,7 +69,7 @@ msgstr "Neue App hinzufügen"
 msgid "Add new watchface"
 msgstr "Neues Ziffernblatt hinzufügen"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr "Alle anzeigen"
 
@@ -76,25 +87,38 @@ msgstr "Bildschirmfotos"
 msgid "Report problem"
 msgstr "Fehler berichten"
 
+<<<<<<< HEAD
+=======
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
 msgid "Install app or watchface from file"
 msgstr "App oder Watchface aus datei installieren"
 
+>>>>>>> refs/heads/rockwork
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr "Bereite Logs vor..."
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
+<<<<<<< HEAD
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
+msgstr ""
+=======
 msgid "pebble.log"
 msgstr "pebble.log"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "rockworkd.log senden"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
 msgid "rockworkd.log"
 msgstr "rockworkd.log"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
@@ -112,8 +136,13 @@ msgid "Firmware upgrade"
 msgstr "Software updaten"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
+msgstr ""
+=======
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
 msgstr "Eine neue Software für Ihre Pebble Uhr steht zur Verfügung."
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
 #, qt-format
@@ -183,10 +212,13 @@ msgstr "Ich möchte mehr schlafen"
 msgid "OK"
 msgstr "OK"
 
+<<<<<<< HEAD
+=======
 #: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
 msgid "Import watchapp or watchface"
 msgstr "Watchapp oder Watchface importieren"
 
+>>>>>>> refs/heads/rockwork
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
@@ -242,8 +274,13 @@ msgid "Loading..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
+<<<<<<< HEAD
+msgid "Info"
+msgstr ""
+=======
 msgid "About"
 msgstr "Über"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
 msgid "Developer tools"
diff --git a/po/en_GB.po b/po/en_GB.po
index 0d69af1..2a022a8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,17 +6,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rockwork\n"
+<<<<<<< HEAD
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+"PO-Revision-Date: 2016-01-26 18:00+0000\n"
+"Last-Translator: Emanuele Antonio Faraone <emanueleant03@gmail.com>\n"
+=======
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
 "PO-Revision-Date: 2016-02-15 08:54+0000\n"
 "Last-Translator: Adrian Chiang <Unknown>\n"
+>>>>>>> refs/heads/rockwork
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
+=======
 "X-Launchpad-Export-Date: 2016-02-16 05:44+0000\n"
 "X-Generator: Launchpad (build 17925)\n"
 "Language: \n"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -58,7 +70,7 @@ msgstr "Add new watchapp"
 msgid "Add new watchface"
 msgstr "Add new watchface"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr "See all"
 
@@ -76,25 +88,38 @@ msgstr "Screenshots"
 msgid "Report problem"
 msgstr "Report problem"
 
+<<<<<<< HEAD
+=======
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
 msgid "Install app or watchface from file"
 msgstr "Install app or watchface from file"
 
+>>>>>>> refs/heads/rockwork
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr "Preparing logs package..."
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
+<<<<<<< HEAD
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
+msgstr ""
+=======
 msgid "pebble.log"
 msgstr "pebble.log"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Send rockworkd.log"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
 msgid "rockworkd.log"
 msgstr "rockworkd.log"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
@@ -112,8 +137,13 @@ msgid "Firmware upgrade"
 msgstr "Firmware upgrade"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
+msgstr ""
+=======
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
 msgstr "A new firmware upgrade is available for your Pebble smartwatch."
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
 #, qt-format
@@ -182,10 +212,13 @@ msgstr "I want to sleep more"
 msgid "OK"
 msgstr "OK"
 
+<<<<<<< HEAD
+=======
 #: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
 msgid "Import watchapp or watchface"
 msgstr "Import watchapp or watchface"
 
+>>>>>>> refs/heads/rockwork
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
@@ -241,8 +274,13 @@ msgid "Loading..."
 msgstr "Loading..."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
+<<<<<<< HEAD
+msgid "Info"
+msgstr ""
+=======
 msgid "About"
 msgstr "About"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
 msgid "Developer tools"
diff --git a/po/eu.po b/po/eu.po
index ec328ed..b7c9dcf 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,17 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rockwork\n"
+<<<<<<< HEAD
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+=======
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
+>>>>>>> refs/heads/rockwork
 "PO-Revision-Date: 2016-02-03 22:34+0000\n"
 "Last-Translator: Aitzol Berasategi <aitzol76@gmail.com>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
+=======
 "X-Launchpad-Export-Date: 2016-02-15 05:44+0000\n"
 "X-Generator: Launchpad (build 17925)\n"
 "Language: eu\n"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -58,7 +68,7 @@ msgstr "Watchapp berria gehitu"
 msgid "Add new watchface"
 msgstr "Watchface berria gehitu"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr "Guztiak ikusi"
 
@@ -76,26 +86,19 @@ msgstr "Pantaila-argazkiak"
 msgid "Report problem"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
-msgid "Install app or watchface from file"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
-msgid "pebble.log"
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
 msgstr ""
@@ -112,7 +115,11 @@ msgid "Firmware upgrade"
 msgstr "Firmware eguneraketa"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
+=======
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
+>>>>>>> refs/heads/rockwork
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
@@ -182,10 +189,6 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
-msgid "Import watchapp or watchface"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
@@ -239,7 +242,7 @@ msgid "Loading..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
-msgid "About"
+msgid "Info"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
diff --git a/po/fr.po b/po/fr.po
index 0f95bd5..b069940 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,17 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: upebble\n"
+<<<<<<< HEAD
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+"PO-Revision-Date: 2016-02-07 15:41+0000\n"
+=======
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
 "PO-Revision-Date: 2016-02-15 06:05+0000\n"
+>>>>>>> refs/heads/rockwork
 "Last-Translator: Anne <anneonyme017@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
+=======
 "X-Launchpad-Export-Date: 2016-02-16 05:44+0000\n"
 "X-Generator: Launchpad (build 17925)\n"
 "Language: fr\n"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -56,15 +67,15 @@ msgstr "Ajouter une nouvelle application pour montre"
 
 #: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:8
 msgid "Add new watchface"
-msgstr "Ajouter une nouveau cadran"
+msgstr "Ajouter un nouveau thème de montre"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr "Tout voir"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:9
 msgid "Developer Tools"
-msgstr "Outils pour développeurs"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:28
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:11
@@ -74,27 +85,33 @@ msgstr "Captures d'écran"
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:35
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:102
 msgid "Report problem"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Signaler un problème"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
 msgid "Install app or watchface from file"
 msgstr "Installer une application ou un cadran à partir d'un fichier"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr "Préparation de l'ensemble des rapports…"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
+<<<<<<< HEAD
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
+msgstr ""
+=======
 msgid "pebble.log"
 msgstr "pebble.log"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
-msgstr "Envoi de rockworkd.log"
-
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr "rockworkd.log"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
@@ -112,7 +129,11 @@ msgid "Firmware upgrade"
 msgstr "Mise à niveau du micrologiciel"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
+=======
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
+>>>>>>> refs/heads/rockwork
 msgstr ""
 "Une nouvelle mise à niveau du micrologiciel est disponible pour votre montre "
 "connectée Pebble."
@@ -147,27 +168,31 @@ msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:9
 msgid "Health settings"
-msgstr "Paramètre de Bien-Être"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:17
 msgid "Health app enabled"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "L'application Bien-Être est activée"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Female"
-msgstr "Femme"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Male"
-msgstr "Homme"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:34
 msgid "Age"
-msgstr "Âge"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:47
 msgid "Height (cm)"
-msgstr "Taille (cm):"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
 msgid "Weight"
@@ -183,20 +208,31 @@ msgstr "Je veux dormir plus"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
 msgid "OK"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Valider"
 
 #: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
 msgid "Import watchapp or watchface"
 msgstr "Importer une application ou un cadran"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
-msgstr "Version %1"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
+<<<<<<< HEAD
+msgid "Contributors"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
+=======
+>>>>>>> refs/heads/rockwork
 msgid "Legal"
-msgstr "Informations légales"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
@@ -212,7 +248,7 @@ msgstr "Pebble est une marque déposée par Pebble Technology Corp."
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Apps & Watchfaces"
-msgstr "Applications & Cadrans"
+msgstr "Applications & thèmes de montre"
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Apps"
@@ -220,7 +256,7 @@ msgstr "Applications"
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Watchfaces"
-msgstr "Cadrans"
+msgstr "Thèmes de montre"
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:167
 msgid "Launch"
@@ -244,12 +280,17 @@ msgid "Loading..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
+<<<<<<< HEAD
+msgid "Info"
+msgstr ""
+=======
 msgid "About"
 msgstr "À propos"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
 msgid "Developer tools"
-msgstr "Outils de développement"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
 msgid "Manage notifications"
@@ -261,12 +302,12 @@ msgstr "Gérer les applications"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:67
 msgid "Manage Watchfaces"
-msgstr "Gérer les cadrans"
+msgstr "Gérer les thèmes de montre"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:75
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:8
 msgid "Settings"
-msgstr "Paramètres"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
@@ -351,20 +392,24 @@ msgstr "Enregistrer"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:19
 msgid "Distance Units"
-msgstr "Unités de Distance"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:35
 msgid "Metric"
-msgstr "Métrique"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:48
 msgid "Imperial"
-msgstr "Impérial"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
 msgid "Calendar"
-msgstr "Agenda"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
 msgid "Sync calendar to timeline"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Synchroniser l'agenda sur la Timeline."
+>>>>>>> refs/heads/rockwork
diff --git a/po/hu.po b/po/hu.po
index 2cdae4e..968cd20 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,17 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rockwork\n"
+<<<<<<< HEAD
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+=======
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
+>>>>>>> refs/heads/rockwork
 "PO-Revision-Date: 2016-02-02 09:30+0000\n"
 "Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
+=======
 "X-Launchpad-Export-Date: 2016-02-15 05:44+0000\n"
 "X-Generator: Launchpad (build 17925)\n"
 "Language: hu\n"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -58,7 +68,7 @@ msgstr "Új alkalmazás hozzáadása"
 msgid "Add new watchface"
 msgstr "Új számlap hozzáadása"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr "Összes"
 
@@ -76,26 +86,19 @@ msgstr "Képernyőképek"
 msgid "Report problem"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
-msgid "Install app or watchface from file"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
-msgid "pebble.log"
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
 msgstr ""
@@ -112,8 +115,13 @@ msgid "Firmware upgrade"
 msgstr "Firmware frissítés"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
+msgstr "Egy új firmware frissítés érhető el a Pebble okosórájához"
+=======
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
 msgstr ""
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
 #, qt-format
@@ -182,10 +190,6 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
-msgid "Import watchapp or watchface"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
@@ -239,7 +243,7 @@ msgid "Loading..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
-msgid "About"
+msgid "Info"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
diff --git a/po/it.po b/po/it.po
index 83e53d4..2f9b978 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,17 +6,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: upebble\n"
+<<<<<<< HEAD
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+"PO-Revision-Date: 2016-02-02 06:06+0000\n"
+"Last-Translator: Emanuele Antonio Faraone <emanueleant03@gmail.com>\n"
+=======
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
 "PO-Revision-Date: 2016-02-15 12:21+0000\n"
 "Last-Translator: Marco Trevisan (Treviño) <mail@3v1n0.net>\n"
+>>>>>>> refs/heads/rockwork
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
+=======
 "X-Launchpad-Export-Date: 2016-02-16 05:44+0000\n"
 "X-Generator: Launchpad (build 17925)\n"
 "Language: it\n"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -58,13 +70,17 @@ msgstr "Aggiungi Watchapp"
 msgid "Add new watchface"
 msgstr "Aggiungi Watchface"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr "Mostra tutto"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:9
 msgid "Developer Tools"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Strumenti per sviluppatori"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:28
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:11
@@ -74,31 +90,45 @@ msgstr "Screenshot"
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:35
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:102
 msgid "Report problem"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Riporta un problema"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
 msgid "Install app or watchface from file"
 msgstr "Installa app o watchface da file"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Preparazione del pacchetto di log..."
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
+<<<<<<< HEAD
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
+msgstr ""
+=======
 msgid "pebble.log"
 msgstr "pebble.log"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
-msgstr "Invia rockworkd.log"
-
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr "rockworkd.log"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Invia log dell'orologio"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:146
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:110
@@ -112,9 +142,14 @@ msgid "Firmware upgrade"
 msgstr "Aggiornamento Firmware"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
+msgstr "Un nuovo aggiornamento del firmware è disponibile per il tuo Pebble."
+=======
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
 msgstr ""
 "Un nuovo aggiornamento firmware è disponibile per il tuo Smartwatch Pebble"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
 #, qt-format
@@ -145,68 +180,98 @@ msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:9
 msgid "Health settings"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Impostazioni Health"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:17
 msgid "Health app enabled"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "App Health attiva"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Female"
-msgstr "Femmina"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Male"
-msgstr "Maschio"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:34
 msgid "Age"
-msgstr "Età"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:47
 msgid "Height (cm)"
-msgstr "Altezza (cm)"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:73
 msgid "I want to be more active"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Vorrei essere più attivo"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:84
 msgid "I want to sleep more"
-msgstr "Vorrei dormire di più"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
 msgid "OK"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "OK"
 
 #: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
 msgid "Import watchapp or watchface"
 msgstr "Importa una app o una watchface"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
-msgstr "Versione %1"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
+<<<<<<< HEAD
+msgid "Contributors"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
+=======
+>>>>>>> refs/heads/rockwork
 msgid "Legal"
-msgstr "Note legali"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
+<<<<<<< HEAD
+=======
 "Questa applicazione non è né affiliata né supportata da Pebble Techology "
 "Corp."
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Pebble è un marchio registrato di Pebble Technology Corp."
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Apps & Watchfaces"
@@ -242,12 +307,17 @@ msgid "Loading..."
 msgstr "Caricamento..."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
+<<<<<<< HEAD
+msgid "Info"
+msgstr ""
+=======
 msgid "About"
 msgstr "Informazioni su..."
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
 msgid "Developer tools"
-msgstr "Strumenti per sviluppatori"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
 msgid "Manage notifications"
@@ -264,7 +334,7 @@ msgstr "Gestisci le Watchfaces"
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:75
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:8
 msgid "Settings"
-msgstr "Impostazioni"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
@@ -293,7 +363,12 @@ msgstr "Apri Impostazioni"
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:221
 msgid ""
 "Your Pebble smartwatch is in factory mode and needs to be initialized."
+<<<<<<< HEAD
+msgstr ""
+"Il tuo Pebble è in modalitá di fabbrica e sta per essere inizializzato"
+=======
 msgstr "Il tuo Pebble è in modalità di fabbrica e deve essere inizializzato."
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:230
 msgid "Initialize Pebble"
@@ -347,20 +422,28 @@ msgstr "Salva"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:19
 msgid "Distance Units"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Unità di misura distanza"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:35
 msgid "Metric"
-msgstr "Metrica"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:48
 msgid "Imperial"
-msgstr "Imperiale"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
 msgid "Calendar"
-msgstr "Calendario"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
 msgid "Sync calendar to timeline"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Sincronizza calendario con la timeline"
+>>>>>>> refs/heads/rockwork
diff --git a/po/pt.po b/po/pt.po
index bcacaff..cf5fcd2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,17 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: upebble\n"
+<<<<<<< HEAD
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+"PO-Revision-Date: 2016-02-05 15:12+0000\n"
+=======
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
 "PO-Revision-Date: 2016-02-16 15:41+0000\n"
+>>>>>>> refs/heads/rockwork
 "Last-Translator: Vitor Loureiro <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
+=======
 "X-Launchpad-Export-Date: 2016-02-17 05:49+0000\n"
 "X-Generator: Launchpad (build 17925)\n"
 "Language: pt\n"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -58,13 +69,13 @@ msgstr "Adicionar nova watchapp"
 msgid "Add new watchface"
 msgstr "Adicionar nova watchface"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr "Ver todos"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:9
 msgid "Developer Tools"
-msgstr "Ferramentas de Desenvolvimento"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:28
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:11
@@ -74,31 +85,37 @@ msgstr "Capturas de ecrã"
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:35
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:102
 msgid "Report problem"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "Reportar problema"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
 msgid "Install app or watchface from file"
 msgstr "Instalar app ou watchface de arquivo"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr "A preparar pacote de logs..."
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
+<<<<<<< HEAD
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
+msgstr ""
+=======
 msgid "pebble.log"
 msgstr "pebble.log"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
-msgstr "Enviar rockworkd.log"
-
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr "rockworkd.log"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
-msgstr "Enviar logs do relógio"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:146
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:110
@@ -112,7 +129,11 @@ msgid "Firmware upgrade"
 msgstr "Atualização do firmware"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
+=======
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
+>>>>>>> refs/heads/rockwork
 msgstr ""
 "Um novo upgrade de firmware está disponível para o seu Pebble smartwatch."
 
@@ -153,48 +174,59 @@ msgstr "Aplicação Health ativada"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Female"
-msgstr "Feminino"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Male"
-msgstr "Masculino"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:34
 msgid "Age"
-msgstr "Idade"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:47
 msgid "Height (cm)"
-msgstr "Altura (cm)"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:73
 msgid "I want to be more active"
-msgstr "Eu quero ser mais ativo"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:84
 msgid "I want to sleep more"
-msgstr "Eu quero dormir mais"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
 msgid "OK"
+<<<<<<< HEAD
+msgstr ""
+=======
 msgstr "OK"
 
 #: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
 msgid "Import watchapp or watchface"
 msgstr "Importar watchapp ou watchface"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
-msgstr "Versão %1"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
+<<<<<<< HEAD
+msgid "Contributors"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
+=======
+>>>>>>> refs/heads/rockwork
 msgid "Legal"
-msgstr "Legal"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
@@ -205,7 +237,7 @@ msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
-msgstr "Pebble é uma marca comercial da Pebble Technology Corp."
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Apps & Watchfaces"
@@ -241,12 +273,17 @@ msgid "Loading..."
 msgstr "A carregar..."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
+<<<<<<< HEAD
+msgid "Info"
+msgstr ""
+=======
 msgid "About"
 msgstr "Acerca"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
 msgid "Developer tools"
-msgstr "Ferramentas do programador"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
 msgid "Manage notifications"
@@ -263,7 +300,7 @@ msgstr "Gerir watchfaces"
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:75
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:8
 msgid "Settings"
-msgstr "Configurações"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
@@ -346,15 +383,15 @@ msgstr "Guardar"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:19
 msgid "Distance Units"
-msgstr "Unidades de distância"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:35
 msgid "Metric"
-msgstr "Métrica"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:48
 msgid "Imperial"
-msgstr "Imperial"
+msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
 msgid "Calendar"
diff --git a/po/rockwork.mzanetti.pot b/po/rockwork.mzanetti.pot
index 6017fa8..a783b9a 100644
--- a/po/rockwork.mzanetti.pot
+++ b/po/rockwork.mzanetti.pot
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+=======
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
+>>>>>>> refs/heads/rockwork
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,7 +61,7 @@ msgstr ""
 msgid "Add new watchface"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr ""
 
@@ -75,26 +79,19 @@ msgstr ""
 msgid "Report problem"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
-msgid "Install app or watchface from file"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
-msgid "pebble.log"
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
 msgstr ""
@@ -111,7 +108,7 @@ msgid "Firmware upgrade"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
-msgid "A new firmware upgrade is available for your Pebble smartwatch."
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
@@ -179,10 +176,6 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
-msgid "Import watchapp or watchface"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
@@ -236,7 +229,7 @@ msgid "Loading..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
-msgid "About"
+msgid "Info"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
diff --git a/po/ru.po b/po/ru.po
index c3576f5..0a7628d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,17 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rockwork\n"
+<<<<<<< HEAD
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+=======
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
+>>>>>>> refs/heads/rockwork
 "PO-Revision-Date: 2016-01-23 13:33+0000\n"
 "Last-Translator: Eugene Marshal <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< HEAD
+"X-Launchpad-Export-Date: 2016-02-08 05:41+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
+=======
 "X-Launchpad-Export-Date: 2016-02-15 05:44+0000\n"
 "X-Generator: Launchpad (build 17925)\n"
 "Language: ru\n"
+>>>>>>> refs/heads/rockwork
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -58,7 +68,7 @@ msgstr "Добавить приложение"
 msgid "Add new watchface"
 msgstr "Добавить циферблат"
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr "См. все"
 
@@ -76,26 +86,19 @@ msgstr "Снимки экрана"
 msgid "Report problem"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
-msgid "Install app or watchface from file"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
-msgid "pebble.log"
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
 msgstr ""
@@ -112,7 +115,7 @@ msgid "Firmware upgrade"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
-msgid "A new firmware upgrade is available for your Pebble smartwatch."
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
@@ -180,10 +183,6 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
-msgid "Import watchapp or watchface"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
@@ -237,7 +236,7 @@ msgid "Loading..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
-msgid "About"
+msgid "Info"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
diff --git a/po/template.pot b/po/template.pot
index 6017fa8..a783b9a 100644
--- a/po/template.pot
+++ b/po/template.pot
@@ -8,7 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
+"POT-Creation-Date: 2016-02-08 03:04+0100\n"
+=======
 "POT-Creation-Date: 2016-02-14 23:39+0100\n"
+>>>>>>> refs/heads/rockwork
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,7 +61,7 @@ msgstr ""
 msgid "Add new watchface"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
 msgstr ""
 
@@ -75,26 +79,19 @@ msgstr ""
 msgid "Report problem"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
-msgid "Install app or watchface from file"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
-msgid "pebble.log"
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
+msgid "rockworkd.log"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
 msgstr ""
@@ -111,7 +108,7 @@ msgid "Firmware upgrade"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
-msgid "A new firmware upgrade is available for your Pebble smartwatch."
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
@@ -179,10 +176,6 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
-msgid "Import watchapp or watchface"
-msgstr ""
-
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
 msgid "Version %1"
@@ -236,7 +229,7 @@ msgid "Loading..."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
-msgid "About"
+msgid "Info"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22