aboutsummaryrefslogtreecommitdiffstats
path: root/view/it
diff options
context:
space:
mode:
authorolivierm <olivier@migeot.org>2011-03-08 14:39:26 +0100
committerolivierm <olivier@migeot.org>2011-03-08 14:39:26 +0100
commit25c674b73a5ec39a9826906aed3e35e77d72e392 (patch)
treedc17e0d8f5dc899ccfa9e0239fe7623c43a95d49 /view/it
parent07ebc15612807512422ba84060914c5c4c853102 (diff)
parentc248b28f922603ec135fea903a9ec3f0ef63c935 (diff)
downloadvolse-hubzilla-25c674b73a5ec39a9826906aed3e35e77d72e392.tar.gz
volse-hubzilla-25c674b73a5ec39a9826906aed3e35e77d72e392.tar.bz2
volse-hubzilla-25c674b73a5ec39a9826906aed3e35e77d72e392.zip
Merge remote branch 'mike/master'
Diffstat (limited to 'view/it')
-rw-r--r--view/it/head.tpl2
-rw-r--r--view/it/jot.tpl61
-rw-r--r--view/it/mail_received_html_body_eml.tpl2
-rw-r--r--view/it/profile_advanced.php20
-rw-r--r--view/it/strings.php5
5 files changed, 17 insertions, 73 deletions
diff --git a/view/it/head.tpl b/view/it/head.tpl
index 071c8fa91..8e4e0ccd7 100644
--- a/view/it/head.tpl
+++ b/view/it/head.tpl
@@ -2,7 +2,7 @@
<base href="$baseurl" />
<meta name="generator" content="$generator" />
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/ff-32.jpg" />
+<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
<!--[if IE]>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/it/jot.tpl b/view/it/jot.tpl
deleted file mode 100644
index c4b63eb01..000000000
--- a/view/it/jot.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-
-<div id="profile-jot-wrapper" >
- <div id="profile-jot-banner-wrapper">
- <div id="profile-jot-desc" >&nbsp;</div>
- <div id="character-counter" class="grey"></div>
- </div>
- <div id="profile-jot-banner-end"></div>
-
- <form id="profile-jot-form" action="item" method="post" >
- <input type="hidden" name="type" value="wall" />
- <input type="hidden" name="profile_uid" value="$profile_uid" />
- <input type="hidden" name="return" value="$return_path" />
- <input type="hidden" name="location" id="jot-location" value="$defloc" />
- <input type="hidden" name="coord" id="jot-coord" value="" />
-
- <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
-
-
-<div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Condividi" />
- <div id="profile-upload-wrapper" style="display: $visitor;" >
- <div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Carica foto" title="Carica foto" /></div>
- </div>
- <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
- <img id="profile-link" src="images/link-icon.gif" alt="Inserisci collegamento" title="Inserisci collegamento" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
- </div>
- <div id="profile-youtube-wrapper" style="display: $visitor;" >
- <img id="profile-video" src="images/youtube_icon.gif" alt="Inserisci video da YouTube" title="Inserisci video da YouTube" onclick="jotGetVideo();" />
- </div>
- <div id="profile-location-wrapper" style="display: $visitor;" >
- <img id="profile-location" src="images/globe.gif" alt="Imposta la tua posizione" title="Imposta la tua posizione" onclick="jotGetLocation();" />
- </div>
- <div id="profile-nolocation-wrapper" style="display: none;" >
- <img id="profile-nolocation" src="images/noglobe.gif" alt="Cancella la tua posizione data dal browser" title="Cancella la tua posizione data dal browser" onclick="jotClearLocation();" />
- </div>
-
- <div id="profile-jot-plugin-wrapper" >
- $jotplugins
- </div>
-
- <div id="profile-rotator-wrapper" style="display: $visitor;" >
- <img id="profile-rotator" src="images/rotator.gif" alt="Attendi" title="Attendi" style="display: none;" />
- </div>
- <div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif" alt="Impostazione permessi" title="Impostazione permessi" onClick="openClose('profile-jot-acl-wrapper'); openClose('profile-jot-email-wrapper'); openClose('profile-jot-networks');" />$bang</div>
- <div id="profile-jot-perms-end"></div>
- <div id="profile-jot-email-wrapper" style="display: none;" >
- <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle">
- <div id="profile-jot-email-end"></div>
- </div>
- <div id="profile-jot-networks" style="display: none;" >
- $jotnets
- </div>
- <div id="profile-jot-networks-end"></div>
- <div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
-</div>
-
-
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl
index 7510f2b30..847954550 100644
--- a/view/it/mail_received_html_body_eml.tpl
+++ b/view/it/mail_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
diff --git a/view/it/profile_advanced.php b/view/it/profile_advanced.php
index 44327f6a6..fe065d46f 100644
--- a/view/it/profile_advanced.php
+++ b/view/it/profile_advanced.php
@@ -113,7 +113,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
$o .= <<< EOT
<div id="advanced-profile-about-wrapper" >
<div id="advanced-profile-about-text">Informazioni varie:</div>
@@ -124,7 +124,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
$o .= <<< EOT
<div id="advanced-profile-interest-wrapper" >
<div id="advanced-profile-interest-text">Hobbie/Interessi:</div>
@@ -135,7 +135,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
$o .= <<< EOT
<div id="advanced-profile-contact-wrapper" >
<div id="advanced-profile-contact-text">Informazioni su contatti e Social Networks:</div>
@@ -146,7 +146,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
$o .= <<< EOT
<div id="advanced-profile-music-wrapper" >
<div id="advanced-profile-music-text">Interessi musicali:</div>
@@ -157,7 +157,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
$o .= <<< EOT
<div id="advanced-profile-book-wrapper" >
<div id="advanced-profile-book-text">Libri, letteratura:</div>
@@ -168,7 +168,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
$o .= <<< EOT
<div id="advanced-profile-tv-wrapper" >
<div id="advanced-profile-tv-text">Televisione:</div>
@@ -179,7 +179,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
$o .= <<< EOT
<div id="advanced-profile-film-wrapper" >
<div id="advanced-profile-film-text">Film/danza/cultura/intrattenimento:</div>
@@ -190,7 +190,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
$o .= <<< EOT
<div id="advanced-profile-romance-wrapper" >
<div id="advanced-profile-romance-text">Amore/romanticismo:</div>
@@ -201,7 +201,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
$o .= <<< EOT
<div id="advanced-profile-work-wrapper" >
<div id="advanced-profile-work-text">Lavoro/impiego:</div>
@@ -212,7 +212,7 @@ $o .= <<< EOT
EOT;
}
-if($txt = bbcode($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
$o .= <<< EOT
<div id="advanced-profile-education-wrapper" >
<div id="advanced-profile-education-text">Scuola/educazione:</div>
diff --git a/view/it/strings.php b/view/it/strings.php
index 7f4b3eddd..25439d8d5 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -1038,6 +1038,11 @@ $a->strings['Invalid OpenID url'] = 'Url OpenID non valido';
$a->strings['Cannot use that email.'] = 'Questa email non si puo\' usare.';
$a->strings['Normal View'] = 'Vista normale';
$a->strings['New Item View'] = 'Vista Nuovi Elementi';
+$a->strings['Share'] = 'Condividi';
+$a->strings['Insert YouTube video'] = 'Inserisci video da YouTube';
+$a->strings['Set your location'] = 'Imposta la tua posizione';
+$a->strings['Clear browser location'] = 'Cancella la tua posizione data dal browser';
+$a->strings['Permission settings'] = 'Impostazione permessi';
$a->strings[' Cannot change to that email.'] = 'Non puoi cambiare a quella email.';
$a->strings['Birthday:'] = 'Compleanno:';
$a->strings['Update now'] = 'Aggiorna adesso';