diff options
Diffstat (limited to 'po/eu.po')
| -rw-r--r-- | po/eu.po | 33 |
1 files changed, 18 insertions, 15 deletions
@@ -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 |