keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-09-01 06:30:38 -07:00
commit ef1b99aa44
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
view/it/messages.po
View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: friendika\n" "Project-Id-Version: friendika\n"
"Report-Msgid-Bugs-To: http://bugs.friendika.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendika.com/\n"
"POT-Creation-Date: 2011-08-14 21:17-0700\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" "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/friendika/team/it/)\n" "Language-Team: Italian (http://www.transifex.net/projects/p/friendika/team/it/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1082,7 +1082,7 @@ msgstr "Amico"
#: ../../mod/notifications.php:141 #: ../../mod/notifications.php:141
msgid "Fan/Admirer" msgid "Fan/Admirer"
msgstr "Fan/Admiratore" msgstr "Fan/Ammiratore"
#: ../../mod/notifications.php:149 #: ../../mod/notifications.php:149
msgid "Friend/Connect Request" msgid "Friend/Connect Request"

2
view/it/strings.php
View file

@ -224,7 +224,7 @@ $a->strings["yes"] = "si";
$a->strings["no"] = "no"; $a->strings["no"] = "no";
$a->strings["Approve as: "] = "Approva come: "; $a->strings["Approve as: "] = "Approva come: ";
$a->strings["Friend"] = "Amico"; $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["Friend/Connect Request"] = "Richiesta Amicizia/Connessione";
$a->strings["New Follower"] = "Nuovo Seguace"; $a->strings["New Follower"] = "Nuovo Seguace";
$a->strings["No notifications."] = "Nessuna notifica."; $a->strings["No notifications."] = "Nessuna notifica.";

19
zot.txt
View file

@ -1,4 +1,3 @@
This is the Zot! social communications protocol. This is the Zot! social communications protocol.
Specification revision: 1 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 This can be used to provide access control to any web resource to any
webfinger identity on the internet. 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