diff options
| author | Friendika <info@friendika.com> | 2011-09-01 06:30:38 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-01 06:30:38 -0700 |
| commit | ef1b99aa44031662187be878485be14edf35b42b (patch) | |
| tree | ceeaa5259c06af2f69db3b7c24072534cc63e87e | |
| parent | 1621630b064474eb385bfa05d248fec712645814 (diff) | |
| parent | af62c81b8bbcc79582ed2c25d4f50cdae22648ba (diff) | |
| download | volse-hubzilla-ef1b99aa44031662187be878485be14edf35b42b.tar.gz volse-hubzilla-ef1b99aa44031662187be878485be14edf35b42b.tar.bz2 volse-hubzilla-ef1b99aa44031662187be878485be14edf35b42b.zip | |
Merge branch 'pull'
| -rw-r--r-- | view/it/messages.po | 4 | ||||
| -rw-r--r-- | view/it/strings.php | 2 | ||||
| -rw-r--r-- | zot.txt | 19 |
3 files changed, 21 insertions, 4 deletions
diff --git a/view/it/messages.po b/view/it/messages.po index 290e22f7b..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-26 14:28+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" diff --git a/view/it/strings.php b/view/it/strings.php index 1d6ba3dc0..7d6c2e704 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -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."; @@ -1,4 +1,3 @@ - This is the Zot! social communications protocol. Specification revision: 1 @@ -247,5 +246,23 @@ Only authentication via OpenID is defined in this version of the specification. This can be used to provide access control to any web resource to any webfinger identity on the internet. +********* +* Links * +********* + +Salmon Protocol + http://www.salmon-protocol.org/salmon-protocol-summary + +Salmon Magic Envelope + http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-01.html + +Atom Activity Stream Draft + http://activitystrea.ms/specs/atom/1.0/ + +Activty Stream Base Schema + http://activitystrea.ms/head/activity-schema.html + +WebFinger Protocol + http://code.google.com/p/webfinger/wiki/WebFingerProtocol |