Merge tag 'upstream/0.4.6'

Upstream version 0.4.6

1 files changed, 19 insertions, 16 deletions

diff --git a/po/it.po b/po/it.po
index b760975..1359a9c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-06-23 04:00-0500\n"
-"PO-Revision-Date: 2012-06-22 15:28+0000\n"
-"Last-Translator: Marco Solari <marcosolari@gmail.com>\n"
+"PO-Revision-Date: 2012-09-30 14:30+0000\n"
+"Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"
 "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"
-"X-Launchpad-Export-Date: 2012-06-25 00:48+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-11-26 19:04+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. Translators: if neccessary, for guidance in how to translate this program, you may see http://damonlynch.net/translate.html
 #: rapid/rapid.py:112 rapid/rapid.py:1784 rapid/glade3/rapid.ui.h:1
@@ -39,7 +39,7 @@ msgstr "%(date)s %(time)s"
 #: rapid/rapid.py:122
 #, python-format
 msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
-msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
+msgstr "%(date)s %(hour)s.%(minute)s.%(second)s.%(subsecond)s"
 
 #. Device refers to a thing like a camera, memory card in its reader,
 #. external hard drive, Portable Storage Device, etc.
@@ -55,12 +55,12 @@ msgstr "Dimensione"
 
 #: rapid/rapid.py:178
 msgid "Download Progress"
-msgstr "Avanzamento del download"
+msgstr "Avanzamento scaricamento"
 
 #: rapid/rapid.py:336
 #, python-format
 msgid "%(device)s did not unmount"
-msgstr "%(device)s non si è smontato correttamente"
+msgstr "%(device)s non è stato smontato correttamente"
 
 #. This refers to when a device like a hard drive is having its contents scanned,
 #. looking for photos or videos. It is visible initially in the progress bar for each device
@@ -68,7 +68,7 @@ msgstr "%(device)s non si è smontato correttamente"
 #. It maybe displayed only briefly if the contents of the device being scanned is small.
 #: rapid/rapid.py:1216
 msgid "scanning..."
-msgstr "scansione in corso..."
+msgstr "Analisi..."
 
 #. this location is a human readable explanation for /, and is inserted into Downloading from %(location)s
 #: rapid/rapid.py:1782
@@ -79,7 +79,7 @@ msgstr "l'origine del file system"
 #: rapid/rapid.py:1786
 #, python-format
 msgid "Downloading from %(location)s."
-msgstr "Si scarica da %(location)s."
+msgstr "Scaricamento da %(location)s."
 
 #: rapid/rapid.py:1787
 msgid ""
@@ -91,7 +91,7 @@ msgstr ""
 
 #: rapid/rapid.py:2209
 msgid "Download"
-msgstr "Download"
+msgstr "Scarica"
 
 #: rapid/rapid.py:2212
 msgid "Pause"
@@ -104,7 +104,7 @@ msgid ""
 "%(folder1)s\n"
 "%(folder2)s"
 msgstr ""
-"Queste cartelle per il download non sono valide:\n"
+"Le seguenti cartelle da scaricare non sono valide:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 
@@ -114,7 +114,7 @@ msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
-"Questa cartelle per il download non è valida:\n"
+"La seguente cartella da scaricare non è valida:\n"
 "%s"
 
 #: rapid/rapid.py:2321
@@ -140,7 +140,7 @@ msgstr "Manca circa 1 minuto"
 #: rapid/rapid.py:2709
 #, python-format
 msgid "About %(minutes)i:%(seconds)02i minutes remaining"
-msgstr "Circa %(minutes)i:%(seconds)02i minuti rimanenti"
+msgstr "Circa %(minutes)i.%(seconds)02i minuti rimanenti"
 
 #: rapid/rapid.py:2731 rapid/rpdfile.py:123
 msgid "photos and videos"
@@ -423,6 +423,9 @@ msgid ""
 "Error: specify device auto-detection or manually specify a device's path "
 "from which to download, but do not do both."
 msgstr ""
+"Errore: specifica il dispositivo di autorilevamento o specifica manualmente "
+"il percorso di un dispositivo dal quale scaricare, ma non fare entrambe le "
+"cose."
 
 #: rapid/rapid.py:3991
 #, python-format
@@ -580,17 +583,17 @@ msgstr "Lunghezza focale"
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:182
 msgid "Camera make"
-msgstr "Marca della fotocamera"
+msgstr "Marca fotocamera"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:184
 msgid "Camera model"
-msgstr "Modello della fotocamera (es.: Canon EOS-1Ds Mark III)"
+msgstr "Modello fotocamera"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:186
 msgid "Short camera model"
-msgstr "Modello brevissimo della fotocamera (es.: D300)"
+msgstr "Modello fotocamera breve"
 
 #. Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
 #: rapid/generatenameconfig.py:188