summaryrefslogtreecommitdiff
path: root/po/it.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/it.po')
-rw-r--r--po/it.po121
1 files changed, 102 insertions, 19 deletions
diff --git a/po/it.po b/po/it.po
index 83e53d4..2f9b978 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,17 +6,29 @@
msgid ""
msgstr ""
"Project-Id-Version: upebble\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-02-02 06:06+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 12:21+0000\n"
"Last-Translator: Marco Trevisan (Treviño) <mail@3v1n0.net>\n"
+>>>>>>> refs/heads/rockwork
"Language-Team: Italian <it@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: it\n"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/AppSettingsPage.qml:13
msgid "App Settings"
@@ -58,13 +70,17 @@ msgstr "Aggiungi Watchapp"
msgid "Add new watchface"
msgstr "Aggiungi Watchface"
-#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:125
+#: /home/micha/Develop/upebble/rockwork/AppStorePage.qml:119
msgid "See all"
msgstr "Mostra tutto"
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:9
msgid "Developer Tools"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Strumenti per sviluppatori"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:28
#: /home/micha/Develop/upebble/rockwork/ScreenshotsPage.qml:11
@@ -74,31 +90,45 @@ msgstr "Screenshot"
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:35
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:102
msgid "Report problem"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Riporta un problema"
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:42
msgid "Install app or watchface from file"
msgstr "Installa app o watchface da file"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:109
msgid "Preparing logs package..."
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Preparazione del pacchetto di log..."
+>>>>>>> refs/heads/rockwork
#: /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"
-msgstr "Invia rockworkd.log"
-
-#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:132
-msgid "rockworkd.log"
-msgstr "rockworkd.log"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:137
msgid "Send watch logs"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Invia log dell'orologio"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/DeveloperToolsPage.qml:146
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:110
@@ -112,9 +142,14 @@ msgid "Firmware upgrade"
msgstr "Aggiornamento Firmware"
#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:16
+<<<<<<< HEAD
+msgid "A new firmware upgrade is available for your Pebble smarwatch."
+msgstr "Un nuovo aggiornamento del firmware è disponibile per il tuo Pebble."
+=======
msgid "A new firmware upgrade is available for your Pebble smartwatch."
msgstr ""
"Un nuovo aggiornamento firmware è disponibile per il tuo Smartwatch Pebble"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/FirmwareUpgradePage.qml:23
#, qt-format
@@ -145,68 +180,98 @@ msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:9
msgid "Health settings"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Impostazioni Health"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:17
msgid "Health app enabled"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "App Health attiva"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
msgid "Female"
-msgstr "Femmina"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:28
msgid "Male"
-msgstr "Maschio"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:34
msgid "Age"
-msgstr "Età"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:47
msgid "Height (cm)"
-msgstr "Altezza (cm)"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:60
msgid "Weight"
-msgstr "Peso"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:73
msgid "I want to be more active"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Vorrei essere più attivo"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:84
msgid "I want to sleep more"
-msgstr "Vorrei dormire di più"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/HealthSettingsDialog.qml:95
msgid "OK"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "OK"
#: /home/micha/Develop/upebble/rockwork/ImportPackagePage.qml:7
msgid "Import watchapp or watchface"
msgstr "Importa una app o una watchface"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:31
#, qt-format
msgid "Version %1"
-msgstr "Versione %1"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:40
+<<<<<<< HEAD
+msgid "Contributors"
+msgstr ""
+
+#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:52
+=======
+>>>>>>> refs/heads/rockwork
msgid "Legal"
-msgstr "Note legali"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:62
msgid ""
"This application is neither affiliated with nor endorsed by Pebble "
"Technology Corp."
msgstr ""
+<<<<<<< HEAD
+=======
"Questa applicazione non è né affiliata né supportata da Pebble Techology "
"Corp."
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/InfoPage.qml:67
msgid "Pebble is a trademark of Pebble Technology Corp."
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Pebble è un marchio registrato di Pebble Technology Corp."
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/InstalledAppsPage.qml:9
msgid "Apps & Watchfaces"
@@ -242,12 +307,17 @@ msgid "Loading..."
msgstr "Caricamento..."
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:15
+<<<<<<< HEAD
+msgid "Info"
+msgstr ""
+=======
msgid "About"
msgstr "Informazioni su..."
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:22
msgid "Developer tools"
-msgstr "Strumenti per sviluppatori"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:52
msgid "Manage notifications"
@@ -264,7 +334,7 @@ msgstr "Gestisci le Watchfaces"
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:75
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:8
msgid "Settings"
-msgstr "Impostazioni"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:190
#: /home/micha/Develop/upebble/rockwork/PebblesPage.qml:36
@@ -293,7 +363,12 @@ msgstr "Apri Impostazioni"
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:221
msgid ""
"Your Pebble smartwatch is in factory mode and needs to be initialized."
+<<<<<<< HEAD
+msgstr ""
+"Il tuo Pebble è in modalitá di fabbrica e sta per essere inizializzato"
+=======
msgstr "Il tuo Pebble è in modalità di fabbrica e deve essere inizializzato."
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/MainMenuPage.qml:230
msgid "Initialize Pebble"
@@ -347,20 +422,28 @@ msgstr "Salva"
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:19
msgid "Distance Units"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Unità di misura distanza"
+>>>>>>> refs/heads/rockwork
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:35
msgid "Metric"
-msgstr "Metrica"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:48
msgid "Imperial"
-msgstr "Imperiale"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:55
msgid "Calendar"
-msgstr "Calendario"
+msgstr ""
#: /home/micha/Develop/upebble/rockwork/SettingsPage.qml:62
msgid "Sync calendar to timeline"
+<<<<<<< HEAD
+msgstr ""
+=======
msgstr "Sincronizza calendario con la timeline"
+>>>>>>> refs/heads/rockwork