1
1
Fork 0

improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago.

This commit is contained in:
friendica 2012-11-11 00:28:21 -08:00
commit de5a21bec4
3 changed files with 198 additions and 189 deletions

View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1521' );
define ( 'FRIENDICA_VERSION', '3.0.1523' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1156 );

View file

@ -590,6 +590,12 @@ function probe_url($url, $mode = PROBE_NORMAL) {
$check_feed = false;
if(stristr($url,'tumblr.com') && (! stristr($url,'/rss'))) {
$poll = $url . '/rss';
$check_feed = true;
}
if($twitter || ! $poll)
$check_feed = true;
if((! isset($vcard)) || (! x($vcard,'fn')) || (! $profile))

View file

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 3.0.1521\n"
"Project-Id-Version: 3.0.1523\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-11-08 10:00-0800\n"
"POT-Creation-Date: 2012-11-10 10:00-0800\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"
@ -37,7 +37,7 @@ msgstr ""
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
#: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
#: ../../mod/api.php:31 ../../mod/photos.php:132 ../../mod/photos.php:994
#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
#: ../../mod/notifications.php:66 ../../mod/contacts.php:146
#: ../../mod/settings.php:86 ../../mod/settings.php:525
@ -52,7 +52,7 @@ msgstr ""
#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
#: ../../mod/message.php:38 ../../mod/message.php:168
#: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
#: ../../mod/display.php:165 ../../mod/profiles.php:7
#: ../../mod/profiles.php:424 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
@ -60,7 +60,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
#: ../../addon/fbpost/fbpost.php:165
#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
#: ../../addon.old/dav/friendica/layout.fnk.php:354
@ -130,10 +130,10 @@ msgid "New photo from this URL"
msgstr ""
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
#: ../../mod/events.php:455 ../../mod/photos.php:1027
#: ../../mod/photos.php:1103 ../../mod/photos.php:1366
#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
#: ../../mod/photos.php:1522 ../../mod/install.php:246
#: ../../mod/events.php:455 ../../mod/photos.php:1028
#: ../../mod/photos.php:1104 ../../mod/photos.php:1367
#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
#: ../../mod/photos.php:1523 ../../mod/install.php:246
#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
#: ../../mod/content.php:693 ../../mod/contacts.php:351
#: ../../mod/settings.php:543 ../../mod/settings.php:697
@ -240,11 +240,11 @@ msgstr ""
msgid "Help"
msgstr ""
#: ../../mod/help.php:38 ../../index.php:228
#: ../../mod/help.php:38 ../../index.php:218
msgid "Not Found"
msgstr ""
#: ../../mod/help.php:41 ../../index.php:231
#: ../../mod/help.php:41 ../../index.php:221
msgid "Page not found."
msgstr ""
@ -287,7 +287,7 @@ msgid "link to source"
msgstr ""
#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
#: ../../include/nav.php:52 ../../boot.php:1711
#: ../../include/nav.php:52 ../../boot.php:1731
msgid "Events"
msgstr ""
@ -345,7 +345,7 @@ msgstr ""
#: ../../mod/events.php:448 ../../mod/directory.php:134
#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
#: ../../boot.php:1241
#: ../../boot.php:1261
msgid "Location:"
msgstr ""
@ -360,7 +360,7 @@ msgstr ""
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
#: ../../include/conversation.php:1001
#: ../../include/conversation.php:1005
#: ../../addon.old/js_upload/js_upload.php:45
msgid "Cancel"
msgstr ""
@ -430,33 +430,33 @@ msgstr ""
msgid "No"
msgstr ""
#: ../../mod/photos.php:50 ../../boot.php:1704
#: ../../mod/photos.php:51 ../../boot.php:1724
msgid "Photo Albums"
msgstr ""
#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1565 ../../mod/photos.php:1577
#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
#: ../../mod/photos.php:1096 ../../mod/photos.php:1111
#: ../../mod/photos.php:1566 ../../mod/photos.php:1578
#: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:485
#: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos"
msgstr ""
#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615
#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616
msgid "Upload New Photos"
msgstr ""
#: ../../mod/photos.php:78 ../../mod/settings.php:23
#: ../../mod/photos.php:79 ../../mod/settings.php:23
msgid "everybody"
msgstr ""
#: ../../mod/photos.php:142
#: ../../mod/photos.php:143
msgid "Contact information unavailable"
msgstr ""
#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095
#: ../../mod/photos.php:1110 ../../mod/profile_photo.php:74
#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096
#: ../../mod/photos.php:1111 ../../mod/profile_photo.php:74
#: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305
@ -467,220 +467,220 @@ msgstr ""
msgid "Profile Photos"
msgstr ""
#: ../../mod/photos.php:163
#: ../../mod/photos.php:164
msgid "Album not found."
msgstr ""
#: ../../mod/photos.php:181 ../../mod/photos.php:1104
#: ../../mod/photos.php:182 ../../mod/photos.php:1105
msgid "Delete Album"
msgstr ""
#: ../../mod/photos.php:244 ../../mod/photos.php:1367
#: ../../mod/photos.php:245 ../../mod/photos.php:1368
msgid "Delete Photo"
msgstr ""
#: ../../mod/photos.php:606
#: ../../mod/photos.php:607
#, php-format
msgid "%1$s was tagged in %2$s by %3$s"
msgstr ""
#: ../../mod/photos.php:606
#: ../../mod/photos.php:607
msgid "a photo"
msgstr ""
#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315
#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315
#: ../../addon.old/js_upload/js_upload.php:315
msgid "Image exceeds size limit of "
msgstr ""
#: ../../mod/photos.php:719
#: ../../mod/photos.php:720
msgid "Image file is empty."
msgstr ""
#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153
#: ../../mod/wall_upload.php:110
#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153
#: ../../mod/wall_upload.php:112
msgid "Unable to process image."
msgstr ""
#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301
#: ../../mod/wall_upload.php:136
#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301
#: ../../mod/wall_upload.php:138
msgid "Image upload failed."
msgstr ""
#: ../../mod/photos.php:864 ../../mod/community.php:18
#: ../../mod/photos.php:865 ../../mod/community.php:18
#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31
msgid "Public access denied."
msgstr ""
#: ../../mod/photos.php:874
#: ../../mod/photos.php:875
msgid "No photos selected"
msgstr ""
#: ../../mod/photos.php:975
#: ../../mod/photos.php:976
msgid "Access to this item is restricted."
msgstr ""
#: ../../mod/photos.php:1037
#: ../../mod/photos.php:1038
#, php-format
msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
msgstr ""
#: ../../mod/photos.php:1040
#: ../../mod/photos.php:1041
#, php-format
msgid "You have used %1$.2f Mbytes of photo storage."
msgstr ""
#: ../../mod/photos.php:1046
#: ../../mod/photos.php:1047
msgid "Upload Photos"
msgstr ""
#: ../../mod/photos.php:1050 ../../mod/photos.php:1099
#: ../../mod/photos.php:1051 ../../mod/photos.php:1100
msgid "New album name: "
msgstr ""
#: ../../mod/photos.php:1051
#: ../../mod/photos.php:1052
msgid "or existing album name: "
msgstr ""
#: ../../mod/photos.php:1052
#: ../../mod/photos.php:1053
msgid "Do not show a status post for this upload"
msgstr ""
#: ../../mod/photos.php:1054 ../../mod/photos.php:1362
#: ../../mod/photos.php:1055 ../../mod/photos.php:1363
msgid "Permissions"
msgstr ""
#: ../../mod/photos.php:1114
#: ../../mod/photos.php:1115
msgid "Edit Album"
msgstr ""
#: ../../mod/photos.php:1120
#: ../../mod/photos.php:1121
msgid "Show Newest First"
msgstr ""
#: ../../mod/photos.php:1122
#: ../../mod/photos.php:1123
msgid "Show Oldest First"
msgstr ""
#: ../../mod/photos.php:1146 ../../mod/photos.php:1598
#: ../../mod/photos.php:1147 ../../mod/photos.php:1599
msgid "View Photo"
msgstr ""
#: ../../mod/photos.php:1181
#: ../../mod/photos.php:1182
msgid "Permission denied. Access to this item may be restricted."
msgstr ""
#: ../../mod/photos.php:1183
#: ../../mod/photos.php:1184
msgid "Photo not available"
msgstr ""
#: ../../mod/photos.php:1239
#: ../../mod/photos.php:1240
msgid "View photo"
msgstr ""
#: ../../mod/photos.php:1239
#: ../../mod/photos.php:1240
msgid "Edit photo"
msgstr ""
#: ../../mod/photos.php:1240
#: ../../mod/photos.php:1241
msgid "Use as profile photo"
msgstr ""
#: ../../mod/photos.php:1246 ../../mod/content.php:603
#: ../../mod/photos.php:1247 ../../mod/content.php:603
#: ../../object/Item.php:103
msgid "Private Message"
msgstr ""
#: ../../mod/photos.php:1265
#: ../../mod/photos.php:1266
msgid "View Full Size"
msgstr ""
#: ../../mod/photos.php:1339
#: ../../mod/photos.php:1340
msgid "Tags: "
msgstr ""
#: ../../mod/photos.php:1342
#: ../../mod/photos.php:1343
msgid "[Remove any tag]"
msgstr ""
#: ../../mod/photos.php:1352
#: ../../mod/photos.php:1353
msgid "Rotate CW (right)"
msgstr ""
#: ../../mod/photos.php:1353
#: ../../mod/photos.php:1354
msgid "Rotate CCW (left)"
msgstr ""
#: ../../mod/photos.php:1355
#: ../../mod/photos.php:1356
msgid "New album name"
msgstr ""
#: ../../mod/photos.php:1358
#: ../../mod/photos.php:1359
msgid "Caption"
msgstr ""
#: ../../mod/photos.php:1360
#: ../../mod/photos.php:1361
msgid "Add a Tag"
msgstr ""
#: ../../mod/photos.php:1364
#: ../../mod/photos.php:1365
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr ""
#: ../../mod/photos.php:1384 ../../mod/content.php:667
#: ../../mod/photos.php:1385 ../../mod/content.php:667
#: ../../object/Item.php:196
msgid "I like this (toggle)"
msgstr ""
#: ../../mod/photos.php:1385 ../../mod/content.php:668
#: ../../mod/photos.php:1386 ../../mod/content.php:668
#: ../../object/Item.php:197
msgid "I don't like this (toggle)"
msgstr ""
#: ../../mod/photos.php:1386 ../../include/conversation.php:962
#: ../../mod/photos.php:1387 ../../include/conversation.php:966
msgid "Share"
msgstr ""
#: ../../mod/photos.php:1387 ../../mod/editpost.php:118
#: ../../mod/photos.php:1388 ../../mod/editpost.php:118
#: ../../mod/content.php:482 ../../mod/content.php:846
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:624
#: ../../include/conversation.php:981 ../../object/Item.php:258
#: ../../include/conversation.php:985 ../../object/Item.php:258
msgid "Please wait"
msgstr ""
#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
#: ../../mod/photos.php:1519 ../../mod/content.php:690
#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
#: ../../mod/photos.php:1520 ../../mod/content.php:690
#: ../../object/Item.php:556
msgid "This is you"
msgstr ""
#: ../../mod/photos.php:1405 ../../mod/photos.php:1449
#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589
#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:605
#: ../../object/Item.php:558
msgid "Comment"
msgstr ""
#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
#: ../../mod/photos.php:1523 ../../mod/editpost.php:139
#: ../../mod/content.php:702 ../../include/conversation.php:999
#: ../../mod/photos.php:1408 ../../mod/photos.php:1452
#: ../../mod/photos.php:1524 ../../mod/editpost.php:139
#: ../../mod/content.php:702 ../../include/conversation.php:1003
#: ../../object/Item.php:568
msgid "Preview"
msgstr ""
#: ../../mod/photos.php:1491 ../../mod/content.php:439
#: ../../mod/photos.php:1492 ../../mod/content.php:439
#: ../../mod/content.php:724 ../../mod/settings.php:606
#: ../../mod/group.php:168 ../../mod/admin.php:696
#: ../../include/conversation.php:569 ../../object/Item.php:117
msgid "Delete"
msgstr ""
#: ../../mod/photos.php:1604
#: ../../mod/photos.php:1605
msgid "View Album"
msgstr ""
#: ../../mod/photos.php:1613
#: ../../mod/photos.php:1614
msgid "Recent Photos"
msgstr ""
@ -738,7 +738,7 @@ msgstr ""
msgid "Edit post"
msgstr ""
#: ../../mod/editpost.php:88 ../../include/conversation.php:948
#: ../../mod/editpost.php:88 ../../include/conversation.php:952
msgid "Post to Email"
msgstr ""
@ -749,85 +749,85 @@ msgstr ""
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:963
#: ../../include/conversation.php:967
msgid "Upload photo"
msgstr ""
#: ../../mod/editpost.php:105 ../../include/conversation.php:964
#: ../../mod/editpost.php:105 ../../include/conversation.php:968
msgid "upload photo"
msgstr ""
#: ../../mod/editpost.php:106 ../../include/conversation.php:965
#: ../../mod/editpost.php:106 ../../include/conversation.php:969
msgid "Attach file"
msgstr ""
#: ../../mod/editpost.php:107 ../../include/conversation.php:966
#: ../../mod/editpost.php:107 ../../include/conversation.php:970
msgid "attach file"
msgstr ""
#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:967
#: ../../include/conversation.php:971
msgid "Insert web link"
msgstr ""
#: ../../mod/editpost.php:109 ../../include/conversation.php:968
#: ../../mod/editpost.php:109 ../../include/conversation.php:972
msgid "web link"
msgstr ""
#: ../../mod/editpost.php:110 ../../include/conversation.php:969
#: ../../mod/editpost.php:110 ../../include/conversation.php:973
msgid "Insert video link"
msgstr ""
#: ../../mod/editpost.php:111 ../../include/conversation.php:970
#: ../../mod/editpost.php:111 ../../include/conversation.php:974
msgid "video link"
msgstr ""
#: ../../mod/editpost.php:112 ../../include/conversation.php:971
#: ../../mod/editpost.php:112 ../../include/conversation.php:975
msgid "Insert audio link"
msgstr ""
#: ../../mod/editpost.php:113 ../../include/conversation.php:972
#: ../../mod/editpost.php:113 ../../include/conversation.php:976
msgid "audio link"
msgstr ""
#: ../../mod/editpost.php:114 ../../include/conversation.php:973
#: ../../mod/editpost.php:114 ../../include/conversation.php:977
msgid "Set your location"
msgstr ""
#: ../../mod/editpost.php:115 ../../include/conversation.php:974
#: ../../mod/editpost.php:115 ../../include/conversation.php:978
msgid "set location"
msgstr ""
#: ../../mod/editpost.php:116 ../../include/conversation.php:975
#: ../../mod/editpost.php:116 ../../include/conversation.php:979
msgid "Clear browser location"
msgstr ""
#: ../../mod/editpost.php:117 ../../include/conversation.php:976
#: ../../mod/editpost.php:117 ../../include/conversation.php:980
msgid "clear location"
msgstr ""
#: ../../mod/editpost.php:119 ../../include/conversation.php:982
#: ../../mod/editpost.php:119 ../../include/conversation.php:986
msgid "Permission settings"
msgstr ""
#: ../../mod/editpost.php:127 ../../include/conversation.php:991
#: ../../mod/editpost.php:127 ../../include/conversation.php:995
msgid "CC: email addresses"
msgstr ""
#: ../../mod/editpost.php:128 ../../include/conversation.php:992
#: ../../mod/editpost.php:128 ../../include/conversation.php:996
msgid "Public post"
msgstr ""
#: ../../mod/editpost.php:131 ../../include/conversation.php:978
#: ../../mod/editpost.php:131 ../../include/conversation.php:982
msgid "Set title"
msgstr ""
#: ../../mod/editpost.php:133 ../../include/conversation.php:980
#: ../../mod/editpost.php:133 ../../include/conversation.php:984
msgid "Categories (comma-separated list)"
msgstr ""
#: ../../mod/editpost.php:134 ../../include/conversation.php:994
#: ../../mod/editpost.php:134 ../../include/conversation.php:998
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
@ -1020,36 +1020,35 @@ msgstr ""
msgid "Submit Request"
msgstr ""
#: ../../mod/uexport.php:10 ../../mod/settings.php:30
#: ../../include/nav.php:137
#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137
msgid "Account settings"
msgstr ""
#: ../../mod/uexport.php:15 ../../mod/settings.php:35
#: ../../mod/uexport.php:14 ../../mod/settings.php:35
msgid "Display settings"
msgstr ""
#: ../../mod/uexport.php:21 ../../mod/settings.php:41
#: ../../mod/uexport.php:20 ../../mod/settings.php:41
msgid "Connector settings"
msgstr ""
#: ../../mod/uexport.php:26 ../../mod/settings.php:46
#: ../../mod/uexport.php:25 ../../mod/settings.php:46
msgid "Plugin settings"
msgstr ""
#: ../../mod/uexport.php:31 ../../mod/settings.php:51
#: ../../mod/uexport.php:30 ../../mod/settings.php:51
msgid "Connected apps"
msgstr ""
#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56
#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56
msgid "Export personal data"
msgstr ""
#: ../../mod/uexport.php:41 ../../mod/settings.php:61
#: ../../mod/uexport.php:40 ../../mod/settings.php:61
msgid "Remove account"
msgstr ""
#: ../../mod/uexport.php:49 ../../mod/settings.php:69
#: ../../mod/uexport.php:48 ../../mod/settings.php:69
#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
@ -1058,21 +1057,21 @@ msgstr ""
msgid "Settings"
msgstr ""
#: ../../mod/uexport.php:73
#: ../../mod/uexport.php:72
msgid "Export account"
msgstr ""
#: ../../mod/uexport.php:73
#: ../../mod/uexport.php:72
msgid ""
"Export your account info and contacts. Use this to make a backup of your "
"account and/or to move it to another server."
msgstr ""
#: ../../mod/uexport.php:74
#: ../../mod/uexport.php:73
msgid "Export all"
msgstr ""
#: ../../mod/uexport.php:74
#: ../../mod/uexport.php:73
msgid ""
"Export your accout info, contacts and all your items as json. Could be a "
"very big file, and could take a lot of time. Use this to make a full backup "
@ -1399,7 +1398,7 @@ msgid "is interested in:"
msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:1179
#: ../../include/contact_widgets.php:9 ../../boot.php:1199
msgid "Connect"
msgstr ""
@ -1466,7 +1465,7 @@ msgstr[1] ""
#: ../../mod/content.php:589 ../../addon/page/page.php:77
#: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
#: ../../include/contact_widgets.php:195 ../../boot.php:590
#: ../../include/contact_widgets.php:195 ../../boot.php:606
#: ../../object/Item.php:280 ../../addon.old/page/page.php:77
#: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
msgid "show more"
@ -2072,7 +2071,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702
#: ../../boot.php:821 ../../addon.old/facebook/facebook.php:702
#: ../../addon.old/facebook/facebook.php:1200
#: ../../addon.old/fbpost/fbpost.php:661
#: ../../addon.old/public_server/public_server.php:62
@ -2086,7 +2085,7 @@ msgid ""
"Password reset failed."
msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:940
#: ../../mod/lostpass.php:83 ../../boot.php:960
msgid "Password Reset"
msgstr ""
@ -2739,7 +2738,7 @@ msgstr ""
msgid "Invalid contact."
msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1718
#: ../../mod/notes.php:44 ../../boot.php:1738
msgid "Personal Notes"
msgstr ""
@ -2767,13 +2766,13 @@ msgstr ""
#: ../../mod/uimport.php:44
msgid ""
"You can move here an account from another Friendica server. <br>\r\n"
" You need to export your account form the old "
"server and upload it here. We will create here your old account with all "
"your contacts. We will try also to inform you friends that you moved here."
"You can import an account from another Friendica server. <br>\r\n"
" You need to export your account from the old "
"server and upload it here. We will recreate your old account here with all "
"your contacts. We will try also to inform your friends that you moved here."
"<br>\r\n"
" <b>This feature is experimental. We can't move "
"here contacts from ostatus network (statusnet/identi.ca) or from diaspora"
" <b>This feature is experimental. We can't import "
"contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
msgstr ""
#: ../../mod/uimport.php:47
@ -2817,7 +2816,7 @@ msgstr ""
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:898 ../../include/conversation.php:916
#: ../../include/conversation.php:902 ../../include/conversation.php:920
msgid "Please enter a link URL:"
msgstr ""
@ -2900,7 +2899,7 @@ msgstr ""
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1694
#: ../../boot.php:1714
msgid "Profile"
msgstr ""
@ -3071,7 +3070,7 @@ msgstr ""
msgid "Group name changed."
msgstr ""
#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318
#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332
msgid "Permission denied"
msgstr ""
@ -3211,7 +3210,7 @@ msgstr ""
msgid "Choose a nickname: "
msgstr ""
#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902
#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:920
msgid "Register"
msgstr ""
@ -3268,7 +3267,7 @@ msgid "Access denied."
msgstr ""
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
#: ../../include/nav.php:51 ../../boot.php:1701
#: ../../include/nav.php:51 ../../boot.php:1721
msgid "Photos"
msgstr ""
@ -3297,8 +3296,8 @@ msgstr ""
msgid "Empty post discarded."
msgstr ""
#: ../../mod/item.php:420 ../../mod/wall_upload.php:133
#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149
#: ../../mod/item.php:420 ../../mod/wall_upload.php:135
#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
#: ../../include/message.php:144
msgid "Wall Photos"
msgstr ""
@ -3362,7 +3361,7 @@ msgstr ""
msgid "Unable to process image"
msgstr ""
#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88
#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90
#, php-format
msgid "Image exceeds size limit of %d"
msgstr ""
@ -4145,7 +4144,7 @@ msgstr ""
msgid "FTP Password"
msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:1089
#: ../../mod/profile.php:21 ../../boot.php:1109
msgid "Requested profile is not available."
msgstr ""
@ -4215,8 +4214,8 @@ msgid ""
"Account not found and OpenID registration is not permitted on this site."
msgstr ""
#: ../../mod/openid.php:93 ../../include/auth.php:98
#: ../../include/auth.php:161
#: ../../mod/openid.php:93 ../../include/auth.php:110
#: ../../include/auth.php:173
msgid "Login failed."
msgstr ""
@ -4546,28 +4545,28 @@ msgstr ""
msgid "Edit/Manage Profiles"
msgstr ""
#: ../../mod/profiles.php:689 ../../boot.php:1207
#: ../../mod/profiles.php:689 ../../boot.php:1227
msgid "Change profile photo"
msgstr ""
#: ../../mod/profiles.php:690 ../../boot.php:1208
#: ../../mod/profiles.php:690 ../../boot.php:1228
msgid "Create New Profile"
msgstr ""
#: ../../mod/profiles.php:701 ../../boot.php:1218
#: ../../mod/profiles.php:701 ../../boot.php:1238
msgid "Profile Image"
msgstr ""
#: ../../mod/profiles.php:703 ../../boot.php:1221
#: ../../mod/profiles.php:703 ../../boot.php:1241
msgid "visible to everybody"
msgstr ""
#: ../../mod/profiles.php:704 ../../boot.php:1222
#: ../../mod/profiles.php:704 ../../boot.php:1242
msgid "Edit visibility"
msgstr ""
#: ../../mod/filer.php:29 ../../include/conversation.php:902
#: ../../include/conversation.php:920
#: ../../mod/filer.php:29 ../../include/conversation.php:906
#: ../../include/conversation.php:924
msgid "Save to Folder:"
msgstr ""
@ -4691,17 +4690,17 @@ msgid "Gender: "
msgstr ""
#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
#: ../../boot.php:1243
#: ../../boot.php:1263
msgid "Gender:"
msgstr ""
#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
#: ../../boot.php:1246
#: ../../boot.php:1266
msgid "Status:"
msgstr ""
#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
#: ../../boot.php:1248
#: ../../boot.php:1268
msgid "Homepage:"
msgstr ""
@ -5572,7 +5571,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34
#: ../../include/nav.php:64 ../../boot.php:927
#: ../../include/nav.php:64 ../../boot.php:946
#: ../../addon.old/communityhome/communityhome.php:28
#: ../../addon.old/communityhome/communityhome.php:34
#: ../../addon.old/communityhome/twillingham/communityhome.php:28
@ -8502,7 +8501,7 @@ msgstr ""
msgid "Contacts not in any group"
msgstr ""
#: ../../include/nav.php:46 ../../boot.php:926
#: ../../include/nav.php:46 ../../boot.php:945
msgid "Logout"
msgstr ""
@ -8510,7 +8509,7 @@ msgstr ""
msgid "End this session"
msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1687
#: ../../include/nav.php:49 ../../boot.php:1707
msgid "Status"
msgstr ""
@ -8590,11 +8589,11 @@ msgstr ""
msgid "Manage other pages"
msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1201
#: ../../include/nav.php:138 ../../boot.php:1221
msgid "Profiles"
msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1201
#: ../../include/nav.php:138 ../../boot.php:1221
msgid "Manage/edit profiles"
msgstr ""
@ -8669,17 +8668,17 @@ msgstr ""
msgid "Categories"
msgstr ""
#: ../../include/auth.php:35
#: ../../include/auth.php:36
msgid "Logged out."
msgstr ""
#: ../../include/auth.php:114
#: ../../include/auth.php:126
msgid ""
"We encountered a problem while logging in with the OpenID you provided. "
"Please check the correct spelling of the ID."
msgstr ""
#: ../../include/auth.php:114
#: ../../include/auth.php:126
msgid "The error message was:"
msgstr ""
@ -9111,7 +9110,7 @@ msgstr ""
msgid "Welcome back "
msgstr ""
#: ../../include/security.php:354
#: ../../include/security.php:357
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."
@ -9210,46 +9209,46 @@ msgstr ""
msgid "and"
msgstr ""
#: ../../include/conversation.php:872
#: ../../include/conversation.php:875
#, php-format
msgid ", and %d other people"
msgstr ""
#: ../../include/conversation.php:873
#: ../../include/conversation.php:877
#, php-format
msgid "%s like this."
msgstr ""
#: ../../include/conversation.php:873
#: ../../include/conversation.php:877
#, php-format
msgid "%s don't like this."
msgstr ""
#: ../../include/conversation.php:897 ../../include/conversation.php:915
#: ../../include/conversation.php:901 ../../include/conversation.php:919
msgid "Visible to <strong>everybody</strong>"
msgstr ""
#: ../../include/conversation.php:899 ../../include/conversation.php:917
#: ../../include/conversation.php:903 ../../include/conversation.php:921
msgid "Please enter a video link/URL:"
msgstr ""
#: ../../include/conversation.php:900 ../../include/conversation.php:918
#: ../../include/conversation.php:904 ../../include/conversation.php:922
msgid "Please enter an audio link/URL:"
msgstr ""
#: ../../include/conversation.php:901 ../../include/conversation.php:919
#: ../../include/conversation.php:905 ../../include/conversation.php:923
msgid "Tag term:"
msgstr ""
#: ../../include/conversation.php:903 ../../include/conversation.php:921
#: ../../include/conversation.php:907 ../../include/conversation.php:925
msgid "Where are you right now?"
msgstr ""
#: ../../include/conversation.php:904
#: ../../include/conversation.php:908
msgid "Delete item(s)?"
msgstr ""
#: ../../include/conversation.php:983
#: ../../include/conversation.php:987
msgid "permissions"
msgstr ""
@ -9265,105 +9264,109 @@ msgstr ""
msgid "This action is not available under your subscription plan."
msgstr ""
#: ../../boot.php:588
#: ../../boot.php:604
msgid "Delete this item?"
msgstr ""
#: ../../boot.php:591
#: ../../boot.php:607
msgid "show fewer"
msgstr ""
#: ../../boot.php:798
#: ../../boot.php:816
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
#: ../../boot.php:800
#: ../../boot.php:818
#, php-format
msgid "Update Error at %s"
msgstr ""
#: ../../boot.php:901
#: ../../boot.php:919
msgid "Create a New Account"
msgstr ""
#: ../../boot.php:929
#: ../../boot.php:948
msgid "Nickname or Email address: "
msgstr ""
#: ../../boot.php:930
#: ../../boot.php:949
msgid "Password: "
msgstr ""
#: ../../boot.php:933
#: ../../boot.php:950
msgid "Remember me"
msgstr ""
#: ../../boot.php:953
msgid "Or login using OpenID: "
msgstr ""
#: ../../boot.php:939
#: ../../boot.php:959
msgid "Forgot your password?"
msgstr ""
#: ../../boot.php:1050
#: ../../boot.php:1070
msgid "Requested account is not available."
msgstr ""
#: ../../boot.php:1127
#: ../../boot.php:1147
msgid "Edit profile"
msgstr ""
#: ../../boot.php:1193
#: ../../boot.php:1213
msgid "Message"
msgstr ""
#: ../../boot.php:1315 ../../boot.php:1401
#: ../../boot.php:1335 ../../boot.php:1421
msgid "g A l F d"
msgstr ""
#: ../../boot.php:1316 ../../boot.php:1402
#: ../../boot.php:1336 ../../boot.php:1422
msgid "F d"
msgstr ""
#: ../../boot.php:1361 ../../boot.php:1442
#: ../../boot.php:1381 ../../boot.php:1462
msgid "[today]"
msgstr ""
#: ../../boot.php:1373
#: ../../boot.php:1393
msgid "Birthday Reminders"
msgstr ""
#: ../../boot.php:1374
#: ../../boot.php:1394
msgid "Birthdays this week:"
msgstr ""
#: ../../boot.php:1435
#: ../../boot.php:1455
msgid "[No description]"
msgstr ""
#: ../../boot.php:1453
#: ../../boot.php:1473
msgid "Event Reminders"
msgstr ""
#: ../../boot.php:1454
#: ../../boot.php:1474
msgid "Events this week:"
msgstr ""
#: ../../boot.php:1690
#: ../../boot.php:1710
msgid "Status Messages and Posts"
msgstr ""
#: ../../boot.php:1697
#: ../../boot.php:1717
msgid "Profile Details"
msgstr ""
#: ../../boot.php:1714
#: ../../boot.php:1734
msgid "Events and Calendar"
msgstr ""
#: ../../boot.php:1721
#: ../../boot.php:1741
msgid "Only You Can See This"
msgstr ""
#: ../../index.php:380
#: ../../index.php:398
msgid "toggle mobile"
msgstr ""