summaryrefslogtreecommitdiff
path: root/po/eu.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/eu.po')
-rw-r--r--po/eu.po28
1 files changed, 21 insertions, 7 deletions
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 ""