1 files changed, 9 insertions, 16 deletions
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