Merge branch 'rockwork'

Conflicts:
	po/de.po
	po/en_GB.po
	po/eu.po
	po/fr.po
	po/hu.po
	po/it.po
	po/pt.po
	po/rockwork.mzanetti.pot
	po/ru.po
	po/template.pot
	rockwork/InfoPage.qml
	rockwork/Main.qml
	rockwork/NotificationsPage.qml
	rockworkd/rockworkd.pro
	version.pri

13 files changed, 931 insertions, 199 deletions

diff --git a/po/de.po b/po/de.po
index ee2254c..aa8956d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,16 +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"
@@ -31,7 +43,7 @@ msgstr "Installieren"
 
 #: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
 msgid "Installing..."
-msgstr ""
+msgstr "Installiere..."
 
 #: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
 msgid "Installed"
@@ -63,7 +75,7 @@ msgstr "Alle anzeigen"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:9
 msgid "Developer Tools"
-msgstr ""
+msgstr "Entwicklertools"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:28
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:11
@@ -73,24 +85,44 @@ msgstr "Bildschirmfotos"
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:35
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:102
 msgid "Report problem"
-msgstr ""
+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 ""
+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"
-msgstr ""
+msgstr "Logs der Uhr schicken"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:146
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:110
@@ -101,99 +133,112 @@ msgstr "Abbrechen"
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:6
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:84
 msgid "Firmware upgrade"
-msgstr ""
+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
 msgid "Currently installed firmware: %1"
-msgstr ""
+msgstr "Aktuell installierte Software: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:29
 #, qt-format
 msgid "Candidate firmware version: %1"
-msgstr ""
+msgstr "Verfügbare Softwareversion: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:35
 #, qt-format
 msgid "Release Notes: %1"
-msgstr ""
+msgstr "Änderungsnotizen: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:41
 msgid "Important:"
-msgstr ""
+msgstr "Wichtig:"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:41
 msgid ""
 "This update will also upgrade recovery data. Make sure your Pebble "
 "smartwarch is connected to a power adapter."
 msgstr ""
+"Dieses Update wird auch die Wiederherstellungsdaten überschreiben. Bitte "
+"stellen Sie sicher, dass Ihre Pebble Smartwatch an das Stromnetz "
+"angeschlossen ist, um Probleme zu vermeiden."
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:9
 msgid "Health settings"
-msgstr ""
+msgstr "Gesundheitseinstellungen"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:17
 msgid "Health app enabled"
-msgstr ""
+msgstr "Gesundheits-App aktiviert"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Female"
-msgstr ""
+msgstr "Weiblich"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Male"
-msgstr ""
+msgstr "Männlich"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:34
 msgid "Age"
-msgstr ""
+msgstr "Alter"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:47
 msgid "Height (cm)"
-msgstr ""
+msgstr "Größe (cm):"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
 msgid "Weight"
-msgstr ""
+msgstr "Gewicht"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:73
 msgid "I want to be more active"
-msgstr ""
+msgstr "Ich möchte aktiver sein"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:84
 msgid "I want to sleep more"
-msgstr ""
+msgstr "Ich möchte mehr schlafen"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
 msgid "OK"
-msgstr ""
+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"
-msgstr ""
+msgstr "Version %1"
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr ""
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
-msgstr ""
+msgstr "Rechtliches"
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
+"Diese Anwendung ist weder mit Pebble Technology Corp verbunden, noch wird "
+"sie davon unterstützt."
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
-msgstr ""
+msgstr "Pebble ist ein eingtragenes Warenzeichen der Pebble Technology Corp."
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Apps & Watchfaces"
@@ -224,13 +269,22 @@ msgstr "Löschen"
 msgid "Close"
 msgstr "Schließen"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+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"
-msgstr ""
+msgstr "Entwicklerwerkzeuge"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
 msgid "Manage notifications"
@@ -247,7 +301,7 @@ msgstr "Ziffernblätter verwalten"
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:75
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:8
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
@@ -264,24 +318,29 @@ msgid ""
 "Your Pebble smartwatch is disconnected. Please make sure it is powered on, "
 "within range and it is paired properly in the Bluetooth System Settings."
 msgstr ""
+"Ihre Pebble Smartwatch ist nicht verbunden. Bitte stellen Sie sicher, dass "
+"sie angeschaltet ist, sich in Reichweite befindet und in den Bluetooth "
+"Einstellungen ordnungsgemäß gekoppelt ist."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:213
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:64
 msgid "Open System Settings"
-msgstr ""
+msgstr "Systemeinstellungen öffnen"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:221
 msgid ""
 "Your Pebble smartwatch is in factory mode and needs to be initialized."
 msgstr ""
+"Ihre Pebble Smartwatch befindet sich im Werkszustand muss initialisiert "
+"werden."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:230
 msgid "Initialize Pebble"
-msgstr ""
+msgstr "Pebble initialisieren"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:262
 msgid "Upgrading..."
-msgstr ""
+msgstr "Aktualisierung läuft …"
 
 #: /home/micha/Develop/upebble/rockwork/NotificationsPage.qml:8
 msgid "Notifications"
@@ -292,6 +351,9 @@ msgid ""
 "Entries here will be added as notifications appear on the phone. Selected "
 "notifications will be shown on your Pebble smartwatch."
 msgstr ""
+"Sobald neue Benachrichtigungen auf Ihrem Mobiltelefon eintreffen, werden sie "
+"dieser Liste hinzugefügt. Ausgewählte Benachrichtigungen werden auf Ihrer "
+"Pebble Smartwatch angezeigt."
 
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:6
 msgid "Manage Pebble Watches"
@@ -302,6 +364,8 @@ msgid ""
 "No Pebble smartwatches configured yet. Please connect your Pebble smartwatch "
 "using System Settings."
 msgstr ""
+"Keine Pebble Smartwatches eingerichtet. Bitte verbinden Sie Ihre Pebble "
+"Smartwatch in den Systemeinstellungen"
 
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:69
 msgid "Screenshot options"
@@ -322,20 +386,20 @@ msgstr "Speichern"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:19
 msgid "Distance Units"
-msgstr ""
+msgstr "Enterfernungseinheiten"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:35
 msgid "Metric"
-msgstr ""
+msgstr "Metrisch"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:48
 msgid "Imperial"
-msgstr ""
+msgstr "Britisch"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
 msgid "Calendar"
-msgstr ""
+msgstr "Kalender"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
 msgid "Sync calendar to timeline"
-msgstr ""
+msgstr "Kalender in die Zeitleiste synchronisieren"
diff --git a/po/el.po b/po/el.po
index 8554238..ece928a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rockwork\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-09 23:31+0100\n"
-"PO-Revision-Date: 2016-02-08 16:59+0000\n"
+"POT-Creation-Date: 2016-02-14 23:39+0100\n"
+"PO-Revision-Date: 2016-02-15 06:05+0000\n"
 "Last-Translator: Aggelos Arnaoutis <angelosarn@hotmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
-"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-02-09 06:16+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: el\n"
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -112,10 +112,8 @@ msgid "Firmware upgrade"
 msgstr "Αναβάθμιση υλικολογισμικού"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
-#, fuzzy
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
 msgstr ""
-"Μια νέα αναβάθμιση υλικολογισμικού είναι διαθέσιμη για το ρολόι Pebble σας."
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
 #, qt-format
@@ -194,20 +192,16 @@ msgid "Version %1"
 msgstr "Έκδοση %1"
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr "Συντελεστές"
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
 msgstr ""
 
@@ -240,6 +234,10 @@ msgstr "Διαγραφή"
 msgid "Close"
 msgstr "Κλείσιμο"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr ""
+
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
 msgid "About"
 msgstr ""
@@ -287,7 +285,8 @@ msgid "Open System Settings"
 msgstr "Άνοιγμα ρυθμίσεων συστήματος"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:221
-msgid "Your Pebble smartwatch is in factory mode and needs to be initialized."
+msgid ""
+"Your Pebble smartwatch is in factory mode and needs to be initialized."
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:230
@@ -354,6 +353,3 @@ msgstr "Ημερολόγιο"
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
 msgid "Sync calendar to timeline"
 msgstr ""
-
-#~ msgid "Info"
-#~ msgstr "Πληροφορίες"
diff --git a/po/en_GB.po b/po/en_GB.po
index bda1364..2a022a8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,16 +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"
@@ -31,7 +44,7 @@ msgstr "Install"
 
 #: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
 msgid "Installing..."
-msgstr ""
+msgstr "Installing..."
 
 #: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
 msgid "Installed"
@@ -63,7 +76,7 @@ msgstr "See all"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:9
 msgid "Developer Tools"
-msgstr ""
+msgstr "Developer Tools"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:28
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:11
@@ -73,24 +86,44 @@ msgstr "Screenshots"
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:35
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:102
 msgid "Report problem"
-msgstr ""
+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 ""
+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"
-msgstr ""
+msgstr "Send watch logs"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:146
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:110
@@ -101,99 +134,111 @@ msgstr "Cancel"
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:6
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:84
 msgid "Firmware upgrade"
-msgstr ""
+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
 msgid "Currently installed firmware: %1"
-msgstr ""
+msgstr "Currently installed firmware: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:29
 #, qt-format
 msgid "Candidate firmware version: %1"
-msgstr ""
+msgstr "Candidate firmware version: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:35
 #, qt-format
 msgid "Release Notes: %1"
-msgstr ""
+msgstr "Release Notes: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:41
 msgid "Important:"
-msgstr ""
+msgstr "Important:"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:41
 msgid ""
 "This update will also upgrade recovery data. Make sure your Pebble "
 "smartwarch is connected to a power adapter."
 msgstr ""
+"This update will also upgrade recovery data. Make sure your Pebble "
+"smartwarch is connected to a power adapter."
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:9
 msgid "Health settings"
-msgstr ""
+msgstr "Health settings"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:17
 msgid "Health app enabled"
-msgstr ""
+msgstr "Health app enabled"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Female"
-msgstr ""
+msgstr "Female"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Male"
-msgstr ""
+msgstr "Male"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:34
 msgid "Age"
-msgstr ""
+msgstr "Age"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:47
 msgid "Height (cm)"
-msgstr ""
+msgstr "Height (cm)"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
 msgid "Weight"
-msgstr ""
+msgstr "Weight"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:73
 msgid "I want to be more active"
-msgstr ""
+msgstr "I want to be more active"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:84
 msgid "I want to sleep more"
-msgstr ""
+msgstr "I want to sleep more"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
 msgid "OK"
-msgstr ""
+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"
-msgstr ""
+msgstr "Version %1"
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr ""
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
-msgstr ""
+msgstr "Legal"
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
+"This application is neither affiliated with nor endorsed by Pebble "
+"Technology Corp."
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
-msgstr ""
+msgstr "Pebble is a trademark of Pebble Technology Corp."
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Apps & Watchfaces"
@@ -224,13 +269,22 @@ msgstr "Delete"
 msgid "Close"
 msgstr "Close"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+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"
-msgstr ""
+msgstr "Developer tools"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
 msgid "Manage notifications"
@@ -247,7 +301,7 @@ msgstr "Manage Watchfaces"
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:75
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:8
 msgid "Settings"
-msgstr ""
+msgstr "Settings"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
@@ -264,24 +318,27 @@ msgid ""
 "Your Pebble smartwatch is disconnected. Please make sure it is powered on, "
 "within range and it is paired properly in the Bluetooth System Settings."
 msgstr ""
+"Your Pebble smartwatch is disconnected. Please make sure it is powered on, "
+"within range and it is paired properly in the Bluetooth System Settings."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:213
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:64
 msgid "Open System Settings"
-msgstr ""
+msgstr "Open System Settings"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:221
 msgid ""
 "Your Pebble smartwatch is in factory mode and needs to be initialized."
 msgstr ""
+"Your Pebble smartwatch is in factory mode and needs to be initialized."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:230
 msgid "Initialize Pebble"
-msgstr ""
+msgstr "Initialize Pebble"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:262
 msgid "Upgrading..."
-msgstr ""
+msgstr "Upgrading..."
 
 #: /home/micha/Develop/upebble/rockwork/NotificationsPage.qml:8
 msgid "Notifications"
@@ -292,6 +349,8 @@ msgid ""
 "Entries here will be added as notifications appear on the phone. Selected "
 "notifications will be shown on your Pebble smartwatch."
 msgstr ""
+"Entries here will be added as notifications appear on the phone. Selected "
+"notifications will be shown on your Pebble smartwatch."
 
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:6
 msgid "Manage Pebble Watches"
@@ -302,6 +361,8 @@ msgid ""
 "No Pebble smartwatches configured yet. Please connect your Pebble smartwatch "
 "using System Settings."
 msgstr ""
+"No Pebble smartwatches configured yet. Please connect your Pebble smartwatch "
+"using System Settings."
 
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:69
 msgid "Screenshot options"
@@ -322,20 +383,20 @@ msgstr "Save"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:19
 msgid "Distance Units"
-msgstr ""
+msgstr "Distance Units"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:35
 msgid "Metric"
-msgstr ""
+msgstr "Metric"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:48
 msgid "Imperial"
-msgstr ""
+msgstr "Imperial"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
 msgid "Calendar"
-msgstr ""
+msgstr "Calendar"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
 msgid "Sync calendar to timeline"
-msgstr ""
+msgstr "Sync calendar to Timeline"
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..533b16f
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,356 @@
+# Spanish translation for rockwork
+# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
+# This file is distributed under the same license as the rockwork package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: rockwork\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-02-14 23:39+0100\n"
+"PO-Revision-Date: 2016-02-10 08:42+0000\n"
+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2016-02-15 05:44+0000\n"
+"X-Generator: Launchpad (build 17925)\n"
+
+#: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
+msgid "App Settings"
+msgstr "Configuración de aplicación"
+
+#: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:9
+msgid "App details"
+msgstr "Detalles de aplicación"
+
+#: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
+msgid "Install"
+msgstr "Instalar"
+
+#: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
+msgid "Installing..."
+msgstr "Instalando…"
+
+#: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
+msgid "Installed"
+msgstr "Instalada"
+
+#: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:235
+msgid "Description"
+msgstr "Descripción"
+
+#: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:258
+msgid "Developer"
+msgstr "Desarrollador"
+
+#: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:266
+msgid "Version"
+msgstr "Versión"
+
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:8
+msgid "Add new watchapp"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:8
+msgid "Add new watchface"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+msgid "See all"
+msgstr "Ver todo"
+
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:9
+msgid "Developer Tools"
+msgstr "Herramientas de desarrollo"
+
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:28
+#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:11
+msgid "Screenshots"
+msgstr "Capturas de pantalla"
+
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:35
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:102
+msgid "Report problem"
+msgstr "Informar de un problema"
+
+#: /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"
+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 ""
+
+#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:146
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:110
+#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:99
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:6
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:84
+msgid "Firmware upgrade"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+msgid "A new firmware upgrade is available for your Pebble smartwatch."
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
+#, qt-format
+msgid "Currently installed firmware: %1"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:29
+#, qt-format
+msgid "Candidate firmware version: %1"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:35
+#, qt-format
+msgid "Release Notes: %1"
+msgstr "Notas de publicación: %1"
+
+#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:41
+msgid "Important:"
+msgstr "Importante:"
+
+#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:41
+msgid ""
+"This update will also upgrade recovery data. Make sure your Pebble "
+"smartwarch is connected to a power adapter."
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:9
+msgid "Health settings"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:17
+msgid "Health app enabled"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
+msgid "Female"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
+msgid "Male"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:34
+msgid "Age"
+msgstr "Edad"
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:47
+msgid "Height (cm)"
+msgstr "Altura (cm)"
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
+msgid "Weight"
+msgstr "Peso"
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:73
+msgid "I want to be more active"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:84
+msgid "I want to sleep more"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
+msgid "OK"
+msgstr "Aceptar"
+
+#: /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"
+msgstr "Versión %1"
+
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
+msgid "Legal"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
+msgid ""
+"This application is neither affiliated with nor endorsed by Pebble "
+"Technology Corp."
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
+msgid "Pebble is a trademark of Pebble Technology Corp."
+msgstr "Pebble es una marca registrada de Pebble Technology Corp."
+
+#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
+msgid "Apps & Watchfaces"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
+msgid "Apps"
+msgstr "Aplicaciones"
+
+#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
+msgid "Watchfaces"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:167
+msgid "Launch"
+msgstr "Iniciar"
+
+#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:176
+msgid "Configure"
+msgstr "Configurar"
+
+#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:186
+#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:91
+msgid "Delete"
+msgstr "Eliminar"
+
+#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:196
+msgid "Close"
+msgstr "Cerrar"
+
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
+msgid "About"
+msgstr "Acerca de"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
+msgid "Developer tools"
+msgstr "Herramientas de desarrollo"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
+msgid "Manage notifications"
+msgstr "Gestionar notificaciones"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:59
+msgid "Manage Apps"
+msgstr "Gestionar aplicaciones"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:67
+msgid "Manage Watchfaces"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:75
+#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:8
+msgid "Settings"
+msgstr "Configuración"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
+#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
+msgid "Connected"
+msgstr "Conectado"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
+#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:203
+msgid ""
+"Your Pebble smartwatch is disconnected. Please make sure it is powered on, "
+"within range and it is paired properly in the Bluetooth System Settings."
+msgstr ""
+"El reloj inteligente Pebble está desconectado. Asegúrese de que esté "
+"encendido, cerca y emparejado correctamente en la sección «Bluetooth» de "
+"Configuración del sistema."
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:213
+#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:64
+msgid "Open System Settings"
+msgstr "Abrir Configuración del sistema"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:221
+msgid ""
+"Your Pebble smartwatch is in factory mode and needs to be initialized."
+msgstr ""
+"El reloj inteligente Pebble está en modo de fábrica y debe inicializarse."
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:230
+msgid "Initialize Pebble"
+msgstr "Inicializar Pebble"
+
+#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:262
+msgid "Upgrading..."
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/NotificationsPage.qml:8
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: /home/micha/Develop/upebble/rockwork/NotificationsPage.qml:29
+msgid ""
+"Entries here will be added as notifications appear on the phone. Selected "
+"notifications will be shown on your Pebble smartwatch."
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:6
+msgid "Manage Pebble Watches"
+msgstr "Gestionar relojes Pebble"
+
+#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:57
+msgid ""
+"No Pebble smartwatches configured yet. Please connect your Pebble smartwatch "
+"using System Settings."
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:69
+msgid "Screenshot options"
+msgstr "Opciones de captura de pantalla"
+
+#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:74
+msgid "Share"
+msgstr "Compartir"
+
+#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:77
+#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:85
+msgid "Pebble screenshot"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:82
+msgid "Save"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:19
+msgid "Distance Units"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:35
+msgid "Metric"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:48
+msgid "Imperial"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
+msgid "Calendar"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
+msgid "Sync calendar to timeline"
+msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 8377870..b7c9dcf 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,16 +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"
@@ -104,9 +115,12 @@ 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 ""
-"Firmware eguneraketa bat dago eskuragarri zure Pebble smartwatch-earentzat."
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
 #, qt-format
@@ -181,20 +195,16 @@ msgid "Version %1"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr ""
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
 msgstr ""
 
@@ -227,6 +237,10 @@ msgstr "Ezabatu"
 msgid "Close"
 msgstr "Itxi"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr ""
+
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
 msgid "Info"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 8223379..b069940 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,16 +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"
@@ -73,16 +85,29 @@ 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 ""
+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"
@@ -90,7 +115,7 @@ msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
 msgid "Send watch logs"
-msgstr ""
+msgstr "Envoi des rapports"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:146
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:110
@@ -104,10 +129,14 @@ 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 version du logiciel est disponible pour votre montre connectée "
-"Pebble."
+"Une nouvelle mise à niveau du micrologiciel est disponible pour votre montre "
+"connectée Pebble."
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
 #, qt-format
@@ -143,7 +172,11 @@ 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"
@@ -163,19 +196,27 @@ msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
 msgid "Weight"
-msgstr ""
+msgstr "Masse"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:73
 msgid "I want to be more active"
-msgstr ""
+msgstr "Je veux être plus actif"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:84
 msgid "I want to sleep more"
-msgstr ""
+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
@@ -183,22 +224,27 @@ msgid "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 ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
+"Cette application n'est ni affiliée et ni approuvée par Pebble Technology "
+"Corp."
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
-msgstr ""
+msgstr "Pebble est une marque déposée par Pebble Technology Corp."
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Apps & Watchfaces"
@@ -229,9 +275,18 @@ msgstr "Supprimer"
 msgid "Close"
 msgstr "Fermer"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+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"
@@ -353,4 +408,8 @@ 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 a49fd8a..968cd20 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,16 +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"
@@ -104,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
@@ -180,20 +196,16 @@ msgid "Version %1"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr ""
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
 msgstr ""
 
@@ -226,6 +238,10 @@ msgstr "Törlés"
 msgid "Close"
 msgstr "Bezárás"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr ""
+
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
 msgid "Info"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 80895f5..2f9b978 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,24 +6,37 @@
 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"
-msgstr "Impostazioni dell' applicazione"
+msgstr "Impostazioni App"
 
 #: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:9
 msgid "App details"
-msgstr "Dettagli sull'app"
+msgstr "Dettagli App"
 
 #: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
 msgid "Install"
@@ -35,7 +48,7 @@ msgstr "Installazione in corso..."
 
 #: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:57
 msgid "Installed"
-msgstr "Installato"
+msgstr "Installata"
 
 #: /home/micha/Develop/upebble/rockwork/AppStoreDetailsPage.qml:235
 msgid "Description"
@@ -51,11 +64,11 @@ msgstr "Versione"
 
 #: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:8
 msgid "Add new watchapp"
-msgstr "Aggiungi una nuova watchapp"
+msgstr "Aggiungi Watchapp"
 
 #: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:8
 msgid "Add new watchface"
-msgstr "Aggiungi una nuova watchapp"
+msgstr "Aggiungi Watchface"
 
 #: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
 msgid "See all"
@@ -63,26 +76,47 @@ 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
 msgid "Screenshots"
-msgstr "Screenshots"
+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"
@@ -90,13 +124,17 @@ 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
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:99
 msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:6
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:84
@@ -104,43 +142,57 @@ 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
 msgid "Currently installed firmware: %1"
-msgstr "Versione del firmware installata prima: %1"
+msgstr "Versione del firmware attuale: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:29
 #, qt-format
 msgid "Candidate firmware version: %1"
-msgstr "Versione candidata all'installazione: %1"
+msgstr "Versione del firmware aggiornata: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:35
 #, qt-format
 msgid "Release Notes: %1"
-msgstr "Note di release: %1"
+msgstr "Note di rilascio: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:41
 msgid "Important:"
-msgstr "Importanza:"
+msgstr "Importante:"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:41
 msgid ""
 "This update will also upgrade recovery data. Make sure your Pebble "
 "smartwarch is connected to a power adapter."
 msgstr ""
-"Questo aggiornamento aggiornerá il sistema. Connetti il tuo Smartwhatch "
-"Pebble alla presa di corrente."
+"Questo aggiornamento aggiornerà i dati di ripristino. Assicurati che il tuo "
+"Pebble sia sotto carica."
 
 #: /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"
@@ -164,7 +216,11 @@ 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"
@@ -172,7 +228,15 @@ 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
@@ -180,22 +244,34 @@ msgid "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 ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /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:79
+#: /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"
@@ -207,7 +283,7 @@ msgstr "App"
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
 msgid "Watchfaces"
-msgstr "Watchfaces"
+msgstr "Watchface"
 
 #: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:167
 msgid "Launch"
@@ -226,9 +302,18 @@ msgstr "Elimina"
 msgid "Close"
 msgstr "Chiudi"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+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"
@@ -240,7 +325,7 @@ msgstr "Gestisci le notifiche"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:59
 msgid "Manage Apps"
-msgstr "Gestisci le applicazioni"
+msgstr "Gestisci le App"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:67
 msgid "Manage Watchfaces"
@@ -266,20 +351,24 @@ msgid ""
 "Your Pebble smartwatch is disconnected. Please make sure it is powered on, "
 "within range and it is paired properly in the Bluetooth System Settings."
 msgstr ""
-"Il tuo Pebble è disconnesso. Controlla che sia acceso,che non sia lontano e "
-"controlla se è accoppiato con questo smartphone nelle impostazioni del "
-"Bluetooth ."
+"Il tuo Pebble è disconnesso. Controlla che sia acceso, si trovi in "
+"prossimità e che sia accoppiato correttamente nella sezione Bluetooth delle "
+"impostazioni di Sistema."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:213
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:64
 msgid "Open System Settings"
-msgstr "Impostazioni aperte"
+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"
@@ -298,24 +387,25 @@ msgid ""
 "Entries here will be added as notifications appear on the phone. Selected "
 "notifications will be shown on your Pebble smartwatch."
 msgstr ""
-"Scrivi quali notifiche dovranno apparire nel telefono. Quelle selezionate "
-"appariranno nel Pebble ."
+"Le applicazioni verranno aggiunte a questa lista quando le relative "
+"notifiche appariranno sul telefono. Quelle selezionate verranno mostrate sul "
+"tuo Pebble."
 
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:6
 msgid "Manage Pebble Watches"
-msgstr "Gestisci le Whatchfaces Pebble"
+msgstr "Gestisci le Whatchfaces del Pebble"
 
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:57
 msgid ""
 "No Pebble smartwatches configured yet. Please connect your Pebble smartwatch "
 "using System Settings."
 msgstr ""
-"Nessuno Smartwhatch Pebble connesso. Connetti il tuo Pebble usando le "
-"impostazioni."
+"Nessuno Smartwatch Pebble configurato. Connetti il tuo Pebble usando le "
+"Impostazioni di Sistema"
 
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:69
 msgid "Screenshot options"
-msgstr "Opzioni sugli Screenshot"
+msgstr "Opzioni screenshot"
 
 #: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:74
 msgid "Share"
@@ -332,7 +422,11 @@ 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"
@@ -348,4 +442,8 @@ 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/ms.po b/po/ms.po
index e038c5a..a153626 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rockwork\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-09 23:31+0100\n"
-"PO-Revision-Date: 2016-02-08 19:12+0000\n"
+"POT-Creation-Date: 2016-02-14 23:39+0100\n"
+"PO-Revision-Date: 2016-02-15 08:53+0000\n"
 "Last-Translator: Adrian Chiang <Unknown>\n"
 "Language-Team: Malay <ms@li.org>\n"
-"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-02-09 06:16+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: ms\n"
 
 #: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
 msgid "App Settings"
@@ -78,7 +78,7 @@ msgstr "Laporkan masalah"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
 msgid "Install app or watchface from file"
-msgstr ""
+msgstr "Memasang aplikasi atau muka jam dari fail"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
 msgid "Preparing logs package..."
@@ -86,7 +86,7 @@ msgstr "Menyediakan pakej log..."
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:120
 msgid "pebble.log"
-msgstr ""
+msgstr "pebble.log"
 
 #: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:127
 msgid "Send rockworkd.log"
@@ -112,7 +112,6 @@ msgid "Firmware upgrade"
 msgstr "Memperbarui perisian tetap"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
-#, fuzzy
 msgid "A new firmware upgrade is available for your Pebble smartwatch."
 msgstr "Perisian tetap yang baru tersedia untuk jam Pebble anda."
 
@@ -181,11 +180,11 @@ msgstr "Saya mahu lebih tidur"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
 msgid "OK"
-msgstr "Baik"
+msgstr "Setuju"
 
 #: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
 msgid "Import watchapp or watchface"
-msgstr ""
+msgstr "Import aplikasi atau muka jam"
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
 #, qt-format
@@ -193,21 +192,17 @@ msgid "Version %1"
 msgstr "Versi %1"
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr "Penyumbang-penyumbang"
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
 msgstr "Perundangan"
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
 "Aplikasi in tidak berkenaan dengan atau disahkan oleh Pebble Technology Corp."
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
 msgstr "Pebble adalah tanda dagang Pebble Technology Corp."
 
@@ -240,13 +235,17 @@ msgstr "Padam"
 msgid "Close"
 msgstr "Tutup"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr "Memuat..."
+
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
 msgid "About"
-msgstr ""
+msgstr "Perihal"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
 msgid "Developer tools"
-msgstr "Peralatan pemaju"
+msgstr "Alat pemaju"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
 msgid "Manage notifications"
@@ -268,7 +267,7 @@ msgstr "Tetapan"
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
 msgid "Connected"
-msgstr "Bersambung"
+msgstr "Sambung"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
@@ -280,8 +279,8 @@ msgid ""
 "Your Pebble smartwatch is disconnected. Please make sure it is powered on, "
 "within range and it is paired properly in the Bluetooth System Settings."
 msgstr ""
-"Jam Pebble anda terputus. Sila pastikan ia dihidupkan, berada dekat dengan "
-"dan dipasangkan dengan betul melalui tetapan sistem Bluetooth."
+"Jam Pebble anda terputus talianya. Sila pastikan ia dihidupkan, berada dekat "
+"dengan dan dipasangkan dengan betul melalui tetapan sistem Bluetooth."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:213
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:64
@@ -289,7 +288,8 @@ msgid "Open System Settings"
 msgstr "Buka Tetapan Sistem"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:221
-msgid "Your Pebble smartwatch is in factory mode and needs to be initialized."
+msgid ""
+"Your Pebble smartwatch is in factory mode and needs to be initialized."
 msgstr ""
 "Jam Pebble anda berada dalam keadaan mod kilang dan perlu dimulakan semula."
 
@@ -362,6 +362,3 @@ msgstr "Kalendar"
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
 msgid "Sync calendar to timeline"
 msgstr "Segerakkan kalendar dengan Timeline"
-
-#~ msgid "Info"
-#~ msgstr "Maklumat"
diff --git a/po/pt.po b/po/pt.po
index 406946e..cf5fcd2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,16 +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"
@@ -73,16 +85,29 @@ 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 ""
+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"
@@ -104,10 +129,13 @@ 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 ""
-"Uma nova actualização do firmware está disponível para o seu Pebble "
-"smartwatch"
+"Um novo upgrade de firmware está disponível para o seu Pebble smartwatch."
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
 #, qt-format
@@ -117,7 +145,7 @@ msgstr "Firmware instalado atualmente: %1"
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:29
 #, qt-format
 msgid "Candidate firmware version: %1"
-msgstr ""
+msgstr "Versão de firmaware candidata: %1"
 
 #: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:35
 #, qt-format
@@ -138,11 +166,11 @@ msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:9
 msgid "Health settings"
-msgstr ""
+msgstr "Configurações do Health"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:17
 msgid "Health app enabled"
-msgstr ""
+msgstr "Aplicação Health ativada"
 
 #: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
 msgid "Female"
@@ -174,7 +202,15 @@ 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
@@ -182,20 +218,24 @@ msgid "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 ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
+"Esta aplicação não é afiliada nem endossada pela Pebble Technology Corp."
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
 msgstr ""
 
@@ -228,9 +268,18 @@ msgstr "Eliminar"
 msgid "Close"
 msgstr "Fechar"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+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"
@@ -268,11 +317,14 @@ msgid ""
 "Your Pebble smartwatch is disconnected. Please make sure it is powered on, "
 "within range and it is paired properly in the Bluetooth System Settings."
 msgstr ""
+"O seu smartwatch Pebble está desconectado. Por favor, verifique se ele está "
+"ligado, dentro do alcance e emparelhado corretamente nas configurações do "
+"Bluetooth."
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:213
 #: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:64
 msgid "Open System Settings"
-msgstr ""
+msgstr "Abra as Definições de Sistema"
 
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:221
 msgid ""
@@ -343,8 +395,8 @@ msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
 msgid "Calendar"
-msgstr ""
+msgstr "Calendário"
 
 #: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
 msgid "Sync calendar to timeline"
-msgstr ""
+msgstr "Sincronizar calendário para o timeline"
diff --git a/po/rockwork.mzanetti.pot b/po/rockwork.mzanetti.pot
index 276f764..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"
@@ -178,20 +182,16 @@ msgid "Version %1"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr ""
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
 msgstr ""
 
@@ -224,6 +224,10 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr ""
+
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
 msgid "Info"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 7f29a5e..0a7628d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,16 +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"
@@ -178,20 +189,16 @@ msgid "Version %1"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr ""
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
 msgstr ""
 
@@ -224,6 +231,10 @@ msgstr "Удалить"
 msgid "Close"
 msgstr "Закрыть"
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr ""
+
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
 msgid "Info"
 msgstr ""
diff --git a/po/template.pot b/po/template.pot
index 276f764..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"
@@ -178,20 +182,16 @@ msgid "Version %1"
 msgstr ""
 
 #: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
-msgid "Contributors"
-msgstr ""
-
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
 msgid "Legal"
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:74
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
 msgid ""
 "This application is neither affiliated with nor endorsed by Pebble "
 "Technology Corp."
 msgstr ""
 
-#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:79
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
 msgid "Pebble is a trademark of Pebble Technology Corp."
 msgstr ""
 
@@ -224,6 +224,10 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: /home/micha/Develop/upebble/rockwork/Main.qml:95
+msgid "Loading..."
+msgstr ""
+
 #: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
 msgid "Info"
 msgstr ""