diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2016-02-18 09:13:32 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2016-02-18 09:13:32 +0100 |
| commit | f4910b3ac84c72a7e17c99895a3b9abb0e9534fe (patch) | |
| tree | 91ae8cfd80dc3d7a2adedee9cab0d407c5c23c84 /po/template.pot | |
| parent | 7305ce8e080d0a6ee7505fe978a2e601b56a5ce8 (diff) | |
| parent | 8f014f0915c7bdc97573f953aa9a3ae25a5f953a (diff) | |
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
Diffstat (limited to 'po/template.pot')
| -rw-r--r-- | po/template.pot | 16 |
1 files changed, 10 insertions, 6 deletions
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 "" |