clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  missing entries on personal tab after sql text search optimise
  bug #434 - default group placement not working after accepting dfrn friend request
  fix wall_uploaded photo permissions on group post by member
  improve location change notifications
  keep private FB stuff out of personal notes
  rev update
  DE update to strings and templates

* master:
This commit is contained in:
Simon L'nu 2012-05-26 01:23:17 -04:00
parent 25547cb21f f5290a5a10
commit 040d1467f3
12 changed files with 548 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1351' ); define ( 'FRIENDICA_VERSION', '3.0.1354' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1144 ); define ( 'DB_UPDATE_VERSION', 1144 );

2
mod/dfrn_confirm.php
View File

@ -500,7 +500,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
); );
if($contact && $g && intval($g[0]['def_gid'])) { if($contact && $g && intval($g[0]['def_gid'])) {
require_once('include/group.php'); require_once('include/group.php');
group_add_member($uid,'',$contact[0]['id'],$g[0]['def_gid']); group_add_member($uid,'',$contact['id'],$g[0]['def_gid']);
} }
// Let's send our user to the contact editor in case they want to // Let's send our user to the contact editor in case they want to

4
mod/item.php
View File

@ -355,13 +355,15 @@ function item_post(&$a) {
$image_uri = substr($image_uri,0, strpos($image_uri,'-')); $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
if(! strlen($image_uri)) if(! strlen($image_uri))
continue; continue;
$srch = '<' . intval($contact_record['id']) . '>'; $srch = '<' . intval($contact_id) . '>';
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
dbesc($srch), dbesc($srch),
dbesc($image_uri), dbesc($image_uri),
intval($profile_uid) intval($profile_uid)
); );
if(! count($r)) if(! count($r))
continue; continue;

9
mod/network.php
View File

@ -414,16 +414,15 @@ function network_content(&$a, $update = 0) {
if($conv) { if($conv) {
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
$myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $myurl = str_replace('www.','',$myurl);
$diasp_url = str_replace('/profile/','/u/',$myurl); $diasp_url = str_replace('/profile/','/u/',$myurl);
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ", $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
dbesc(protect_sprintf('%s' . $myurl)), dbesc(protect_sprintf('%' . $myurl)),
dbesc(protect_sprintf('%' . $myurl . '\\]%')), dbesc(protect_sprintf('%' . $myurl . ']%')),
dbesc(protect_sprintf('%' . $diasp_url . '\\]%')) dbesc(protect_sprintf('%' . $diasp_url . ']%'))
); );
} }
if($update) { if($update) {
// only setup pagination on initial page view // only setup pagination on initial page view

6
mod/notes.php
View File

@ -80,7 +80,8 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0
AND `item`.`deleted` = 0 AND `item`.`origin` = 1
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra ", $sql_extra ",
@ -95,7 +96,8 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid` $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
and `item`.`moderated` = 0 AND `item`.`origin` = 1
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra $sql_extra

13
mod/profiles.php
View File

@ -146,7 +146,7 @@ function profiles_post(&$a) {
$value = $marital; $value = $marital;
} }
if($withchanged) { if($withchanged) {
$changes[] = '&hearts; ' . t('Romantic Partner'); $changes[] = '[color=#ff0000]&hearts;[/color] ' . t('Romantic Partner');
$value = strip_tags($with); $value = strip_tags($with);
} }
if($work != $orig[0]['work']) { if($work != $orig[0]['work']) {
@ -176,9 +176,18 @@ function profiles_post(&$a) {
$changes[] = t('Interests'); $changes[] = t('Interests');
$value = $interest; $value = $interest;
} }
if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region'] if($address != $orig[0]['address']) {
$changes[] = t('Address');
// New address not sent in notifications, potential privacy issues
// in case this leaks to unintended recipients. Yes, it's in the public
// profile but that doesn't mean we have to broadcast it to everybody.
}
if($locality != $orig[0]['locality'] || $region != $orig[0]['region']
|| $country_name != $orig[0]['country-name']) { || $country_name != $orig[0]['country-name']) {
$changes[] = t('Location'); $changes[] = t('Location');
$comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
$comma2 = (($region && $country_name) ? ', ' : '');
$value = $locality . $comma1 . $region . $comma2 . $country_name;
} }
profile_activity($changes,$value); profile_activity($changes,$value);

4
mod/wallmessage.php
View File

@ -44,7 +44,7 @@ function wallmessage_post(&$a) {
} }
// Work around doubled linefeeds in Tinymce 3.5b2 // Work around doubled linefeeds in Tinymce 3.5b2
dbg(1);
$body = str_replace("\r\n","\n",$body); $body = str_replace("\r\n","\n",$body);
$body = str_replace("\n\n","\n",$body); $body = str_replace("\n\n","\n",$body);
@ -67,7 +67,7 @@ dbg(1);
default: default:
info( t('Message sent.') . EOL ); info( t('Message sent.') . EOL );
} }
dbg(0);
// goaway($a->get_baseurl() . '/profile/' . $user['nickname']); // goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
} }

194
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1351\n" "Project-Id-Version: 3.0.1354\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-23 10:00-0700\n" "POT-Creation-Date: 2012-05-25 10:00-0700\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"
@ -37,7 +37,7 @@ msgstr ""
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920
#: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/editpost.php:10 ../../mod/install.php:151
#: ../../mod/notifications.php:66 ../../mod/contacts.php:125 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125
#: ../../mod/settings.php:104 ../../mod/settings.php:535 #: ../../mod/settings.php:104 ../../mod/settings.php:535
#: ../../mod/settings.php:540 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/settings.php:540 ../../mod/manage.php:86 ../../mod/network.php:6
@ -125,7 +125,7 @@ msgstr ""
#: ../../mod/events.php:428 ../../mod/photos.php:955 ../../mod/photos.php:1013 #: ../../mod/events.php:428 ../../mod/photos.php:955 ../../mod/photos.php:1013
#: ../../mod/photos.php:1256 ../../mod/photos.php:1296 #: ../../mod/photos.php:1256 ../../mod/photos.php:1296
#: ../../mod/photos.php:1336 ../../mod/photos.php:1367 #: ../../mod/photos.php:1336 ../../mod/photos.php:1367
#: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/install.php:245 ../../mod/install.php:283
#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322
#: ../../mod/settings.php:553 ../../mod/settings.php:699 #: ../../mod/settings.php:553 ../../mod/settings.php:699
#: ../../mod/settings.php:760 ../../mod/settings.php:964 #: ../../mod/settings.php:760 ../../mod/settings.php:964
@ -233,7 +233,7 @@ msgstr ""
msgid "Previous" msgid "Previous"
msgstr "" msgstr ""
#: ../../mod/events.php:327 ../../mod/install.php:210 #: ../../mod/events.php:327 ../../mod/install.php:204
msgid "Next" msgid "Next"
msgstr "" msgstr ""
@ -881,20 +881,15 @@ msgstr ""
msgid "Submit Request" msgid "Submit Request"
msgstr "" msgstr ""
#: ../../mod/install.php:111 #: ../../mod/install.php:117
msgid "Friendica Social Communications Server - Setup" msgid "Friendica Social Communications Server - Setup"
msgstr "" msgstr ""
#: ../../mod/install.php:117 ../../mod/install.php:157 #: ../../mod/install.php:123
#: ../../mod/install.php:230
msgid "Database connection"
msgstr ""
#: ../../mod/install.php:124
msgid "Could not connect to database." msgid "Could not connect to database."
msgstr "" msgstr ""
#: ../../mod/install.php:128 #: ../../mod/install.php:127
msgid "Could not create table." msgid "Could not create table."
msgstr "" msgstr ""
@ -902,229 +897,243 @@ msgstr ""
msgid "Your Friendica site database has been installed." msgid "Your Friendica site database has been installed."
msgstr "" msgstr ""
#: ../../mod/install.php:134 #: ../../mod/install.php:138
msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr ""
#: ../../mod/install.php:135 ../../mod/install.php:151
#: ../../mod/install.php:209
msgid "Please see the file \"INSTALL.txt\"."
msgstr ""
#: ../../mod/install.php:137
msgid "Proceed to registration"
msgstr ""
#: ../../mod/install.php:143
msgid "Proceed with Installation"
msgstr ""
#: ../../mod/install.php:150
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:158 #: ../../mod/install.php:139 ../../mod/install.php:203
msgid "Database import failed." #: ../../mod/install.php:482
msgid "Please see the file \"INSTALL.txt\"."
msgstr "" msgstr ""
#: ../../mod/install.php:206 #: ../../mod/install.php:200
msgid "System check" msgid "System check"
msgstr "" msgstr ""
#: ../../mod/install.php:211 #: ../../mod/install.php:205
msgid "Check again" msgid "Check again"
msgstr "" msgstr ""
#: ../../mod/install.php:231 #: ../../mod/install.php:224
msgid "Database connection"
msgstr ""
#: ../../mod/install.php:225
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:232 #: ../../mod/install.php:226
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:233 #: ../../mod/install.php:227
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:237 #: ../../mod/install.php:231
msgid "Database Server Name" msgid "Database Server Name"
msgstr "" msgstr ""
#: ../../mod/install.php:238 #: ../../mod/install.php:232
msgid "Database Login Name" msgid "Database Login Name"
msgstr "" msgstr ""
#: ../../mod/install.php:239 #: ../../mod/install.php:233
msgid "Database Login Password" msgid "Database Login Password"
msgstr "" msgstr ""
#: ../../mod/install.php:240 #: ../../mod/install.php:234
msgid "Database Name" msgid "Database Name"
msgstr "" msgstr ""
#: ../../mod/install.php:241 ../../mod/install.php:280 #: ../../mod/install.php:235 ../../mod/install.php:274
msgid "Site administrator email address" msgid "Site administrator email address"
msgstr "" msgstr ""
#: ../../mod/install.php:241 ../../mod/install.php:280 #: ../../mod/install.php:235 ../../mod/install.php:274
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:245 ../../mod/install.php:283 #: ../../mod/install.php:239 ../../mod/install.php:277
msgid "Please select a default timezone for your website" msgid "Please select a default timezone for your website"
msgstr "" msgstr ""
#: ../../mod/install.php:270 #: ../../mod/install.php:264
msgid "Site settings" msgid "Site settings"
msgstr "" msgstr ""
#: ../../mod/install.php:323 #: ../../mod/install.php:317
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:326 #: ../../mod/install.php:318
msgid ""
"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://"
"friendica.com/node/27'>'Activating scheduled tasks'</a>"
msgstr ""
#: ../../mod/install.php:322
msgid "PHP executable path" msgid "PHP executable path"
msgstr "" msgstr ""
#: ../../mod/install.php:326 #: ../../mod/install.php:322
msgid "Enter full path to php executable" msgid ""
"Enter full path to php executable. You can leave this blank to continue the "
"installation."
msgstr "" msgstr ""
#: ../../mod/install.php:331 #: ../../mod/install.php:327
msgid "Command line PHP" msgid "Command line PHP"
msgstr "" msgstr ""
#: ../../mod/install.php:340 #: ../../mod/install.php:336
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:341 #: ../../mod/install.php:337
msgid "This is required for message delivery to work." msgid "This is required for message delivery to work."
msgstr "" msgstr ""
#: ../../mod/install.php:343 #: ../../mod/install.php:339
msgid "PHP register_argc_argv" msgid "PHP register_argc_argv"
msgstr "" msgstr ""
#: ../../mod/install.php:364 #: ../../mod/install.php:360
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:365 #: ../../mod/install.php:361
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:367 #: ../../mod/install.php:363
msgid "Generate encryption keys" msgid "Generate encryption keys"
msgstr "" msgstr ""
#: ../../mod/install.php:374 #: ../../mod/install.php:370
msgid "libCurl PHP module" msgid "libCurl PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:375 #: ../../mod/install.php:371
msgid "GD graphics PHP module" msgid "GD graphics PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:376 #: ../../mod/install.php:372
msgid "OpenSSL PHP module" msgid "OpenSSL PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:377 #: ../../mod/install.php:373
msgid "mysqli PHP module" msgid "mysqli PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:378 #: ../../mod/install.php:374
msgid "mb_string PHP module" msgid "mb_string PHP module"
msgstr "" msgstr ""
#: ../../mod/install.php:383 ../../mod/install.php:385 #: ../../mod/install.php:379 ../../mod/install.php:381
msgid "Apache mod_rewrite module" msgid "Apache mod_rewrite module"
msgstr "" msgstr ""
#: ../../mod/install.php:383 #: ../../mod/install.php:379
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:390 #: ../../mod/install.php:386
msgid "Error: libCURL PHP module required but not installed." msgid "Error: libCURL PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:394 #: ../../mod/install.php:390
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:398 #: ../../mod/install.php:394
msgid "Error: openssl PHP module required but not installed." msgid "Error: openssl PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:402 #: ../../mod/install.php:398
msgid "Error: mysqli PHP module required but not installed." msgid "Error: mysqli PHP module required but not installed."
msgstr "" msgstr ""
#: ../../mod/install.php:406 #: ../../mod/install.php:402
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:423 #: ../../mod/install.php:419
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:424 #: ../../mod/install.php:420
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:421
msgid ""
"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."
msgstr ""
#: ../../mod/install.php:422
msgid ""
"You can alternatively skip this procedure and perform a manual installation. "
"Please see the file \"INSTALL.txt\" for instructions."
msgstr ""
#: ../../mod/install.php:425 #: ../../mod/install.php:425
msgid ""
"Please check with your site documentation or support people to see if this "
"situation can be corrected."
msgstr ""
#: ../../mod/install.php:426
msgid ""
"If not, you may be required to perform a manual installation. Please see the "
"file \"INSTALL.txt\" for instructions."
msgstr ""
#: ../../mod/install.php:429
msgid ".htconfig.php is writable" msgid ".htconfig.php is writable"
msgstr "" msgstr ""
#: ../../mod/install.php:436 #: ../../mod/install.php:436
msgid "" msgid ""
"Url rewrite in .htconfig is not working. Check your server configuration."
msgstr ""
#: ../../mod/install.php:438
msgid "Url rewrite is working"
msgstr ""
#: ../../mod/install.php:444
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:461 #: ../../mod/install.php:469
msgid "Errors encountered creating database tables." msgid "Errors encountered creating database tables."
msgstr "" msgstr ""
#: ../../mod/install.php:480
msgid "<h1>What next</h1>"
msgstr ""
#: ../../mod/install.php:481
msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr ""
#: ../../mod/localtime.php:12 ../../include/event.php:11 #: ../../mod/localtime.php:12 ../../include/event.php:11
#: ../../include/bb2diaspora.php:238 #: ../../include/bb2diaspora.php:238
msgid "l F d, Y \\@ g:i A" msgid "l F d, Y \\@ g:i A"
@ -2381,7 +2390,7 @@ msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:756 #: ../../addon/facebook/facebook.php:756
#: ../../addon/privacy_image_cache/privacy_image_cache.php:148 #: ../../addon/privacy_image_cache/privacy_image_cache.php:150
#: ../../include/text.php:652 #: ../../include/text.php:652
msgid "Save" msgid "Save"
msgstr "" msgstr ""
@ -3774,7 +3783,8 @@ msgstr ""
msgid "No installed applications." msgid "No installed applications."
msgstr "" msgstr ""
#: ../../mod/search.php:83 ../../include/text.php:650 ../../include/nav.php:91 #: ../../mod/search.php:83 ../../include/text.php:649
#: ../../include/text.php:650 ../../include/nav.php:91
msgid "Search" msgid "Search"
msgstr "" msgstr ""
@ -4518,23 +4528,23 @@ msgid ""
"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:145 #: ../../addon/privacy_image_cache/privacy_image_cache.php:147
msgid "Lifetime of the cache (in hours)" msgid "Lifetime of the cache (in hours)"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:150 #: ../../addon/privacy_image_cache/privacy_image_cache.php:152
msgid "Cache Statistics" msgid "Cache Statistics"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:153 #: ../../addon/privacy_image_cache/privacy_image_cache.php:155
msgid "Number of items" msgid "Number of items"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:155 #: ../../addon/privacy_image_cache/privacy_image_cache.php:157
msgid "Size of the cache" msgid "Size of the cache"
msgstr "" msgstr ""
#: ../../addon/privacy_image_cache/privacy_image_cache.php:157 #: ../../addon/privacy_image_cache/privacy_image_cache.php:159
msgid "Delete the whole cache" msgid "Delete the whole cache"
msgstr "" msgstr ""

8
view/de/friend_complete_eml.tpl
View File

@ -4,15 +4,15 @@ Hallo $[username],
Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat
deine Kontaktanfrage auf '$[sitename]' bestätigt. deine Kontaktanfrage auf '$[sitename]' bestätigt.
Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
ohne einschränkungen austauschen. ohne Einschränkungen austauschen.
Rufe deine 'Kontakte' Seite auf $[sitename] auf wenn du Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du
Änderungen an diesem Kontakt vornehmen willst. Änderungen an diesem Kontakt vornehmen willst.
$[siteurl] $[siteurl]
[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthällt [Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält,
die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben]. die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
Beste Grüße, Beste Grüße,

798
view/de/messages.po
View File

File diff suppressed because it is too large Load Diff

10
view/de/register_open_eml.tpl
View File

@ -11,18 +11,18 @@ Passwort: $[password]
Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern,
nachdem du dich erstmalig eingeloggt hast. nachdem du dich erstmalig eingeloggt hast.
Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen.
Eventuell möchtest du außerdem einige grundlegenden Informationen in deinem Standart-Profil (auf der "Profile" Seite) eintragen, Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen,
damit andere Leute dich einfacher finden können. damit andere Leute dich einfacher finden können.
Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Bild hochzuladen, Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen,
sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und
vielleicht auch in welchen Land Du lebst; falls du nicht konkreter vielleicht auch in welchen Land du lebst; falls du nicht konkreter
werden möchtest. werden möchtest.
Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig.
Wenn Du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen
ein paar neue und interessante Freunde zu finden. ein paar neue und interessante Freunde zu finden.

2
view/theme/slackr/events_reminder.tpl
View File

@ -26,7 +26,7 @@
center: '', center: '',
right: '' right: ''
}, },
timeFormat: 'H(:mm)', timeFormat: 'HH(:mm)',
defaultView: 'basicWeek', defaultView: 'basicWeek',
height: 50, height: 50,
eventClick: function(calEvent, jsEvent, view) { eventClick: function(calEvent, jsEvent, view) {