From: friendica <info@friendica.com>
Date: Wed, 13 Jun 2012 23:25:09 +0000 (-0700)
Subject: Merge https://github.com/fabrixxm/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=85876be48a8376bf22201a4561ed1642197c6fa3;p=friendica.git

Merge https://github.com/fabrixxm/friendica into pull

Conflicts:
	util/messages.po
---

85876be48a8376bf22201a4561ed1642197c6fa3
diff --cc util/messages.po
index 20fe27fc84,defa9b795d..8e86ccef0d
--- a/util/messages.po
+++ b/util/messages.po
@@@ -6,9 -6,9 +6,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
 -"Project-Id-Version: 3.0.1372\n"
 +"Project-Id-Version: 3.0.1373\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-06-13 10:00-0700\n"
 -"POT-Creation-Date: 2012-06-13 11:54-0400\n"
++"POT-Creation-Date: 2012-06-13 16:24-0700\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -6770,851 -6726,824 +6770,831 @@@ msgid_plural "%d invitations available
  msgstr[0] ""
  msgstr[1] ""
  
 -#: ../../include/conversation.php:554
 -msgid "like"
 -msgstr ""
 -
 -#: ../../include/conversation.php:555
 -msgid "dislike"
 +#: ../../include/contact_widgets.php:29
 +msgid "Find People"
  msgstr ""
  
 -#: ../../include/conversation.php:557
 -msgid "Share this"
 +#: ../../include/contact_widgets.php:30
 +msgid "Enter name or interest"
  msgstr ""
  
 -#: ../../include/conversation.php:557
 -msgid "share"
 +#: ../../include/contact_widgets.php:31
 +msgid "Connect/Follow"
  msgstr ""
  
 -#: ../../include/conversation.php:581
 -msgid "Bold"
 +#: ../../include/contact_widgets.php:32
 +msgid "Examples: Robert Morgenstein, Fishing"
  msgstr ""
  
 -#: ../../include/conversation.php:582
 -msgid "Italic"
 +#: ../../include/contact_widgets.php:36
 +msgid "Random Profile"
  msgstr ""
  
 -#: ../../include/conversation.php:583
 -msgid "Underline"
 +#: ../../include/contact_widgets.php:68
 +msgid "Networks"
  msgstr ""
  
 -#: ../../include/conversation.php:584
 -msgid "Quote"
 +#: ../../include/contact_widgets.php:71
 +msgid "All Networks"
  msgstr ""
  
 -#: ../../include/conversation.php:585
 -msgid "Code"
 +#: ../../include/contact_widgets.php:98
 +msgid "Saved Folders"
  msgstr ""
  
 -#: ../../include/conversation.php:586
 -msgid "Image"
 +#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
 +msgid "Everything"
  msgstr ""
  
 -#: ../../include/conversation.php:587
 -msgid "Link"
 +#: ../../include/contact_widgets.php:126
 +msgid "Categories"
  msgstr ""
  
 -#: ../../include/conversation.php:588
 -msgid "Video"
 +#: ../../include/auth.php:36
 +msgid "Logged out."
  msgstr ""
  
 -#: ../../include/conversation.php:621
 -msgid "add star"
 +#: ../../include/auth.php:115
 +msgid ""
 +"We encountered a problem while logging in with the OpenID you provided. "
 +"Please check the correct spelling of the ID."
  msgstr ""
  
 -#: ../../include/conversation.php:622
 -msgid "remove star"
 +#: ../../include/auth.php:115
 +msgid "The error message was:"
  msgstr ""
  
 -#: ../../include/conversation.php:623
 -msgid "toggle star status"
 +#: ../../include/datetime.php:43 ../../include/datetime.php:45
 +msgid "Miscellaneous"
  msgstr ""
  
 -#: ../../include/conversation.php:626
 -msgid "starred"
 +#: ../../include/datetime.php:131 ../../include/datetime.php:263
 +msgid "year"
  msgstr ""
  
 -#: ../../include/conversation.php:627
 -msgid "add tag"
 +#: ../../include/datetime.php:136 ../../include/datetime.php:264
 +msgid "month"
  msgstr ""
  
 -#: ../../include/conversation.php:631
 -msgid "save to folder"
 +#: ../../include/datetime.php:141 ../../include/datetime.php:266
 +msgid "day"
  msgstr ""
  
 -#: ../../include/conversation.php:703
 -msgid "to"
 +#: ../../include/datetime.php:254
 +msgid "never"
  msgstr ""
  
 -#: ../../include/conversation.php:704
 -msgid "Wall-to-Wall"
 +#: ../../include/datetime.php:260
 +msgid "less than a second ago"
  msgstr ""
  
 -#: ../../include/conversation.php:705
 -msgid "via Wall-To-Wall:"
 +#: ../../include/datetime.php:263
 +msgid "years"
  msgstr ""
  
 -#: ../../include/conversation.php:750
 -msgid "Delete Selected Items"
 +#: ../../include/datetime.php:264
 +msgid "months"
  msgstr ""
  
 -#: ../../include/conversation.php:842 ../../include/Contact.php:203
 -msgid "View Status"
 +#: ../../include/datetime.php:265
 +msgid "week"
  msgstr ""
  
 -#: ../../include/conversation.php:843 ../../include/Contact.php:204
 -msgid "View Profile"
 +#: ../../include/datetime.php:265
 +msgid "weeks"
  msgstr ""
  
 -#: ../../include/conversation.php:844 ../../include/Contact.php:205
 -msgid "View Photos"
 +#: ../../include/datetime.php:266
 +msgid "days"
  msgstr ""
  
 -#: ../../include/conversation.php:845 ../../include/Contact.php:206
 -#: ../../include/Contact.php:219
 -msgid "Network Posts"
 +#: ../../include/datetime.php:267
 +msgid "hour"
  msgstr ""
  
 -#: ../../include/conversation.php:846 ../../include/Contact.php:207
 -#: ../../include/Contact.php:219
 -msgid "Edit Contact"
 +#: ../../include/datetime.php:267
 +msgid "hours"
  msgstr ""
  
 -#: ../../include/conversation.php:847 ../../include/Contact.php:208
 -#: ../../include/Contact.php:219
 -msgid "Send PM"
 +#: ../../include/datetime.php:268
 +msgid "minute"
  msgstr ""
  
 -#: ../../include/conversation.php:901
 -#, php-format
 -msgid "%s likes this."
 +#: ../../include/datetime.php:268
 +msgid "minutes"
  msgstr ""
  
 -#: ../../include/conversation.php:901
 -#, php-format
 -msgid "%s doesn't like this."
 +#: ../../include/datetime.php:269
 +msgid "second"
  msgstr ""
  
 -#: ../../include/conversation.php:905
 -#, php-format
 -msgid "<span  %1$s>%2$d people</span> like this."
 +#: ../../include/datetime.php:269
 +msgid "seconds"
  msgstr ""
  
 -#: ../../include/conversation.php:907
 +#: ../../include/datetime.php:278
  #, php-format
 -msgid "<span  %1$s>%2$d people</span> don't like this."
 +msgid "%1$d %2$s ago"
  msgstr ""
  
 -#: ../../include/conversation.php:913
 -msgid "and"
 +#: ../../include/onepoll.php:406
 +msgid "From: "
  msgstr ""
  
 -#: ../../include/conversation.php:916
 -#, php-format
 -msgid ", and %d other people"
 +#: ../../include/bbcode.php:210 ../../include/bbcode.php:230
 +msgid "$1 wrote:"
  msgstr ""
  
 -#: ../../include/conversation.php:917
 -#, php-format
 -msgid "%s like this."
 +#: ../../include/bbcode.php:245 ../../include/bbcode.php:314
 +msgid "Image/photo"
  msgstr ""
  
 -#: ../../include/conversation.php:917
 +#: ../../include/dba.php:41
  #, php-format
 -msgid "%s don't like this."
 +msgid "Cannot locate DNS info for database server '%s'"
  msgstr ""
  
 -#: ../../include/conversation.php:942
 -msgid "Visible to <strong>everybody</strong>"
 +#: ../../include/message.php:15 ../../include/message.php:171
 +msgid "[no subject]"
  msgstr ""
  
 -#: ../../include/conversation.php:944
 -msgid "Please enter a video link/URL:"
 +#: ../../include/acl_selectors.php:286
 +msgid "Visible to everybody"
  msgstr ""
  
 -#: ../../include/conversation.php:945
 -msgid "Please enter an audio link/URL:"
 +#: ../../include/enotify.php:14
 +msgid "Friendica Notification"
  msgstr ""
  
 -#: ../../include/conversation.php:946
 -msgid "Tag term:"
 +#: ../../include/enotify.php:17
 +msgid "Thank You,"
  msgstr ""
  
 -#: ../../include/conversation.php:948
 -msgid "Where are you right now?"
 +#: ../../include/enotify.php:19
 +#, php-format
 +msgid "%s Administrator"
  msgstr ""
  
 -#: ../../include/conversation.php:991
 -msgid "upload photo"
 +#: ../../include/enotify.php:38
 +#, php-format
 +msgid "%s <!item_type!>"
  msgstr ""
  
 -#: ../../include/conversation.php:993
 -msgid "attach file"
 +#: ../../include/enotify.php:42
 +#, php-format
 +msgid "[Friendica:Notify] New mail received at %s"
  msgstr ""
  
 -#: ../../include/conversation.php:995
 -msgid "web link"
 +#: ../../include/enotify.php:44
 +#, php-format
- msgid "%s sent you a new private message at %s."
++msgid "%1$s sent you a new private message at %2$s."
  msgstr ""
  
 -#: ../../include/conversation.php:996
 -msgid "Insert video link"
 +#: ../../include/enotify.php:45
 +#, php-format
- msgid "%s sent you %s."
++msgid "%1$s sent you %2$s."
  msgstr ""
  
 -#: ../../include/conversation.php:997
 -msgid "video link"
 +#: ../../include/enotify.php:45
 +msgid "a private message"
  msgstr ""
  
 -#: ../../include/conversation.php:998
 -msgid "Insert audio link"
 +#: ../../include/enotify.php:46
 +#, php-format
 +msgid "Please visit %s to view and/or reply to your private messages."
  msgstr ""
  
- #: ../../include/enotify.php:76
 -#: ../../include/conversation.php:999
 -msgid "audio link"
++#: ../../include/enotify.php:73
 +#, php-format
- msgid "%s's"
++msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
  msgstr ""
  
 -#: ../../include/conversation.php:1001
 -msgid "set location"
 +#: ../../include/enotify.php:80
- msgid "your"
- msgstr ""
- 
- #: ../../include/enotify.php:87
 +#, php-format
- msgid "[Friendica:Notify] Comment to conversation #%d by %s"
++msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
  msgstr ""
  
 -#: ../../include/conversation.php:1003
 -msgid "clear location"
 +#: ../../include/enotify.php:88
 +#, php-format
- msgid "%s commented on an item/conversation you have been following."
++msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+ msgstr ""
+ 
 -#: ../../include/conversation.php:1010
 -msgid "permissions"
++#: ../../include/enotify.php:98
++msgid "[Friendica:Notify] Comment to conversation #%1$d by %1$s"
  msgstr ""
  
- #: ../../include/enotify.php:89
 -#: ../../include/contact_widgets.php:6
 -msgid "Add New Contact"
++#: ../../include/enotify.php:99
 +#, php-format
- msgid "%s commented on %s."
++msgid "%s commented on an item/conversation you have been following."
  msgstr ""
  
- #: ../../include/enotify.php:91 ../../include/enotify.php:104
- #: ../../include/enotify.php:115 ../../include/enotify.php:126
 -#: ../../include/contact_widgets.php:7
 -msgid "Enter address or web location"
++#: ../../include/enotify.php:102 ../../include/enotify.php:117
++#: ../../include/enotify.php:130 ../../include/enotify.php:143
 +#, php-format
 +msgid "Please visit %s to view and/or reply to the conversation."
  msgstr ""
  
- #: ../../include/enotify.php:98
 -#: ../../include/contact_widgets.php:8
 -msgid "Example: bob@example.com, http://example.com/barbara"
++#: ../../include/enotify.php:109
 +#, php-format
 +msgid "[Friendica:Notify] %s posted to your profile wall"
  msgstr ""
  
- #: ../../include/enotify.php:100
 -#: ../../include/contact_widgets.php:23
++#: ../../include/enotify.php:111
  #, php-format
- msgid "%s posted to your profile wall at %s"
 -msgid "%d invitation available"
 -msgid_plural "%d invitations available"
 -msgstr[0] ""
 -msgstr[1] ""
 -
 -#: ../../include/contact_widgets.php:29
 -msgid "Find People"
++msgid "%1$s posted to your profile wall at %1$s"
  msgstr ""
  
- #: ../../include/enotify.php:102
 -#: ../../include/contact_widgets.php:30
 -msgid "Enter name or interest"
++#: ../../include/enotify.php:113
 +#, php-format
- msgid "%s posted to %s"
- msgstr ""
- 
- #: ../../include/enotify.php:102
- msgid "your profile wall."
++msgid "%1$s posted to [url=%2s]your wall[/url]"
  msgstr ""
  
- #: ../../include/enotify.php:111
 -#: ../../include/contact_widgets.php:31
 -msgid "Connect/Follow"
++#: ../../include/enotify.php:124
 +#, php-format
 +msgid "[Friendica:Notify] %s tagged you"
  msgstr ""
  
- #: ../../include/enotify.php:112
 -#: ../../include/contact_widgets.php:32
 -msgid "Examples: Robert Morgenstein, Fishing"
++#: ../../include/enotify.php:125
 +#, php-format
- msgid "%s tagged you at %s"
++msgid "%1$s tagged you at %2$s"
  msgstr ""
  
- #: ../../include/enotify.php:113
 -#: ../../include/contact_widgets.php:36
 -msgid "Random Profile"
++#: ../../include/enotify.php:126
 +#, php-format
- msgid "%s %s."
- msgstr ""
- 
- #: ../../include/enotify.php:113
- msgid "tagged you"
++msgid "%1$s [url=%2s]tagged you[/url]."
  msgstr ""
  
- #: ../../include/enotify.php:122
 -#: ../../include/contact_widgets.php:68
 -msgid "Networks"
++#: ../../include/enotify.php:137
 +#, php-format
 +msgid "[Friendica:Notify] %s tagged your post"
  msgstr ""
  
- #: ../../include/enotify.php:123
 -#: ../../include/contact_widgets.php:71
 -msgid "All Networks"
++#: ../../include/enotify.php:138
 +#, php-format
- msgid "%s tagged your post at %s"
++msgid "%1$s tagged your post at %2$s"
  msgstr ""
  
- #: ../../include/enotify.php:124
 -#: ../../include/contact_widgets.php:98
 -msgid "Saved Folders"
++#: ../../include/enotify.php:139
 +#, php-format
- msgid "%s tagged %s"
++msgid "%1$s tagged [url=%2$s]your post[/url]"
  msgstr ""
  
- #: ../../include/enotify.php:124
- msgid "your post"
- msgstr ""
- 
- #: ../../include/enotify.php:133
 -#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
 -msgid "Everything"
++#: ../../include/enotify.php:150
 +msgid "[Friendica:Notify] Introduction received"
  msgstr ""
  
- #: ../../include/enotify.php:134
 -#: ../../include/contact_widgets.php:126
 -msgid "Categories"
++#: ../../include/enotify.php:151
 +#, php-format
- msgid "You've received an introduction from '%s' at %s"
++msgid "You've received an introduction from '%1$s' at %2$s"
  msgstr ""
  
- #: ../../include/enotify.php:135
 -#: ../../include/nav.php:46
 -msgid "End this session"
++#: ../../include/enotify.php:152
 +#, php-format
- msgid "You've received %s from %s."
- msgstr ""
- 
- #: ../../include/enotify.php:135
- msgid "an introduction"
++msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
  msgstr ""
  
- #: ../../include/enotify.php:136 ../../include/enotify.php:153
 -#: ../../include/nav.php:64
 -msgid "Sign in"
++#: ../../include/enotify.php:155 ../../include/enotify.php:173
 +#, php-format
 +msgid "You may visit their profile at %s"
  msgstr ""
  
- #: ../../include/enotify.php:138
 -#: ../../include/nav.php:77
 -msgid "Home Page"
++#: ../../include/enotify.php:157
 +#, php-format
 +msgid "Please visit %s to approve or reject the introduction."
  msgstr ""
  
- #: ../../include/enotify.php:145
 -#: ../../include/nav.php:81
 -msgid "Create an account"
++#: ../../include/enotify.php:164
 +msgid "[Friendica:Notify] Friend suggestion received"
  msgstr ""
  
- #: ../../include/enotify.php:146
 -#: ../../include/nav.php:86
 -msgid "Help and documentation"
++#: ../../include/enotify.php:165
 +#, php-format
- msgid "You've received a friend suggestion from '%s' at %s"
++msgid "You've received a friend suggestion from '%1$s' at %2$s"
  msgstr ""
  
- #: ../../include/enotify.php:147
 -#: ../../include/nav.php:89
 -msgid "Apps"
++#: ../../include/enotify.php:166
 +#, php-format
- msgid "You've received %s for %s from %s."
++msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
  msgstr ""
  
- #: ../../include/enotify.php:148
- msgid "a friend suggestion"
- msgstr ""
- 
- #: ../../include/enotify.php:151
 -#: ../../include/nav.php:89
 -msgid "Addon applications, utilities, games"
++#: ../../include/enotify.php:171
 +msgid "Name:"
  msgstr ""
  
- #: ../../include/enotify.php:152
 -#: ../../include/nav.php:91
 -msgid "Search site content"
++#: ../../include/enotify.php:172
 +msgid "Photo:"
  msgstr ""
  
- #: ../../include/enotify.php:155
 -#: ../../include/nav.php:101
 -msgid "Conversations on this site"
++#: ../../include/enotify.php:175
 +#, php-format
 +msgid "Please visit %s to approve or reject the suggestion."
  msgstr ""
  
 -#: ../../include/nav.php:103
 -msgid "Directory"
 +#: ../../include/follow.php:32
 +msgid "Connect URL missing."
  msgstr ""
  
 -#: ../../include/nav.php:103
 -msgid "People directory"
 +#: ../../include/follow.php:59
 +msgid ""
 +"This site is not configured to allow communications with other networks."
  msgstr ""
  
 -#: ../../include/nav.php:113
 -msgid "Conversations from your friends"
 +#: ../../include/follow.php:60 ../../include/follow.php:75
 +msgid "No compatible communication protocols or feeds were discovered."
  msgstr ""
  
 -#: ../../include/nav.php:121
 -msgid "Friend Requests"
 +#: ../../include/follow.php:73
 +msgid "The profile address specified does not provide adequate information."
  msgstr ""
 -
 -#: ../../include/nav.php:123
 -msgid "See all notifications"
 +
 +#: ../../include/follow.php:77
 +msgid "An author or name was not found."
  msgstr ""
  
 -#: ../../include/nav.php:124
 -msgid "Mark all system notifications seen"
 +#: ../../include/follow.php:79
 +msgid "No browser URL could be matched to this address."
  msgstr ""
  
 -#: ../../include/nav.php:128
 -msgid "Private mail"
 +#: ../../include/follow.php:81
 +msgid ""
 +"Unable to match @-style Identity Address with a known protocol or email "
 +"contact."
  msgstr ""
  
 -#: ../../include/nav.php:129
 -msgid "Inbox"
 +#: ../../include/follow.php:82
 +msgid "Use mailto: in front of address to force email check."
  msgstr ""
  
 -#: ../../include/nav.php:130
 -msgid "Outbox"
 +#: ../../include/follow.php:88
 +msgid ""
 +"The profile address specified belongs to a network which has been disabled "
 +"on this site."
  msgstr ""
  
 -#: ../../include/nav.php:134
 -msgid "Manage"
 +#: ../../include/follow.php:93
 +msgid ""
 +"Limited profile. This person will be unable to receive direct/personal "
 +"notifications from you."
  msgstr ""
  
 -#: ../../include/nav.php:134
 -msgid "Manage other pages"
 +#: ../../include/follow.php:169
 +msgid "Unable to retrieve contact information."
  msgstr ""
  
 -#: ../../include/nav.php:139
 -msgid "Manage/edit friends and contacts"
 +#: ../../include/follow.php:223
 +msgid "following"
  msgstr ""
  
 -#: ../../include/nav.php:146
 -msgid "Site setup and configuration"
 +#: ../../include/items.php:2790
 +msgid "A new person is sharing with you at "
  msgstr ""
  
 -#: ../../include/nav.php:169
 -msgid "Nothing new here"
 +#: ../../include/items.php:2790
 +msgid "You have a new follower at "
  msgstr ""
  
- #: ../../include/items.php:3444
 -#: ../../include/contact_selectors.php:32
 -msgid "Unknown | Not categorised"
++#: ../../include/items.php:3456
 +msgid "Archives"
  msgstr ""
  
 -#: ../../include/contact_selectors.php:33
 -msgid "Block immediately"
 +#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
 +#: ../../include/bb2diaspora.php:113
 +msgid "image/photo"
  msgstr ""
  
 -#: ../../include/contact_selectors.php:34
 -msgid "Shady, spammer, self-marketer"
 +#: ../../include/bb2diaspora.php:102
 +msgid "link"
  msgstr ""
  
 -#: ../../include/contact_selectors.php:35
 -msgid "Known to me, but no opinion"
 +#: ../../include/user.php:38
 +msgid "An invitation is required."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:36
 -msgid "OK, probably harmless"
 +#: ../../include/user.php:43
 +msgid "Invitation could not be verified."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:37
 -msgid "Reputable, has my trust"
 +#: ../../include/user.php:51
 +msgid "Invalid OpenID url"
  msgstr ""
  
 -#: ../../include/contact_selectors.php:56
 -msgid "Frequently"
 +#: ../../include/user.php:66
 +msgid "Please enter the required information."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:57
 -msgid "Hourly"
 +#: ../../include/user.php:80
 +msgid "Please use a shorter name."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:58
 -msgid "Twice daily"
 +#: ../../include/user.php:82
 +msgid "Name too short."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:59
 -msgid "Daily"
 +#: ../../include/user.php:97
 +msgid "That doesn't appear to be your full (First Last) name."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:60
 -msgid "Weekly"
 +#: ../../include/user.php:102
 +msgid "Your email domain is not among those allowed on this site."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:61
 -msgid "Monthly"
 +#: ../../include/user.php:105
 +msgid "Not a valid email address."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:77
 -msgid "OStatus"
 +#: ../../include/user.php:115
 +msgid "Cannot use that email."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:78
 -msgid "RSS/Atom"
 +#: ../../include/user.php:121
 +msgid ""
 +"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 +"must also begin with a letter."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:82
 -msgid "Zot!"
 +#: ../../include/user.php:127 ../../include/user.php:219
 +msgid "Nickname is already registered. Please choose another."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:83
 -msgid "LinkedIn"
 +#: ../../include/user.php:137
 +msgid ""
 +"Nickname was once registered here and may not be re-used. Please choose "
 +"another."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:84
 -msgid "XMPP/IM"
 +#: ../../include/user.php:153
 +msgid "SERIOUS ERROR: Generation of security keys failed."
  msgstr ""
  
 -#: ../../include/contact_selectors.php:85
 -msgid "MySpace"
 +#: ../../include/user.php:205
 +msgid "An error occurred during registration. Please try again."
  msgstr ""
  
 -#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
 -#: ../../include/bb2diaspora.php:113
 -msgid "image/photo"
 +#: ../../include/user.php:240
 +msgid "An error occurred creating your default profile. Please try again."
  msgstr ""
  
 -#: ../../include/bb2diaspora.php:102
 -msgid "link"
 +#: ../../include/security.php:21
 +msgid "Welcome "
  msgstr ""
  
 -#: ../../include/enotify.php:14
 -msgid "Friendica Notification"
 +#: ../../include/security.php:22
 +msgid "Please upload a profile photo."
  msgstr ""
  
 -#: ../../include/enotify.php:17
 -msgid "Thank You,"
 +#: ../../include/security.php:25
 +msgid "Welcome back "
  msgstr ""
  
 -#: ../../include/enotify.php:19
 -#, php-format
 -msgid "%s Administrator"
 +#: ../../include/security.php:329
 +msgid ""
 +"The form security token was not correct. This probably happened because the "
 +"form has been opened for too long (>3 hours) before submitting it."
  msgstr ""
  
 -#: ../../include/enotify.php:38
 -#, php-format
 -msgid "%s <!item_type!>"
 +#: ../../include/Contact.php:111
 +msgid "stopped following"
  msgstr ""
  
 -#: ../../include/enotify.php:42
 -#, php-format
 -msgid "[Friendica:Notify] New mail received at %s"
 +#: ../../include/Contact.php:203 ../../include/conversation.php:842
 +msgid "View Status"
  msgstr ""
  
 -#: ../../include/enotify.php:44
 -#, php-format
 -msgid "%1$s sent you a new private message at %2$s."
 +#: ../../include/Contact.php:204 ../../include/conversation.php:843
 +msgid "View Profile"
  msgstr ""
  
 -#: ../../include/enotify.php:45
 -#, php-format
 -msgid "%1$s sent you %2$s."
 +#: ../../include/Contact.php:205 ../../include/conversation.php:844
 +msgid "View Photos"
  msgstr ""
  
 -#: ../../include/enotify.php:45
 -msgid "a private message"
 +#: ../../include/Contact.php:206 ../../include/Contact.php:219
 +#: ../../include/conversation.php:845
 +msgid "Network Posts"
  msgstr ""
  
 -#: ../../include/enotify.php:46
 -#, php-format
 -msgid "Please visit %s to view and/or reply to your private messages."
 +#: ../../include/Contact.php:207 ../../include/Contact.php:219
 +#: ../../include/conversation.php:846
 +msgid "Edit Contact"
  msgstr ""
  
 -#: ../../include/enotify.php:73
 -#, php-format
 -msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 +#: ../../include/Contact.php:208 ../../include/Contact.php:219
 +#: ../../include/conversation.php:847
 +msgid "Send PM"
  msgstr ""
  
 -#: ../../include/enotify.php:80
 -#, php-format
 -msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 +#: ../../include/conversation.php:163
 +msgid "post/item"
  msgstr ""
  
 -#: ../../include/enotify.php:88
 +#: ../../include/conversation.php:164
  #, php-format
 -msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 +msgid "%1$s marked %2$s's %3$s as favorite"
  msgstr ""
  
 -#: ../../include/enotify.php:98
 -msgid "[Friendica:Notify] Comment to conversation #%1$d by %1$s"
 +#: ../../include/conversation.php:327 ../../include/conversation.php:608
 +msgid "Select"
  msgstr ""
  
 -#: ../../include/enotify.php:99
 +#: ../../include/conversation.php:344 ../../include/conversation.php:701
 +#: ../../include/conversation.php:702
  #, php-format
 -msgid "%s commented on an item/conversation you have been following."
 +msgid "View %s's profile @ %s"
  msgstr ""
  
 -#: ../../include/enotify.php:102 ../../include/enotify.php:117
 -#: ../../include/enotify.php:130 ../../include/enotify.php:143
 +#: ../../include/conversation.php:354 ../../include/conversation.php:713
  #, php-format
 -msgid "Please visit %s to view and/or reply to the conversation."
 +msgid "%s from %s"
  msgstr ""
  
 -#: ../../include/enotify.php:109
 -#, php-format
 -msgid "[Friendica:Notify] %s posted to your profile wall"
 +#: ../../include/conversation.php:369
 +msgid "View in context"
  msgstr ""
  
 -#: ../../include/enotify.php:111
 +#: ../../include/conversation.php:475
  #, php-format
 -msgid "%1$s posted to your profile wall at %1$s"
 -msgstr ""
 +msgid "%d comment"
 +msgid_plural "%d comments"
 +msgstr[0] ""
 +msgstr[1] ""
  
 -#: ../../include/enotify.php:113
 -#, php-format
 -msgid "%1$s posted to [url=%2s]your wall[/url]"
 +#: ../../include/conversation.php:554
 +msgid "like"
  msgstr ""
  
 -#: ../../include/enotify.php:124
 -#, php-format
 -msgid "[Friendica:Notify] %s tagged you"
 +#: ../../include/conversation.php:555
 +msgid "dislike"
  msgstr ""
  
 -#: ../../include/enotify.php:125
 -#, php-format
 -msgid "%1$s tagged you at %2$s"
 +#: ../../include/conversation.php:557
 +msgid "Share this"
  msgstr ""
  
 -#: ../../include/enotify.php:126
 -#, php-format
 -msgid "%1$s [url=%2s]tagged you[/url]."
 +#: ../../include/conversation.php:557
 +msgid "share"
  msgstr ""
  
 -#: ../../include/enotify.php:137
 -#, php-format
 -msgid "[Friendica:Notify] %s tagged your post"
 +#: ../../include/conversation.php:581
 +msgid "Bold"
  msgstr ""
  
 -#: ../../include/enotify.php:138
 -#, php-format
 -msgid "%1$s tagged your post at %2$s"
 +#: ../../include/conversation.php:582
 +msgid "Italic"
  msgstr ""
  
 -#: ../../include/enotify.php:139
 -#, php-format
 -msgid "%1$s tagged [url=%2$s]your post[/url]"
 +#: ../../include/conversation.php:583
 +msgid "Underline"
  msgstr ""
  
 -#: ../../include/enotify.php:150
 -msgid "[Friendica:Notify] Introduction received"
 +#: ../../include/conversation.php:584
 +msgid "Quote"
  msgstr ""
  
 -#: ../../include/enotify.php:151
 -#, php-format
 -msgid "You've received an introduction from '%1$s' at %2$s"
 +#: ../../include/conversation.php:585
 +msgid "Code"
  msgstr ""
  
 -#: ../../include/enotify.php:152
 -#, php-format
 -msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 +#: ../../include/conversation.php:586
 +msgid "Image"
  msgstr ""
  
 -#: ../../include/enotify.php:155 ../../include/enotify.php:173
 -#, php-format
 -msgid "You may visit their profile at %s"
 +#: ../../include/conversation.php:587
 +msgid "Link"
  msgstr ""
  
 -#: ../../include/enotify.php:157
 -#, php-format
 -msgid "Please visit %s to approve or reject the introduction."
 +#: ../../include/conversation.php:588
 +msgid "Video"
  msgstr ""
  
 -#: ../../include/enotify.php:164
 -msgid "[Friendica:Notify] Friend suggestion received"
 +#: ../../include/conversation.php:621
 +msgid "add star"
  msgstr ""
  
 -#: ../../include/enotify.php:165
 -#, php-format
 -msgid "You've received a friend suggestion from '%1$s' at %2$s"
 +#: ../../include/conversation.php:622
 +msgid "remove star"
  msgstr ""
  
 -#: ../../include/enotify.php:166
 -#, php-format
 -msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 +#: ../../include/conversation.php:623
 +msgid "toggle star status"
  msgstr ""
  
 -#: ../../include/enotify.php:171
 -msgid "Name:"
 +#: ../../include/conversation.php:626
 +msgid "starred"
  msgstr ""
  
 -#: ../../include/enotify.php:172
 -msgid "Photo:"
 +#: ../../include/conversation.php:627
 +msgid "add tag"
  msgstr ""
  
 -#: ../../include/enotify.php:175
 -#, php-format
 -msgid "Please visit %s to approve or reject the suggestion."
 +#: ../../include/conversation.php:631
 +msgid "save to folder"
  msgstr ""
  
 -#: ../../include/onepoll.php:406
 -msgid "From: "
 +#: ../../include/conversation.php:703
 +msgid "to"
  msgstr ""
  
 -#: ../../include/user.php:38
 -msgid "An invitation is required."
 +#: ../../include/conversation.php:704
 +msgid "Wall-to-Wall"
  msgstr ""
  
 -#: ../../include/user.php:43
 -msgid "Invitation could not be verified."
 +#: ../../include/conversation.php:705
 +msgid "via Wall-To-Wall:"
  msgstr ""
  
 -#: ../../include/user.php:51
 -msgid "Invalid OpenID url"
 +#: ../../include/conversation.php:750
 +msgid "Delete Selected Items"
  msgstr ""
  
 -#: ../../include/user.php:66
 -msgid "Please enter the required information."
 +#: ../../include/conversation.php:901
 +#, php-format
 +msgid "%s likes this."
  msgstr ""
  
 -#: ../../include/user.php:80
 -msgid "Please use a shorter name."
 +#: ../../include/conversation.php:901
 +#, php-format
 +msgid "%s doesn't like this."
  msgstr ""
  
 -#: ../../include/user.php:82
 -msgid "Name too short."
 +#: ../../include/conversation.php:905
 +#, php-format
 +msgid "<span  %1$s>%2$d people</span> like this."
  msgstr ""
  
 -#: ../../include/user.php:97
 -msgid "That doesn't appear to be your full (First Last) name."
 +#: ../../include/conversation.php:907
 +#, php-format
 +msgid "<span  %1$s>%2$d people</span> don't like this."
  msgstr ""
  
 -#: ../../include/user.php:102
 -msgid "Your email domain is not among those allowed on this site."
 +#: ../../include/conversation.php:913
 +msgid "and"
  msgstr ""
  
 -#: ../../include/user.php:105
 -msgid "Not a valid email address."
 +#: ../../include/conversation.php:916
 +#, php-format
 +msgid ", and %d other people"
  msgstr ""
  
 -#: ../../include/user.php:115
 -msgid "Cannot use that email."
 +#: ../../include/conversation.php:917
 +#, php-format
 +msgid "%s like this."
  msgstr ""
  
 -#: ../../include/user.php:121
 -msgid ""
 -"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 -"must also begin with a letter."
 +#: ../../include/conversation.php:917
 +#, php-format
 +msgid "%s don't like this."
  msgstr ""
  
 -#: ../../include/user.php:127 ../../include/user.php:219
 -msgid "Nickname is already registered. Please choose another."
 +#: ../../include/conversation.php:942
 +msgid "Visible to <strong>everybody</strong>"
  msgstr ""
  
 -#: ../../include/user.php:137
 -msgid ""
 -"Nickname was once registered here and may not be re-used. Please choose "
 -"another."
 +#: ../../include/conversation.php:944
 +msgid "Please enter a video link/URL:"
  msgstr ""
  
 -#: ../../include/user.php:153
 -msgid "SERIOUS ERROR: Generation of security keys failed."
 +#: ../../include/conversation.php:945
 +msgid "Please enter an audio link/URL:"
  msgstr ""
  
 -#: ../../include/user.php:205
 -msgid "An error occurred during registration. Please try again."
 +#: ../../include/conversation.php:946
 +msgid "Tag term:"
  msgstr ""
  
 -#: ../../include/user.php:240
 -msgid "An error occurred creating your default profile. Please try again."
 +#: ../../include/conversation.php:948
 +msgid "Where are you right now?"
  msgstr ""
  
 -#: ../../include/acl_selectors.php:286
 -msgid "Visible to everybody"
 +#: ../../include/conversation.php:991
 +msgid "upload photo"
  msgstr ""
  
 -#: ../../include/bbcode.php:210 ../../include/bbcode.php:230
 -msgid "$1 wrote:"
 +#: ../../include/conversation.php:993
 +msgid "attach file"
  msgstr ""
  
 -#: ../../include/bbcode.php:245 ../../include/bbcode.php:314
 -msgid "Image/photo"
 +#: ../../include/conversation.php:995
 +msgid "web link"
  msgstr ""
  
 -#: ../../include/oembed.php:134
 -msgid "Embedded content"
 +#: ../../include/conversation.php:996
 +msgid "Insert video link"
  msgstr ""
  
 -#: ../../include/oembed.php:143
 -msgid "Embedding disabled"
 +#: ../../include/conversation.php:997
 +msgid "video link"
  msgstr ""
  
 -#: ../../include/group.php:25
 -msgid ""
 -"A deleted group with this name was revived. Existing item permissions "
 -"<strong>may</strong> apply to this group and any future members. If this is "
 -"not what you intended, please create another group with a different name."
 +#: ../../include/conversation.php:998
 +msgid "Insert audio link"
  msgstr ""
  
 -#: ../../include/group.php:176
 -msgid "Default privacy group for new contacts"
 +#: ../../include/conversation.php:999
 +msgid "audio link"
  msgstr ""
  
 -#: ../../include/group.php:195
 -msgid "Everybody"
 +#: ../../include/conversation.php:1001
 +msgid "set location"
  msgstr ""
  
 -#: ../../include/group.php:218
 -msgid "edit"
 +#: ../../include/conversation.php:1003
 +msgid "clear location"
  msgstr ""
  
 -#: ../../include/group.php:239
 -msgid "Groups"
 +#: ../../include/conversation.php:1010
 +msgid "permissions"
  msgstr ""
  
 -#: ../../include/group.php:240
 -msgid "Edit group"
 +#: ../../boot.php:522
 +msgid "Delete this item?"
  msgstr ""
  
 -#: ../../include/group.php:241
 -msgid "Create a new group"
 +#: ../../boot.php:525
 +msgid "show fewer"
  msgstr ""
  
 -#: ../../include/group.php:242
 -msgid "Contacts not in any group"
 +#: ../../boot.php:698
 +#, php-format
 +msgid "Update %s failed. See error logs."
  msgstr ""
  
 -#: ../../include/Contact.php:111
 -msgid "stopped following"
 +#: ../../boot.php:700
 +#, php-format
 +msgid "Update Error at %s"
  msgstr ""
  
 -#: ../../include/datetime.php:43 ../../include/datetime.php:45
 -msgid "Miscellaneous"
 +#: ../../boot.php:800
 +msgid "Create a New Account"
  msgstr ""
  
 -#: ../../include/datetime.php:131 ../../include/datetime.php:263
 -msgid "year"
 +#: ../../boot.php:824
 +msgid "Nickname or Email address: "
  msgstr ""
  
 -#: ../../include/datetime.php:136 ../../include/datetime.php:264
 -msgid "month"
 +#: ../../boot.php:825
 +msgid "Password: "
  msgstr ""
  
 -#: ../../include/datetime.php:141 ../../include/datetime.php:266
 -msgid "day"
 +#: ../../boot.php:828
 +msgid "Or login using OpenID: "
  msgstr ""
  
 -#: ../../include/datetime.php:254
 -msgid "never"
 +#: ../../boot.php:834
 +msgid "Forgot your password?"
  msgstr ""
  
 -#: ../../include/datetime.php:260
 -msgid "less than a second ago"
 +#: ../../boot.php:1001
 +msgid "Edit profile"
  msgstr ""
  
 -#: ../../include/datetime.php:263
 -msgid "years"
 +#: ../../boot.php:1061
 +msgid "Message"
  msgstr ""
  
 -#: ../../include/datetime.php:264
 -msgid "months"
 +#: ../../boot.php:1177 ../../boot.php:1253
 +msgid "g A l F d"
  msgstr ""
  
 -#: ../../include/datetime.php:265
 -msgid "week"
 +#: ../../boot.php:1178 ../../boot.php:1254
 +msgid "F d"
  msgstr ""
  
 -#: ../../include/datetime.php:265
 -msgid "weeks"
 +#: ../../boot.php:1223 ../../boot.php:1294
 +msgid "[today]"
  msgstr ""
  
 -#: ../../include/datetime.php:266
 -msgid "days"
 +#: ../../boot.php:1235
 +msgid "Birthday Reminders"
  msgstr ""
  
 -#: ../../include/datetime.php:267
 -msgid "hour"
 +#: ../../boot.php:1236
 +msgid "Birthdays this week:"
  msgstr ""
  
 -#: ../../include/datetime.php:267
 -msgid "hours"
 +#: ../../boot.php:1287
 +msgid "[No description]"
  msgstr ""
  
 -#: ../../include/datetime.php:268
 -msgid "minute"
 +#: ../../boot.php:1305
 +msgid "Event Reminders"
  msgstr ""
  
 -#: ../../include/datetime.php:268
 -msgid "minutes"
 +#: ../../boot.php:1306
 +msgid "Events this week:"
  msgstr ""
  
 -#: ../../include/datetime.php:269
 -msgid "second"
 +#: ../../boot.php:1511
 +msgid "Status Messages and Posts"
  msgstr ""
  
 -#: ../../include/datetime.php:269
 -msgid "seconds"
 +#: ../../boot.php:1517
 +msgid "Profile Details"
  msgstr ""
  
 -#: ../../include/datetime.php:278
 -#, php-format
 -msgid "%1$d %2$s ago"
 +#: ../../boot.php:1532
 +msgid "Events and Calendar"
  msgstr ""
  
 -#: ../../include/network.php:827
 -msgid "view full size"
 +#: ../../boot.php:1538
 +msgid "Only You Can See This"
  msgstr ""