aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/mcc-help/it.po8
1 files changed, 1 insertions, 7 deletions
diff --git a/docs/mcc-help/it.po b/docs/mcc-help/it.po
index d84d1963..a2f5b900 100644
--- a/docs/mcc-help/it.po
+++ b/docs/mcc-help/it.po
@@ -446,7 +446,7 @@ msgstr ""
#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
#: en/diskdrake--removable.xml:10
msgid "diskdrake--removable.png"
-msgid "diskdrake--removable.png"
+msgstr "diskdrake--removable.png"
#. type: Content of: <section><para><footnote><para>
#: en/diskdrake--removable.xml:15
@@ -4056,14 +4056,8 @@ msgstr ""
#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
#: en/draksambashare.xml:85
-<<<<<<< HEAD
msgid "draksambashare2.png"
msgstr ""
-=======
-#, fuzzy
-msgid "draksambashare2.png"
-msgstr "diskdrake--smb2.png"
->>>>>>> 750719bca3ee846a8ce46853f5d7ce00a6fa25df
#. type: Content of: <section><section><para>
#: en/draksambashare.xml:91