aboutsummaryrefslogtreecommitdiffstats
path: root/view/it
diff options
context:
space:
mode:
authorOlivier Migeot <olivier@migeot.org>2011-10-04 11:45:57 +0200
committerOlivier Migeot <olivier@migeot.org>2011-10-04 11:45:57 +0200
commit273594af62c960b5a52da5ec1cf6d6bd450415ba (patch)
tree5f79914d28c343f7642ecb13b99f9e0e3f5090a7 /view/it
parent1548449586f17c0ef9bfab0ffb16f2a495fc6082 (diff)
parentdfd5cc57c2134067dc6229b8583b5e808f160004 (diff)
downloadvolse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.gz
volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.bz2
volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/it')
-rw-r--r--view/it/messages.po8
-rw-r--r--view/it/strings.php8
-rw-r--r--view/it/wall_received_html_body_eml.tpl24
-rw-r--r--view/it/wall_received_text_body_eml.tpl18
4 files changed, 50 insertions, 8 deletions
diff --git a/view/it/messages.po b/view/it/messages.po
index 6b28ba782..235cfbcf7 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: friendika\n"
"Report-Msgid-Bugs-To: http://bugs.friendika.com/\n"
"POT-Creation-Date: 2011-08-14 21:17-0700\n"
-"PO-Revision-Date: 2011-08-17 17:49+0000\n"
+"PO-Revision-Date: 2011-09-01 10:32+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/friendika/team/it/)\n"
"MIME-Version: 1.0\n"
@@ -1082,7 +1082,7 @@ msgstr "Amico"
#: ../../mod/notifications.php:141
msgid "Fan/Admirer"
-msgstr "Fan/Admiratore"
+msgstr "Fan/Ammiratore"
#: ../../mod/notifications.php:149
msgid "Friend/Connect Request"
@@ -2158,7 +2158,7 @@ msgstr "Regitrati"
#: ../../include/diaspora.php:446 ../../include/conversation.php:26
#: ../../include/conversation.php:35
msgid "status"
-msgstr "stato"
+msgstr "lo stato"
#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:958
#: ../../include/diaspora.php:463 ../../include/conversation.php:43
@@ -4420,7 +4420,7 @@ msgstr "Hai un nuovo seguace su "
#: ../../include/conversation.php:23
msgid "event"
-msgstr "evento"
+msgstr "l'evento"
#: ../../include/conversation.php:213 ../../include/conversation.php:488
#: ../../include/conversation.php:489
diff --git a/view/it/strings.php b/view/it/strings.php
index 9e3a2262f..3a0aed70f 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -1,6 +1,6 @@
<?php
-function string_plural_select($n){
+function string_plural_select_it($n){
return ($n != 1);
}
;
@@ -224,7 +224,7 @@ $a->strings["yes"] = "si";
$a->strings["no"] = "no";
$a->strings["Approve as: "] = "Approva come: ";
$a->strings["Friend"] = "Amico";
-$a->strings["Fan/Admirer"] = "Fan/Admiratore";
+$a->strings["Fan/Admirer"] = "Fan/Ammiratore";
$a->strings["Friend/Connect Request"] = "Richiesta Amicizia/Connessione";
$a->strings["New Follower"] = "Nuovo Seguace";
$a->strings["No notifications."] = "Nessuna notifica.";
@@ -459,7 +459,7 @@ $a->strings["Your Email Address: "] = "Il tuo Indirizzo Email: ";
$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Scegli un soprannome. Deve cominciare con un carattere. L'indirizzo del tuo profilo sarà '<strong>soprannome@\$sitename</strong>'.";
$a->strings["Choose a nickname: "] = "Scegli un soprannome: ";
$a->strings["Register"] = "Regitrati";
-$a->strings["status"] = "stato";
+$a->strings["status"] = "lo stato";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
$a->strings["This is Friendika version"] = "Questo è Friendika versione";
@@ -985,7 +985,7 @@ $a->strings["show"] = "mostra";
$a->strings["don't show"] = "non mostrare";
$a->strings["(no subject)"] = "(nessun oggetto)";
$a->strings["You have a new follower at "] = "Hai un nuovo seguace su ";
-$a->strings["event"] = "evento";
+$a->strings["event"] = "l'evento";
$a->strings["View %s's profile"] = "Vedi il profilo di %s";
$a->strings["%s from %s"] = "%s da %s";
$a->strings["View in context"] = "Vedi nel contesto";
diff --git a/view/it/wall_received_html_body_eml.tpl b/view/it/wall_received_html_body_eml.tpl
new file mode 100644
index 000000000..cdc05cfa3
--- /dev/null
+++ b/view/it/wall_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+ <title>Messaggio da Friendika</title>
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+ <tbody>
+ <tr><td colspan="2" style="background:#084769; 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; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+
+ <tr><td style="padding-top:22px;" colspan="2">$from ha scritto sulla tua bacheca.</td></tr>
+
+
+ <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+ <td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+ <tr><td style="padding-right:22px;">$body</td></tr>
+ <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Vai su <a href="$siteurl">$siteurl</a> per <a href="$display">vedere o cancellare il post</a>.</td></tr>
+ <tr><td></td><td>Grazie,</td></tr>
+ <tr><td></td><td>L'amministratore di $sitename</td></tr>
+ </tbody>
+</table>
+</body>
+</html> \ No newline at end of file
diff --git a/view/it/wall_received_text_body_eml.tpl b/view/it/wall_received_text_body_eml.tpl
new file mode 100644
index 000000000..327557ea1
--- /dev/null
+++ b/view/it/wall_received_text_body_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro $username,
+
+ '$from' ha scritto sulla tua bacheca.
+
+-----
+$body
+-----
+
+Vai su $siteurl per vedere o cancellare il post:
+
+$display
+
+Grazie,
+ L'amministratore di $sitename
+
+
+