From f86ff67ef48f79650da056bce5487da570e03cdb Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan@gmail.com>
Date: Thu, 7 Nov 2013 23:08:54 +0100
Subject: [PATCH] autospec.po: add missing italian translation strings

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>

Conflicts:
	ChangeLog
---
 ChangeLog         | 15 +++++++++++++--
 po/it/autospec.po |  6 ++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3c14db..ec258db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 Changes in version 1.16.4 - "Korbielow" release
-Sat Jul 13 2013 Madrisan <davide.madrisan(a)gmail.com>
+Thu Nov 07 2013 Madrisan <davide.madrisan(a)gmail.com>
 
 + bugfix
   * lib/libtest.lib - Davide Madrisan:
@@ -28,7 +28,6 @@ Sat Jul 13 2013 Madrisan <davide.madrisan(a)gmail.com>
     New configuration file for the OCaml (library) modules.
 
 + update
-
   * po/it/pck-update.po - Davide Madrisan:
     Update the italian translation strings.
 
@@ -58,6 +57,18 @@ Sat Jul 13 2013 Madrisan <davide.madrisan(a)gmail.com>
     Fix necessary and tested with code.google.com
     Additionally print full 'git clone ..' command line used in debug output.
 
+<<<<<<< HEAD
+=======
++ improvement
+  * pck-update - Davide Madrisan:
+    New function 'package.generate_name()' required for removing duplicated
+    code and fix a long standing issue.
+
++ bugfix
+  * po/it/autospec.po - Davide Madrisan:
+    Add missing translation strings.
+
+>>>>>>> c8f985b... autospec.po: add missing italian translation strings
 -------------------------------------------------------------------------------
 
 Changes in version 1.16.3
diff --git a/po/it/autospec.po b/po/it/autospec.po
index d4ec706..5764166 100644
--- a/po/it/autospec.po
+++ b/po/it/autospec.po
@@ -853,6 +853,12 @@ msgstr  "specfile per applicazioni web"
 msgid   "Redirect the output to the file <outfile>"
 msgstr  "Redirige lo standard output sul file <outfile>"
 
+msgid   "Override packager full name"
+msgstr  "Sostituisce il nome completo del packager"
+
+msgid   "Override packager email"
+msgstr  "Sostituisce l'indizizzo mail del packager"
+
 msgid   "Specify a git branch"
 msgstr  "Specifica un branch git"