1
0
Fork 0

fix live update on display page

This commit is contained in:
friendica 2013-01-12 15:08:59 -08:00
commit b5c0714bc4
3 changed files with 256 additions and 252 deletions

View file

@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php'); require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.1.1584' ); define ( 'FRIENDICA_VERSION', '3.1.1586' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1157 ); define ( 'DB_UPDATE_VERSION', 1157 );

View file

@ -37,6 +37,7 @@ function display_content(&$a, $update = 0) {
if($update) { if($update) {
$item_id = $_REQUEST['item_id']; $item_id = $_REQUEST['item_id'];
$a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
} }
else { else {
$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0); $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
@ -116,6 +117,8 @@ function display_content(&$a, $update = 0) {
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
if($update) { if($update) {
dbg(1);
$r = q("SELECT id FROM item WHERE item.uid = %d $r = q("SELECT id FROM item WHERE item.uid = %d
AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' )) AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
$sql_extra AND unseen = 1", $sql_extra AND unseen = 1",
@ -123,6 +126,7 @@ function display_content(&$a, $update = 0) {
dbesc($item_id), dbesc($item_id),
dbesc($item_id) dbesc($item_id)
); );
dbg(0);
if(!$r) if(!$r)
return ''; return '';
} }

View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.1.1584\n" "Project-Id-Version: 3.1.1586\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-01-10 10:00-0800\n" "POT-Creation-Date: 2013-01-12 10:00-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -38,7 +38,7 @@ msgstr ""
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
#: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
#: ../../mod/editpost.php:10 ../../mod/install.php:155 ../../mod/poke.php:135 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
#: ../../mod/notifications.php:66 ../../mod/contacts.php:147 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
#: ../../mod/settings.php:91 ../../mod/settings.php:542 #: ../../mod/settings.php:91 ../../mod/settings.php:542
#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6 #: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
@ -46,7 +46,7 @@ msgstr ""
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
#: ../../mod/register.php:40 ../../mod/regmod.php:125 ../../mod/item.php:139 #: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/item.php:139
#: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/item.php:155 ../../mod/mood.php:114
#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
#: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
@ -60,7 +60,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170 #: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170
#: ../../addon/fbpost/fbpost.php:176 #: ../../addon/fbpost/fbpost.php:176
#: ../../addon/dav/friendica/layout.fnk.php:354 #: ../../addon/dav/friendica/layout.fnk.php:354
#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3994 #: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
#: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/facebook/facebook.php:516
#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@ -134,8 +134,8 @@ msgstr ""
#: ../../mod/events.php:466 ../../mod/photos.php:1028 #: ../../mod/events.php:466 ../../mod/photos.php:1028
#: ../../mod/photos.php:1118 ../../mod/photos.php:1402 #: ../../mod/photos.php:1118 ../../mod/photos.php:1402
#: ../../mod/photos.php:1442 ../../mod/photos.php:1486 #: ../../mod/photos.php:1442 ../../mod/photos.php:1486
#: ../../mod/photos.php:1569 ../../mod/install.php:252 #: ../../mod/photos.php:1569 ../../mod/install.php:248
#: ../../mod/install.php:290 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199
#: ../../mod/content.php:710 ../../mod/contacts.php:352 #: ../../mod/content.php:710 ../../mod/contacts.php:352
#: ../../mod/settings.php:560 ../../mod/settings.php:670 #: ../../mod/settings.php:560 ../../mod/settings.php:670
#: ../../mod/settings.php:739 ../../mod/settings.php:811 #: ../../mod/settings.php:739 ../../mod/settings.php:811
@ -159,7 +159,7 @@ msgstr ""
#: ../../addon/impressum/impressum.php:83 #: ../../addon/impressum/impressum.php:83
#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
#: ../../addon/qcomment/qcomment.php:61 #: ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/openstreetmap/openstreetmap.php:94
#: ../../addon/group_text/group_text.php:84 #: ../../addon/group_text/group_text.php:84
#: ../../addon/libravatar/libravatar.php:99 #: ../../addon/libravatar/libravatar.php:99
#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91 #: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
@ -284,12 +284,12 @@ msgstr ""
msgid "Edit event" msgid "Edit event"
msgstr "" msgstr ""
#: ../../mod/events.php:323 ../../include/text.php:1247 #: ../../mod/events.php:323 ../../include/text.php:1246
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91 #: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91
#: ../../include/nav.php:52 ../../boot.php:1813 #: ../../include/nav.php:52 ../../boot.php:1829
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -302,7 +302,7 @@ msgstr ""
msgid "Previous" msgid "Previous"
msgstr "" msgstr ""
#: ../../mod/events.php:361 ../../mod/install.php:211 #: ../../mod/events.php:361 ../../mod/install.php:207
#: ../../addon/dav/friendica/layout.fnk.php:266 #: ../../addon/dav/friendica/layout.fnk.php:266
#: ../../addon.old/dav/friendica/layout.fnk.php:266 #: ../../addon.old/dav/friendica/layout.fnk.php:266
msgid "Next" msgid "Next"
@ -348,7 +348,7 @@ msgstr ""
#: ../../mod/events.php:459 ../../mod/directory.php:134 #: ../../mod/events.php:459 ../../mod/directory.php:134
#: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../addon/forumdirectory/forumdirectory.php:156
#: ../../include/event.php:40 ../../include/bb2diaspora.php:415 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415
#: ../../boot.php:1334 #: ../../boot.php:1350
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -417,7 +417,7 @@ msgstr ""
#: ../../mod/settings.php:969 ../../mod/settings.php:975 #: ../../mod/settings.php:969 ../../mod/settings.php:975
#: ../../mod/settings.php:1005 ../../mod/settings.php:1006 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006
#: ../../mod/settings.php:1007 ../../mod/settings.php:1008 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
#: ../../mod/settings.php:1009 ../../mod/register.php:254 #: ../../mod/settings.php:1009 ../../mod/register.php:239
#: ../../mod/profiles.php:603 #: ../../mod/profiles.php:603
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
@ -429,12 +429,12 @@ msgstr ""
#: ../../mod/settings.php:969 ../../mod/settings.php:975 #: ../../mod/settings.php:969 ../../mod/settings.php:975
#: ../../mod/settings.php:1005 ../../mod/settings.php:1006 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006
#: ../../mod/settings.php:1007 ../../mod/settings.php:1008 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
#: ../../mod/settings.php:1009 ../../mod/register.php:255 #: ../../mod/settings.php:1009 ../../mod/register.php:240
#: ../../mod/profiles.php:604 #: ../../mod/profiles.php:604
msgid "No" msgid "No"
msgstr "" msgstr ""
#: ../../mod/photos.php:51 ../../boot.php:1806 #: ../../mod/photos.php:51 ../../boot.php:1822
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
@ -657,7 +657,7 @@ msgid "This is you"
msgstr "" msgstr ""
#: ../../mod/photos.php:1441 ../../mod/photos.php:1485 #: ../../mod/photos.php:1441 ../../mod/photos.php:1485
#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635 #: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:641
#: ../../object/Item.php:289 ../../object/Item.php:608 #: ../../object/Item.php:289 ../../object/Item.php:608
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -948,7 +948,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:716 ../../include/items.php:3370 #: ../../mod/dfrn_request.php:716 ../../include/items.php:3366
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -1079,284 +1079,284 @@ msgid ""
"of your account (photos are not exported)" "of your account (photos are not exported)"
msgstr "" msgstr ""
#: ../../mod/install.php:121 #: ../../mod/install.php:117
msgid "Friendica Social Communications Server - Setup" msgid "Friendica Social Communications Server - Setup"
msgstr "" msgstr ""
#: ../../mod/install.php:127 #: ../../mod/install.php:123
msgid "Could not connect to database." msgid "Could not connect to database."
msgstr "" msgstr ""
#: ../../mod/install.php:131 #: ../../mod/install.php:127
msgid "Could not create table." msgid "Could not create table."
msgstr "" msgstr ""
#: ../../mod/install.php:137 #: ../../mod/install.php:133
msgid "Your Friendica site database has been installed." msgid "Your Friendica site database has been installed."
msgstr "" msgstr ""
#: ../../mod/install.php:142 #: ../../mod/install.php:138
msgid "" msgid ""
"You may need to import the file \"database.sql\" manually using phpmyadmin " "You may need to import the file \"database.sql\" manually using phpmyadmin "
"or mysql." "or mysql."
msgstr "" msgstr ""
#: ../../mod/install.php:143 ../../mod/install.php:210 #: ../../mod/install.php:139 ../../mod/install.php:206
#: ../../mod/install.php:510 #: ../../mod/install.php:506
msgid "Please see the file \"INSTALL.txt\"." msgid "Please see the file \"INSTALL.txt\"."
msgstr "" msgstr ""
#: ../../mod/install.php:207 #: ../../mod/install.php:203
msgid "System check" msgid "System check"
msgstr "" msgstr ""
#: ../../mod/install.php:212 #: ../../mod/install.php:208
msgid "Check again" msgid "Check again"
msgstr "" msgstr ""
#: ../../mod/install.php:231 #: ../../mod/install.php:227
msgid "Database connection" msgid "Database connection"
msgstr "" msgstr ""
#: ../../mod/install.php:232 #: ../../mod/install.php:228
msgid "" msgid ""
"In order to install Friendica we need to know how to connect to your " "In order to install Friendica we need to know how to connect to your "
"database." "database."
msgstr "" msgstr ""
#: ../../mod/install.php:233 #: ../../mod/install.php:229
msgid "" msgid ""
"Please contact your hosting provider or site administrator if you have " "Please contact your hosting provider or site administrator if you have "
"questions about these settings." "questions about these settings."
msgstr "" msgstr ""
#: ../../mod/install.php:234 #: ../../mod/install.php:230
msgid "" msgid ""
"The database you specify below should already exist. If it does not, please " "The database you specify below should already exist. If it does not, please "
"create it before continuing." "create it before continuing."
msgstr "" msgstr ""
#: ../../mod/install.php:238 #: ../../mod/install.php:234
msgid "Database Server Name" msgid "Database Server Name"
msgstr "" msgstr ""
#: ../../mod/install.php:239 #: ../../mod/install.php:235
msgid "Database Login Name" msgid "Database Login Name"
msgstr "" msgstr ""
#: ../../mod/install.php:240 #: ../../mod/install.php:236
msgid "Database Login Password" msgid "Database Login Password"
msgstr "" msgstr ""
#: ../../mod/install.php:241 #: ../../mod/install.php:237
msgid "Database Name" msgid "Database Name"
msgstr "" msgstr ""
#: ../../mod/install.php:242 ../../mod/install.php:281 #: ../../mod/install.php:238 ../../mod/install.php:277
msgid "Site administrator email address" msgid "Site administrator email address"
msgstr "" msgstr ""
#: ../../mod/install.php:242 ../../mod/install.php:281 #: ../../mod/install.php:238 ../../mod/install.php:277
msgid "" msgid ""
"Your account email address must match this in order to use the web admin " "Your account email address must match this in order to use the web admin "
"panel." "panel."
msgstr "" msgstr ""
#: ../../mod/install.php:246 ../../mod/install.php:284 #: ../../mod/install.php:242 ../../mod/install.php:280
msgid "Please select a default timezone for your website" msgid "Please select a default timezone for your website"
msgstr "" msgstr ""
#: ../../mod/install.php:271 #: ../../mod/install.php:267
msgid "Site settings" msgid "Site settings"
msgstr "" msgstr ""
#: ../../mod/install.php:324 #: ../../mod/install.php:320
msgid "Could not find a command line version of PHP in the web server PATH." msgid "Could not find a command line version of PHP in the web server PATH."
msgstr "" msgstr ""
#: ../../mod/install.php:325 #: ../../mod/install.php:321
msgid "" msgid ""
"If you don't have a command line version of PHP installed on server, you " "If you don't have a command line version of PHP installed on server, you "
"will not be able to run background polling via cron. See <a href='http://" "will not be able to run background polling via cron. See <a href='http://"
"friendica.com/node/27'>'Activating scheduled tasks'</a>" "friendica.com/node/27'>'Activating scheduled tasks'</a>"
msgstr "" msgstr ""
#: ../../mod/install.php:329 #: ../../mod/install.php:325
msgid "PHP executable path" msgid "PHP executable path"
msgstr "" msgstr ""
#: ../../mod/install.php:329 #: ../../mod/install.php:325
msgid "" msgid ""
"Enter full path to php executable. You can leave this blank to continue the " "Enter full path to php executable. You can leave this blank to continue the "
"installation." "installation."
msgstr "" msgstr ""
#: ../../mod/install.php:334 #: ../../mod/install.php:330
msgid "Command line PHP" msgid "Command line PHP"
msgstr "" msgstr ""
#: ../../mod/install.php:343 #: ../../mod/install.php:339
msgid "" msgid ""
"The command line version of PHP on your system does not have " "The command line version of PHP on your system does not have "
"\"register_argc_argv\" enabled." "\"register_argc_argv\" enabled."
msgstr "" msgstr ""
#: ../../mod/install.php:344 #: ../../mod/install.php:340
msgid "This is required for message delivery to work." msgid "This is required for message delivery to work."
msgstr "" msgstr ""
#: ../../mod/install.php:346 #: ../../mod/install.php:342
msgid "PHP register_argc_argv" msgid "PHP register_argc_argv"
msgstr "" msgstr ""
#: ../../mod/install.php:367 #: ../../mod/install.php:363
msgid "" msgid ""
"Error: the \"openssl_pkey_new\" function on this system is not able to " "Error: the \"openssl_pkey_new\" function on this system is not able to "
"generate encryption keys" "generate encryption keys"
msgstr "" msgstr ""
#: ../../mod/install.php:368 #: ../../mod/install.php:364
msgid "" msgid ""
"If running under Windows, please see \"http://www.php.net/manual/en/openssl." "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
"installation.php\"." "installation.php\"."
msgstr "" msgstr ""
#: ../../mod/install.php:370 #: ../../mod/install.php:366
msgid "Generate encryption keys" msgid "Generate encryption keys"
msgstr "" msgstr ""
#: ../../mod/install.php:377 #: ../../mod/install.php:373
msgid "libCurl PHP module" msgid "libCurl PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:378 #: ../../mod/install.php:374
msgid "GD graphics PHP module" msgid "GD graphics PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:379 #: ../../mod/install.php:375
msgid "OpenSSL PHP module" msgid "OpenSSL PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:380 #: ../../mod/install.php:376
msgid "mysqli PHP module" msgid "mysqli PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:381 #: ../../mod/install.php:377
msgid "mb_string PHP module" msgid "mb_string PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:386 ../../mod/install.php:388 #: ../../mod/install.php:382 ../../mod/install.php:384
msgid "Apache mod_rewrite module" msgid "Apache mod_rewrite module"
msgstr "" msgstr ""
#: ../../mod/install.php:386 #: ../../mod/install.php:382
msgid "" msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed." "Error: Apache webserver mod-rewrite module is required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:394 #: ../../mod/install.php:390
msgid "Error: libCURL PHP module required but not installed." msgid "Error: libCURL PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:398 #: ../../mod/install.php:394
msgid "" msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed." "Error: GD graphics PHP module with JPEG support required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:402 #: ../../mod/install.php:398
msgid "Error: openssl PHP module required but not installed." msgid "Error: openssl PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:406 #: ../../mod/install.php:402
msgid "Error: mysqli PHP module required but not installed." msgid "Error: mysqli PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:410 #: ../../mod/install.php:406
msgid "Error: mb_string PHP module required but not installed." msgid "Error: mb_string PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:427 #: ../../mod/install.php:423
msgid "" msgid ""
"The web installer needs to be able to create a file called \".htconfig.php\" " "The web installer needs to be able to create a file called \".htconfig.php\" "
"in the top folder of your web server and it is unable to do so." "in the top folder of your web server and it is unable to do so."
msgstr "" msgstr ""
#: ../../mod/install.php:428 #: ../../mod/install.php:424
msgid "" msgid ""
"This is most often a permission setting, as the web server may not be able " "This is most often a permission setting, as the web server may not be able "
"to write files in your folder - even if you can." "to write files in your folder - even if you can."
msgstr "" msgstr ""
#: ../../mod/install.php:429 #: ../../mod/install.php:425
msgid "" msgid ""
"At the end of this procedure, we will give you a text to save in a file " "At the end of this procedure, we will give you a text to save in a file "
"named .htconfig.php in your Friendica top folder." "named .htconfig.php in your Friendica top folder."
msgstr "" msgstr ""
#: ../../mod/install.php:430 #: ../../mod/install.php:426
msgid "" msgid ""
"You can alternatively skip this procedure and perform a manual installation. " "You can alternatively skip this procedure and perform a manual installation. "
"Please see the file \"INSTALL.txt\" for instructions." "Please see the file \"INSTALL.txt\" for instructions."
msgstr "" msgstr ""
#: ../../mod/install.php:433 #: ../../mod/install.php:429
msgid ".htconfig.php is writable" msgid ".htconfig.php is writable"
msgstr "" msgstr ""
#: ../../mod/install.php:443 #: ../../mod/install.php:439
msgid "" msgid ""
"Friendica uses the Smarty3 template engine to render its web views. Smarty3 " "Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
"compiles templates to PHP to speed up rendering." "compiles templates to PHP to speed up rendering."
msgstr "" msgstr ""
#: ../../mod/install.php:444 #: ../../mod/install.php:440
msgid "" msgid ""
"In order to store these compiled templates, the web server needs to have " "In order to store these compiled templates, the web server needs to have "
"write access to the directory view/smarty3/ under the Friendica top level " "write access to the directory view/smarty3/ under the Friendica top level "
"folder." "folder."
msgstr "" msgstr ""
#: ../../mod/install.php:445 #: ../../mod/install.php:441
msgid "" msgid ""
"Please ensure that the user that your web server runs as (e.g. www-data) has " "Please ensure that the user that your web server runs as (e.g. www-data) has "
"write access to this folder." "write access to this folder."
msgstr "" msgstr ""
#: ../../mod/install.php:446 #: ../../mod/install.php:442
msgid "" msgid ""
"Note: as a security measure, you should give the web server write access to " "Note: as a security measure, you should give the web server write access to "
"view/smarty3/ only--not the template files (.tpl) that it contains." "view/smarty3/ only--not the template files (.tpl) that it contains."
msgstr "" msgstr ""
#: ../../mod/install.php:449 #: ../../mod/install.php:445
msgid "view/smarty3 is writable" msgid "view/smarty3 is writable"
msgstr "" msgstr ""
#: ../../mod/install.php:461 #: ../../mod/install.php:457
msgid "" msgid ""
"Url rewrite in .htaccess is not working. Check your server configuration." "Url rewrite in .htaccess is not working. Check your server configuration."
msgstr "" msgstr ""
#: ../../mod/install.php:463 #: ../../mod/install.php:459
msgid "Url rewrite is working" msgid "Url rewrite is working"
msgstr "" msgstr ""
#: ../../mod/install.php:473 #: ../../mod/install.php:469
msgid "" msgid ""
"The database configuration file \".htconfig.php\" could not be written. " "The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web " "Please use the enclosed text to create a configuration file in your web "
"server root." "server root."
msgstr "" msgstr ""
#: ../../mod/install.php:497 #: ../../mod/install.php:493
msgid "Errors encountered creating database tables." msgid "Errors encountered creating database tables."
msgstr "" msgstr ""
#: ../../mod/install.php:508 #: ../../mod/install.php:504
msgid "<h1>What next</h1>" msgid "<h1>What next</h1>"
msgstr "" msgstr ""
#: ../../mod/install.php:509 #: ../../mod/install.php:505
msgid "" msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr "" msgstr ""
@ -1428,7 +1428,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:1272 #: ../../include/contact_widgets.php:9 ../../boot.php:1288
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1486,7 +1486,7 @@ msgid_plural "%d comments"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/content.php:605 ../../include/text.php:1503 #: ../../mod/content.php:605 ../../include/text.php:1502
#: ../../object/Item.php:314 ../../object/Item.php:327 #: ../../object/Item.php:314 ../../object/Item.php:327
msgid "comment" msgid "comment"
msgid_plural "comments" msgid_plural "comments"
@ -1495,7 +1495,7 @@ msgstr[1] ""
#: ../../mod/content.php:606 ../../addon/page/page.php:77 #: ../../mod/content.php:606 ../../addon/page/page.php:77
#: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
#: ../../include/contact_widgets.php:204 ../../boot.php:636 #: ../../include/contact_widgets.php:204 ../../boot.php:642
#: ../../object/Item.php:315 ../../addon.old/page/page.php:77 #: ../../object/Item.php:315 ../../addon.old/page/page.php:77
#: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
msgid "show more" msgid "show more"
@ -2091,63 +2091,63 @@ msgstr ""
msgid "Password reset request issued. Check your email." msgid "Password reset request issued. Check your email."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:49 #: ../../mod/lostpass.php:44
#, php-format #, php-format
msgid "Password reset requested at %s" msgid "Password reset requested at %s"
msgstr "" msgstr ""
#: ../../mod/lostpass.php:71 #: ../../mod/lostpass.php:66
msgid "" msgid ""
"Request could not be verified. (You may have previously submitted it.) " "Request could not be verified. (You may have previously submitted it.) "
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:89 ../../boot.php:1006 #: ../../mod/lostpass.php:84 ../../boot.php:1022
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
#: ../../mod/lostpass.php:90 #: ../../mod/lostpass.php:85
msgid "Your password has been reset as requested." msgid "Your password has been reset as requested."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:91 #: ../../mod/lostpass.php:86
msgid "Your new password is" msgid "Your new password is"
msgstr "" msgstr ""
#: ../../mod/lostpass.php:92 #: ../../mod/lostpass.php:87
msgid "Save or copy your new password - and then" msgid "Save or copy your new password - and then"
msgstr "" msgstr ""
#: ../../mod/lostpass.php:93 #: ../../mod/lostpass.php:88
msgid "click here to login" msgid "click here to login"
msgstr "" msgstr ""
#: ../../mod/lostpass.php:94 #: ../../mod/lostpass.php:89
msgid "" msgid ""
"Your password may be changed from the <em>Settings</em> page after " "Your password may be changed from the <em>Settings</em> page after "
"successful login." "successful login."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:116 #: ../../mod/lostpass.php:107
#, php-format #, php-format
msgid "Your password has been changed at %s" msgid "Your password has been changed at %s"
msgstr "" msgstr ""
#: ../../mod/lostpass.php:131 #: ../../mod/lostpass.php:122
msgid "Forgot your Password?" msgid "Forgot your Password?"
msgstr "" msgstr ""
#: ../../mod/lostpass.php:132 #: ../../mod/lostpass.php:123
msgid "" msgid ""
"Enter your email address and submit to have your password reset. Then check " "Enter your email address and submit to have your password reset. Then check "
"your email for further instructions." "your email for further instructions."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:133 #: ../../mod/lostpass.php:124
msgid "Nickname or Email: " msgid "Nickname or Email: "
msgstr "" msgstr ""
#: ../../mod/lostpass.php:134 #: ../../mod/lostpass.php:125
msgid "Reset" msgid "Reset"
msgstr "" msgstr ""
@ -2219,7 +2219,7 @@ msgstr ""
#: ../../addon/fbpost/fbpost.php:155 #: ../../addon/fbpost/fbpost.php:155
#: ../../addon/remote_permissions/remote_permissions.php:205 #: ../../addon/remote_permissions/remote_permissions.php:205
#: ../../addon/impressum/impressum.php:78 #: ../../addon/impressum/impressum.php:78
#: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/openstreetmap/openstreetmap.php:104
#: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:548 #: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:548
#: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/facebook/facebook.php:495
@ -2782,7 +2782,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1820 #: ../../mod/notes.php:44 ../../boot.php:1836
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2791,7 +2791,7 @@ msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:354 #: ../../addon/privacy_image_cache/privacy_image_cache.php:354
#: ../../addon/fbpost/fbpost.php:322 #: ../../addon/fbpost/fbpost.php:322
#: ../../addon/dav/friendica/layout.fnk.php:441 #: ../../addon/dav/friendica/layout.fnk.php:441
#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:742 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:741
#: ../../addon.old/facebook/facebook.php:770 #: ../../addon.old/facebook/facebook.php:770
#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
#: ../../addon.old/fbpost/fbpost.php:267 #: ../../addon.old/fbpost/fbpost.php:267
@ -2800,7 +2800,7 @@ msgstr ""
msgid "Save" msgid "Save"
msgstr "" msgstr ""
#: ../../mod/uimport.php:50 ../../mod/register.php:207 #: ../../mod/uimport.php:50 ../../mod/register.php:192
msgid "" msgid ""
"This site has exceeded the number of allowed daily account registrations. " "This site has exceeded the number of allowed daily account registrations. "
"Please try again tomorrow." "Please try again tomorrow."
@ -2956,7 +2956,7 @@ msgstr ""
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1796 #: ../../boot.php:1812
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -3179,89 +3179,89 @@ msgstr ""
msgid "No contacts." msgid "No contacts."
msgstr "" msgstr ""
#: ../../mod/viewcontacts.php:76 ../../include/text.php:679 #: ../../mod/viewcontacts.php:76 ../../include/text.php:678
msgid "View Contacts" msgid "View Contacts"
msgstr "" msgstr ""
#: ../../mod/register.php:99 ../../mod/regmod.php:61 #: ../../mod/register.php:91 ../../mod/regmod.php:54
#, php-format #, php-format
msgid "Registration details for %s" msgid "Registration details for %s"
msgstr "" msgstr ""
#: ../../mod/register.php:107 #: ../../mod/register.php:99
msgid "" msgid ""
"Registration successful. Please check your email for further instructions." "Registration successful. Please check your email for further instructions."
msgstr "" msgstr ""
#: ../../mod/register.php:111 #: ../../mod/register.php:103
msgid "Failed to send email message. Here is the message that failed." msgid "Failed to send email message. Here is the message that failed."
msgstr "" msgstr ""
#: ../../mod/register.php:116 #: ../../mod/register.php:108
msgid "Your registration can not be processed." msgid "Your registration can not be processed."
msgstr "" msgstr ""
#: ../../mod/register.php:160 #: ../../mod/register.php:145
#, php-format #, php-format
msgid "Registration request at %s" msgid "Registration request at %s"
msgstr "" msgstr ""
#: ../../mod/register.php:169 #: ../../mod/register.php:154
msgid "Your registration is pending approval by the site owner." msgid "Your registration is pending approval by the site owner."
msgstr "" msgstr ""
#: ../../mod/register.php:235 #: ../../mod/register.php:220
msgid "" msgid ""
"You may (optionally) fill in this form via OpenID by supplying your OpenID " "You may (optionally) fill in this form via OpenID by supplying your OpenID "
"and clicking 'Register'." "and clicking 'Register'."
msgstr "" msgstr ""
#: ../../mod/register.php:236 #: ../../mod/register.php:221
msgid "" msgid ""
"If you are not familiar with OpenID, please leave that field blank and fill " "If you are not familiar with OpenID, please leave that field blank and fill "
"in the rest of the items." "in the rest of the items."
msgstr "" msgstr ""
#: ../../mod/register.php:237 #: ../../mod/register.php:222
msgid "Your OpenID (optional): " msgid "Your OpenID (optional): "
msgstr "" msgstr ""
#: ../../mod/register.php:251 #: ../../mod/register.php:236
msgid "Include your profile in member directory?" msgid "Include your profile in member directory?"
msgstr "" msgstr ""
#: ../../mod/register.php:272 #: ../../mod/register.php:257
msgid "Membership on this site is by invitation only." msgid "Membership on this site is by invitation only."
msgstr "" msgstr ""
#: ../../mod/register.php:273 #: ../../mod/register.php:258
msgid "Your invitation ID: " msgid "Your invitation ID: "
msgstr "" msgstr ""
#: ../../mod/register.php:276 ../../mod/admin.php:462 #: ../../mod/register.php:261 ../../mod/admin.php:462
msgid "Registration" msgid "Registration"
msgstr "" msgstr ""
#: ../../mod/register.php:284 #: ../../mod/register.php:269
msgid "Your Full Name (e.g. Joe Smith): " msgid "Your Full Name (e.g. Joe Smith): "
msgstr "" msgstr ""
#: ../../mod/register.php:285 #: ../../mod/register.php:270
msgid "Your Email Address: " msgid "Your Email Address: "
msgstr "" msgstr ""
#: ../../mod/register.php:286 #: ../../mod/register.php:271
msgid "" msgid ""
"Choose a profile nickname. This must begin with a text character. Your " "Choose a profile nickname. This must begin with a text character. Your "
"profile address on this site will then be '<strong>nickname@$sitename</" "profile address on this site will then be '<strong>nickname@$sitename</"
"strong>'." "strong>'."
msgstr "" msgstr ""
#: ../../mod/register.php:287 #: ../../mod/register.php:272
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:290 ../../include/nav.php:81 ../../boot.php:967 #: ../../mod/register.php:275 ../../include/nav.php:81 ../../boot.php:983
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -3271,7 +3271,7 @@ msgstr ""
#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
#: ../../addon/communityhome/communityhome.php:171 #: ../../addon/communityhome/communityhome.php:171
#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1499 #: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1498
#: ../../include/diaspora.php:1851 ../../include/conversation.php:125 #: ../../include/diaspora.php:1851 ../../include/conversation.php:125
#: ../../include/conversation.php:253 #: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163 #: ../../addon.old/communityhome/communityhome.php:163
@ -3309,7 +3309,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:47 #: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:47
#: ../../mod/display.php:177 ../../include/items.php:3860 #: ../../mod/display.php:177 ../../include/items.php:3853
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -3318,7 +3318,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
#: ../../include/nav.php:51 ../../boot.php:1803 #: ../../include/nav.php:51 ../../boot.php:1819
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -3326,16 +3326,16 @@ msgstr ""
msgid "Files" msgid "Files"
msgstr "" msgstr ""
#: ../../mod/regmod.php:70 #: ../../mod/regmod.php:63
msgid "Account approved." msgid "Account approved."
msgstr "" msgstr ""
#: ../../mod/regmod.php:107 #: ../../mod/regmod.php:100
#, php-format #, php-format
msgid "Registration revoked for %s" msgid "Registration revoked for %s"
msgstr "" msgstr ""
#: ../../mod/regmod.php:119 #: ../../mod/regmod.php:112
msgid "Please login." msgid "Please login."
msgstr "" msgstr ""
@ -4255,7 +4255,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:1180 #: ../../mod/profile.php:21 ../../boot.php:1196
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -4363,8 +4363,8 @@ msgstr ""
msgid "No installed applications." msgid "No installed applications."
msgstr "" msgstr ""
#: ../../mod/search.php:99 ../../include/text.php:739 #: ../../mod/search.php:99 ../../include/text.php:738
#: ../../include/text.php:740 ../../include/nav.php:91 #: ../../include/text.php:739 ../../include/nav.php:91
msgid "Search" msgid "Search"
msgstr "" msgstr ""
@ -4662,23 +4662,23 @@ msgstr ""
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:719 ../../boot.php:1300 #: ../../mod/profiles.php:719 ../../boot.php:1316
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:720 ../../boot.php:1301 #: ../../mod/profiles.php:720 ../../boot.php:1317
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:731 ../../boot.php:1311 #: ../../mod/profiles.php:731 ../../boot.php:1327
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:733 ../../boot.php:1314 #: ../../mod/profiles.php:733 ../../boot.php:1330
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:734 ../../boot.php:1315 #: ../../mod/profiles.php:734 ../../boot.php:1331
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -4810,19 +4810,19 @@ msgstr ""
#: ../../mod/directory.php:136 #: ../../mod/directory.php:136
#: ../../addon/forumdirectory/forumdirectory.php:158 #: ../../addon/forumdirectory/forumdirectory.php:158
#: ../../include/profile_advanced.php:17 ../../boot.php:1336 #: ../../include/profile_advanced.php:17 ../../boot.php:1352
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
#: ../../mod/directory.php:138 #: ../../mod/directory.php:138
#: ../../addon/forumdirectory/forumdirectory.php:160 #: ../../addon/forumdirectory/forumdirectory.php:160
#: ../../include/profile_advanced.php:37 ../../boot.php:1339 #: ../../include/profile_advanced.php:37 ../../boot.php:1355
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../mod/directory.php:140 #: ../../mod/directory.php:140
#: ../../addon/forumdirectory/forumdirectory.php:162 #: ../../addon/forumdirectory/forumdirectory.php:162
#: ../../include/profile_advanced.php:48 ../../boot.php:1341 #: ../../include/profile_advanced.php:48 ../../boot.php:1357
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -4998,12 +4998,12 @@ msgstr ""
msgid "Unable to update your contact profile details on our system" msgid "Unable to update your contact profile details on our system"
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:760 #: ../../mod/dfrn_confirm.php:751
#, php-format #, php-format
msgid "Connection accepted at %s" msgid "Connection accepted at %s"
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:809 #: ../../mod/dfrn_confirm.php:800
#, php-format #, php-format
msgid "%1$s has joined %2$s" msgid "%1$s has joined %2$s"
msgstr "" msgstr ""
@ -5143,7 +5143,7 @@ msgid "Problems with Facebook Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:704 #: ../../addon/facebook/facebook.php:704
#: ../../addon/facebook/facebook.php:1202 ../../addon/fbpost/fbpost.php:817 #: ../../addon/facebook/facebook.php:1202 ../../addon/fbpost/fbpost.php:821
#: ../../addon/public_server/public_server.php:62 #: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 #: ../../addon/testdrive/testdrive.php:67
#: ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:702
@ -5257,7 +5257,7 @@ msgstr ""
msgid "Post to Facebook" msgid "Post to Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:923 ../../addon/fbpost/fbpost.php:483 #: ../../addon/facebook/facebook.php:923 ../../addon/fbpost/fbpost.php:487
#: ../../addon.old/facebook/facebook.php:921 #: ../../addon.old/facebook/facebook.php:921
#: ../../addon.old/fbpost/fbpost.php:399 #: ../../addon.old/fbpost/fbpost.php:399
msgid "" msgid ""
@ -5265,31 +5265,31 @@ msgid ""
"conflict." "conflict."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1151 ../../addon/fbpost/fbpost.php:762 #: ../../addon/facebook/facebook.php:1151 ../../addon/fbpost/fbpost.php:766
#: ../../addon.old/facebook/facebook.php:1149 #: ../../addon.old/facebook/facebook.php:1149
#: ../../addon.old/fbpost/fbpost.php:610 #: ../../addon.old/fbpost/fbpost.php:610
msgid "View on Friendica" msgid "View on Friendica"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1184 ../../addon/fbpost/fbpost.php:799 #: ../../addon/facebook/facebook.php:1184 ../../addon/fbpost/fbpost.php:803
#: ../../addon.old/facebook/facebook.php:1182 #: ../../addon.old/facebook/facebook.php:1182
#: ../../addon.old/fbpost/fbpost.php:643 #: ../../addon.old/fbpost/fbpost.php:643
msgid "Facebook post failed. Queued for retry." msgid "Facebook post failed. Queued for retry."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:839 #: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:843
#: ../../addon.old/facebook/facebook.php:1222 #: ../../addon.old/facebook/facebook.php:1222
#: ../../addon.old/fbpost/fbpost.php:683 #: ../../addon.old/fbpost/fbpost.php:683
msgid "Your Facebook connection became invalid. Please Re-authenticate." msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1225 ../../addon/fbpost/fbpost.php:840 #: ../../addon/facebook/facebook.php:1225 ../../addon/fbpost/fbpost.php:844
#: ../../addon.old/facebook/facebook.php:1223 #: ../../addon.old/facebook/facebook.php:1223
#: ../../addon.old/fbpost/fbpost.php:684 #: ../../addon.old/fbpost/fbpost.php:684
msgid "Facebook connection became invalid" msgid "Facebook connection became invalid"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:841 #: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:845
#: ../../addon.old/facebook/facebook.php:1224 #: ../../addon.old/facebook/facebook.php:1224
#: ../../addon.old/fbpost/fbpost.php:685 #: ../../addon.old/fbpost/fbpost.php:685
#, php-format #, php-format
@ -5727,7 +5727,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:28 #: ../../addon/communityhome/communityhome.php:28
#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64 #: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64
#: ../../boot.php:992 ../../addon.old/communityhome/communityhome.php:28 #: ../../boot.php:1008 ../../addon.old/communityhome/communityhome.php:28
#: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/communityhome.php:34
#: ../../addon.old/communityhome/twillingham/communityhome.php:28 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
#: ../../addon.old/communityhome/twillingham/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:34
@ -5763,7 +5763,7 @@ msgid "Latest likes"
msgstr "" msgstr ""
#: ../../addon/communityhome/communityhome.php:163 #: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1497 #: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1496
#: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155 #: ../../addon.old/communityhome/communityhome.php:155
msgid "event" msgid "event"
@ -5917,7 +5917,7 @@ msgstr ""
#: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:254
#: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:270
#: ../../addon/dav/common/wdcal_edit.inc.php:293 #: ../../addon/dav/common/wdcal_edit.inc.php:293
#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:976 #: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:975
#: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
#: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
#: ../../addon.old/dav/common/wdcal_edit.inc.php:270 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@ -5928,7 +5928,7 @@ msgstr ""
#: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:235
#: ../../addon/dav/common/wdcal_edit.inc.php:274 #: ../../addon/dav/common/wdcal_edit.inc.php:274
#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:976 #: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:975
#: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
#: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
#: ../../addon.old/dav/common/wdcal_edit.inc.php:308 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@ -5936,35 +5936,35 @@ msgid "Monday"
msgstr "" msgstr ""
#: ../../addon/dav/common/wdcal_edit.inc.php:238 #: ../../addon/dav/common/wdcal_edit.inc.php:238
#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:976 #: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:975
#: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
#: ../../addon.old/dav/common/wdcal_edit.inc.php:277 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#: ../../addon/dav/common/wdcal_edit.inc.php:241 #: ../../addon/dav/common/wdcal_edit.inc.php:241
#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:976 #: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:975
#: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
#: ../../addon.old/dav/common/wdcal_edit.inc.php:280 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: ../../addon/dav/common/wdcal_edit.inc.php:244 #: ../../addon/dav/common/wdcal_edit.inc.php:244
#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:976 #: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:975
#: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
#: ../../addon.old/dav/common/wdcal_edit.inc.php:283 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
#: ../../addon/dav/common/wdcal_edit.inc.php:247 #: ../../addon/dav/common/wdcal_edit.inc.php:247
#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:976 #: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:975
#: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
#: ../../addon.old/dav/common/wdcal_edit.inc.php:286 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
msgid "Friday" msgid "Friday"
msgstr "" msgstr ""
#: ../../addon/dav/common/wdcal_edit.inc.php:250 #: ../../addon/dav/common/wdcal_edit.inc.php:250
#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:976 #: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:975
#: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
#: ../../addon.old/dav/common/wdcal_edit.inc.php:289 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
msgid "Saturday" msgid "Saturday"
@ -6911,24 +6911,24 @@ msgstr ""
msgid "Quick Comment settings saved." msgid "Quick Comment settings saved."
msgstr "" msgstr ""
#: ../../addon/openstreetmap/openstreetmap.php:71 #: ../../addon/openstreetmap/openstreetmap.php:95
#: ../../addon.old/openstreetmap/openstreetmap.php:71 #: ../../addon.old/openstreetmap/openstreetmap.php:71
msgid "Tile Server URL" msgid "Tile Server URL"
msgstr "" msgstr ""
#: ../../addon/openstreetmap/openstreetmap.php:71 #: ../../addon/openstreetmap/openstreetmap.php:95
#: ../../addon.old/openstreetmap/openstreetmap.php:71 #: ../../addon.old/openstreetmap/openstreetmap.php:71
msgid "" msgid ""
"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank" "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
"\">public tile servers</a>" "\">public tile servers</a>"
msgstr "" msgstr ""
#: ../../addon/openstreetmap/openstreetmap.php:72 #: ../../addon/openstreetmap/openstreetmap.php:96
#: ../../addon.old/openstreetmap/openstreetmap.php:72 #: ../../addon.old/openstreetmap/openstreetmap.php:72
msgid "Default zoom" msgid "Default zoom"
msgstr "" msgstr ""
#: ../../addon/openstreetmap/openstreetmap.php:72 #: ../../addon/openstreetmap/openstreetmap.php:96
#: ../../addon.old/openstreetmap/openstreetmap.php:72 #: ../../addon.old/openstreetmap/openstreetmap.php:72
msgid "The default zoom level. (1:world, 18:highest)" msgid "The default zoom level. (1:world, 18:highest)"
msgstr "" msgstr ""
@ -8380,242 +8380,242 @@ msgstr ""
msgid " on Last.fm" msgid " on Last.fm"
msgstr "" msgstr ""
#: ../../include/text.php:263 #: ../../include/text.php:262
msgid "prev" msgid "prev"
msgstr "" msgstr ""
#: ../../include/text.php:265 #: ../../include/text.php:264
msgid "first" msgid "first"
msgstr "" msgstr ""
#: ../../include/text.php:294 #: ../../include/text.php:293
msgid "last" msgid "last"
msgstr "" msgstr ""
#: ../../include/text.php:297 #: ../../include/text.php:296
msgid "next" msgid "next"
msgstr "" msgstr ""
#: ../../include/text.php:315 #: ../../include/text.php:314
msgid "newer" msgid "newer"
msgstr "" msgstr ""
#: ../../include/text.php:319 #: ../../include/text.php:318
msgid "older" msgid "older"
msgstr "" msgstr ""
#: ../../include/text.php:658 #: ../../include/text.php:657
msgid "No contacts" msgid "No contacts"
msgstr "" msgstr ""
#: ../../include/text.php:667 #: ../../include/text.php:666
#, php-format #, php-format
msgid "%d Contact" msgid "%d Contact"
msgid_plural "%d Contacts" msgid_plural "%d Contacts"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../include/text.php:780 #: ../../include/text.php:779
msgid "poke" msgid "poke"
msgstr "" msgstr ""
#: ../../include/text.php:780 ../../include/conversation.php:210 #: ../../include/text.php:779 ../../include/conversation.php:210
msgid "poked" msgid "poked"
msgstr "" msgstr ""
#: ../../include/text.php:781 #: ../../include/text.php:780
msgid "ping" msgid "ping"
msgstr "" msgstr ""
#: ../../include/text.php:781 #: ../../include/text.php:780
msgid "pinged" msgid "pinged"
msgstr "" msgstr ""
#: ../../include/text.php:782 #: ../../include/text.php:781
msgid "prod" msgid "prod"
msgstr "" msgstr ""
#: ../../include/text.php:782 #: ../../include/text.php:781
msgid "prodded" msgid "prodded"
msgstr "" msgstr ""
#: ../../include/text.php:783 #: ../../include/text.php:782
msgid "slap" msgid "slap"
msgstr "" msgstr ""
#: ../../include/text.php:783 #: ../../include/text.php:782
msgid "slapped" msgid "slapped"
msgstr "" msgstr ""
#: ../../include/text.php:784 #: ../../include/text.php:783
msgid "finger" msgid "finger"
msgstr "" msgstr ""
#: ../../include/text.php:784 #: ../../include/text.php:783
msgid "fingered" msgid "fingered"
msgstr "" msgstr ""
#: ../../include/text.php:785 #: ../../include/text.php:784
msgid "rebuff" msgid "rebuff"
msgstr "" msgstr ""
#: ../../include/text.php:785 #: ../../include/text.php:784
msgid "rebuffed" msgid "rebuffed"
msgstr "" msgstr ""
#: ../../include/text.php:797 #: ../../include/text.php:796
msgid "happy" msgid "happy"
msgstr "" msgstr ""
#: ../../include/text.php:798 #: ../../include/text.php:797
msgid "sad" msgid "sad"
msgstr "" msgstr ""
#: ../../include/text.php:799 #: ../../include/text.php:798
msgid "mellow" msgid "mellow"
msgstr "" msgstr ""
#: ../../include/text.php:800 #: ../../include/text.php:799
msgid "tired" msgid "tired"
msgstr "" msgstr ""
#: ../../include/text.php:801 #: ../../include/text.php:800
msgid "perky" msgid "perky"
msgstr "" msgstr ""
#: ../../include/text.php:802 #: ../../include/text.php:801
msgid "angry" msgid "angry"
msgstr "" msgstr ""
#: ../../include/text.php:803 #: ../../include/text.php:802
msgid "stupified" msgid "stupified"
msgstr "" msgstr ""
#: ../../include/text.php:804 #: ../../include/text.php:803
msgid "puzzled" msgid "puzzled"
msgstr "" msgstr ""
#: ../../include/text.php:805 #: ../../include/text.php:804
msgid "interested" msgid "interested"
msgstr "" msgstr ""
#: ../../include/text.php:806 #: ../../include/text.php:805
msgid "bitter" msgid "bitter"
msgstr "" msgstr ""
#: ../../include/text.php:807 #: ../../include/text.php:806
msgid "cheerful" msgid "cheerful"
msgstr "" msgstr ""
#: ../../include/text.php:808 #: ../../include/text.php:807
msgid "alive" msgid "alive"
msgstr "" msgstr ""
#: ../../include/text.php:809 #: ../../include/text.php:808
msgid "annoyed" msgid "annoyed"
msgstr "" msgstr ""
#: ../../include/text.php:810 #: ../../include/text.php:809
msgid "anxious" msgid "anxious"
msgstr "" msgstr ""
#: ../../include/text.php:811 #: ../../include/text.php:810
msgid "cranky" msgid "cranky"
msgstr "" msgstr ""
#: ../../include/text.php:812 #: ../../include/text.php:811
msgid "disturbed" msgid "disturbed"
msgstr "" msgstr ""
#: ../../include/text.php:813 #: ../../include/text.php:812
msgid "frustrated" msgid "frustrated"
msgstr "" msgstr ""
#: ../../include/text.php:814 #: ../../include/text.php:813
msgid "motivated" msgid "motivated"
msgstr "" msgstr ""
#: ../../include/text.php:815 #: ../../include/text.php:814
msgid "relaxed" msgid "relaxed"
msgstr "" msgstr ""
#: ../../include/text.php:816 #: ../../include/text.php:815
msgid "surprised" msgid "surprised"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "January" msgid "January"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "February" msgid "February"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "March" msgid "March"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "April" msgid "April"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "May" msgid "May"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "June" msgid "June"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "July" msgid "July"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "August" msgid "August"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "September" msgid "September"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "October" msgid "October"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "November" msgid "November"
msgstr "" msgstr ""
#: ../../include/text.php:980 #: ../../include/text.php:979
msgid "December" msgid "December"
msgstr "" msgstr ""
#: ../../include/text.php:1067 #: ../../include/text.php:1066
msgid "bytes" msgid "bytes"
msgstr "" msgstr ""
#: ../../include/text.php:1094 ../../include/text.php:1106 #: ../../include/text.php:1093 ../../include/text.php:1105
msgid "Click to open/close" msgid "Click to open/close"
msgstr "" msgstr ""
#: ../../include/text.php:1279 ../../include/user.php:237 #: ../../include/text.php:1278 ../../include/user.php:237
msgid "default" msgid "default"
msgstr "" msgstr ""
#: ../../include/text.php:1291 #: ../../include/text.php:1290
msgid "Select an alternate language" msgid "Select an alternate language"
msgstr "" msgstr ""
#: ../../include/text.php:1501 #: ../../include/text.php:1500
msgid "activity" msgid "activity"
msgstr "" msgstr ""
#: ../../include/text.php:1504 #: ../../include/text.php:1503
msgid "post" msgid "post"
msgstr "" msgstr ""
#: ../../include/text.php:1659 #: ../../include/text.php:1658
msgid "Item filed" msgid "Item filed"
msgstr "" msgstr ""
@ -8710,7 +8710,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:991 #: ../../include/nav.php:46 ../../boot.php:1007
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -8718,7 +8718,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1789 #: ../../include/nav.php:49 ../../boot.php:1805
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -8810,7 +8810,7 @@ msgstr ""
msgid "Delegations" msgid "Delegations"
msgstr "" msgstr ""
#: ../../include/nav.php:142 ../../boot.php:1294 #: ../../include/nav.php:142 ../../boot.php:1310
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
@ -9390,15 +9390,15 @@ msgstr ""
msgid "following" msgid "following"
msgstr "" msgstr ""
#: ../../include/items.php:3380 #: ../../include/items.php:3373
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "" msgstr ""
#: ../../include/items.php:3380 #: ../../include/items.php:3373
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""
#: ../../include/items.php:4064 #: ../../include/items.php:4057
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
@ -9638,125 +9638,125 @@ msgstr ""
msgid "This action is not available under your subscription plan." msgid "This action is not available under your subscription plan."
msgstr "" msgstr ""
#: ../../boot.php:634 #: ../../boot.php:640
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:637 #: ../../boot.php:643
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:859 #: ../../boot.php:878
#, php-format #, php-format
msgid "Update %s failed. See error logs." msgid "Update %s failed. See error logs."
msgstr "" msgstr ""
#: ../../boot.php:864 #: ../../boot.php:880
#, php-format #, php-format
msgid "Update Error at %s" msgid "Update Error at %s"
msgstr "" msgstr ""
#: ../../boot.php:966 #: ../../boot.php:982
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:994 #: ../../boot.php:1010
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:995 #: ../../boot.php:1011
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:996 #: ../../boot.php:1012
msgid "Remember me" msgid "Remember me"
msgstr "" msgstr ""
#: ../../boot.php:999 #: ../../boot.php:1015
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:1005 #: ../../boot.php:1021
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:1008 #: ../../boot.php:1024
msgid "Website Terms of Service" msgid "Website Terms of Service"
msgstr "" msgstr ""
#: ../../boot.php:1009 #: ../../boot.php:1025
msgid "terms of service" msgid "terms of service"
msgstr "" msgstr ""
#: ../../boot.php:1011 #: ../../boot.php:1027
msgid "Website Privacy Policy" msgid "Website Privacy Policy"
msgstr "" msgstr ""
#: ../../boot.php:1012 #: ../../boot.php:1028
msgid "privacy policy" msgid "privacy policy"
msgstr "" msgstr ""
#: ../../boot.php:1141 #: ../../boot.php:1157
msgid "Requested account is not available." msgid "Requested account is not available."
msgstr "" msgstr ""
#: ../../boot.php:1220 #: ../../boot.php:1236
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1286 #: ../../boot.php:1302
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1294 #: ../../boot.php:1310
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
#: ../../boot.php:1417 ../../boot.php:1503 #: ../../boot.php:1433 ../../boot.php:1519
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1418 ../../boot.php:1504 #: ../../boot.php:1434 ../../boot.php:1520
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1463 ../../boot.php:1544 #: ../../boot.php:1479 ../../boot.php:1560
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1475 #: ../../boot.php:1491
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1476 #: ../../boot.php:1492
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1537 #: ../../boot.php:1553
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1555 #: ../../boot.php:1571
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1556 #: ../../boot.php:1572
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1792 #: ../../boot.php:1808
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
#: ../../boot.php:1799 #: ../../boot.php:1815
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: ../../boot.php:1816 #: ../../boot.php:1832
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
#: ../../boot.php:1823 #: ../../boot.php:1839
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "" msgstr ""