diff options
Diffstat (limited to 'po/en_GB.po')
| -rw-r--r-- | po/en_GB.po | 40 |
1 files changed, 39 insertions, 1 deletions
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" |