friendica/friendica
6
2
Fork 1
mirror of https://github.com/friendica/friendica synced 2026-01-22 01:18:40 +01:00
Code Issues Projects Releases 3 Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
fabrixxm 2016-09-13 17:19:57 +02:00
commit 3d6e3cbb78
59 changed files with 11590 additions and 10998 deletions
Download patch file Download diff file Expand all files Collapse all files

60
CHANGELOG
View file

@ -1,3 +1,63 @@
Version 3.5
Friendica Core:
NEW Optional local directory with possible federated contacts [heluecht]
NEW Autocompletion for @-mentions and BBCode tags [rabuzarus]
NEW Added a composer derived autoloader which allows composer autoloaders in addons/libraries [fabrixxm]
NEW theme: frio [rabuzarus, heluecht, fabrixxm]
Enhance .htaccess file (nerdoc, dissolve)
Updates to the translations (DE, ES, IS, IT, RU) [translation teams]
Updates to the documentation [tobiasd, heluecht, mexcon, silke, rabuzarus, fabrixxm, Olivier Mehani, gerhard6380, ben utzer]
Extended the BBCode by [abstract] tag used for bridged postings to networks with limited character length [heluecht]
Code cleanup [heluecht, QuixOr]
Improvements to the API and Friendica specific extensions [heluecht, fabrixxm, gerhard6380]
Improvements to the RSS/Atom feed import [mexcon]
Improvements to the communication with federated networks (Diaspora, Hubzilla, OStatus) [heluecht]
Improvements on the themes (quattro, vier, frost) [rabuzarus, fabrixxm, stieben, heluecht, Quix0r, tobiasd]
Improvements to the ACL dialog [fabrixxm, rabuzarus]
Improvements to the database structure and optimization of queries [heluecht]
Improvements to the UI (contacts, hotkeys, remember me, ARIA, code hightlighting) [rabuzarus, heluecht, tobiasd]
Improvements to the background process (poller, worker) [heluecht]
Improvements to the admin panel [tobiasd, heluecht, fabrixxm]
Improvements to the performance [heluecht]
Improvements to the installation wizzard (language selection, RINO version, check required PHP modules, default theme is now vier) [tobiasd]
Improvements to the relocation of nodes and accounts [heluecht]
Improvements to the DDoS detection [heluecht]
Improvements to the calendar/events module [heluecht, rabuzarus]
Improvements to OpenID login [strk]
Improvements to the ShaShape font [andi]
Reworked the implementation of the DFRN, Diaspora protocols [heluecht]
Reworked the notifications code [fabrixxm, rabuzarus, heluecht]
Reworked the p/config code [fabrixxm, rabuzarus]
Reworked XML generation [heluecht]
Removed now unused simplepie from library [heluecht]
Friendica Addons
Updated to the translations (DE, ES, IS, NL, PT BR), [translation teams]
Piwik [tobiasd]
Twitter Connector [heluecht]
Pumpio Connector [heluecht]
Rendertime [heluecht]
wppost [heluecht]
showmore [rabuzarus]
fromgplus [heluecht]
app.net Connector [heluecht]
GNU Social Connector [heluecht]
LDAP [Olivier Mehani]
smileybutton [rabuzarus]
retriver [mexon]
mailstream [mexon]
forumdirectory [tobiasd]
NEW notifyall (port from Hubzilla) [rabuzarus, tobiasd]
DEPRECATED cal (now in core), FB Connector, FB Post Connector, FB Sync
Closed Issues
683, 786, 796, 922, 1261, 1576, 1701, 1769, 1970, 1145, 1494,
1728, 1877, 2063, 2059, 2078, 2079, 2133, 2165, 2194, 2229, 2230,
2241, 2254, 2242, 2270, 2277, 2339, 2320, 2345, 2352, 2358, 2367,
2373, 2376, 2378, 2385, 2395, 2402, 2406, 2433, 2472, 2485, 2492,
2506, 2512, 2516, 2539, 2540, 2893, 2597, 2611, 2617, 2629, 2645,
2687, 2716, 2757, 2764
Version 3.4.3
What's new for the users:
Updates to the documentation (silke, tobiasd, annando, rebeka-catalina)

5
INSTALL.txt
View file

@ -32,8 +32,7 @@ link if your cert is self-signed).
- Apache with mod-rewrite enabled and "Options All" so you can use a
local .htaccess file
- PHP 5.2+. The later the better. PHP 5.3 is required for communications
with the Diaspora network and improved security.
- PHP 5.4+.
- PHP *command line* access with register_argc_argv set to true in the
php.ini file [or see 'poormancron' in section 8]
@ -42,7 +41,7 @@ php.ini file [or see 'poormancron' in section 8]
- some form of email server or email gateway such that PHP mail() works
- Mysql 5.x
- Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
- ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks
(Windows) [Note: other options are presented in Section 8 of this document]

72
boot.php
View file

@ -36,9 +36,9 @@ require_once('include/dbstructure.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_CODENAME', 'Asparagus');
define ( 'FRIENDICA_VERSION', '3.5-dev' );
define ( 'FRIENDICA_VERSION', '3.5' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1200 );
define ( 'DB_UPDATE_VERSION', 1202 );
/**
* @brief Constant with a HTML line break.
@ -392,11 +392,12 @@ define ( 'GRAVITY_COMMENT', 6);
* Process priority for the worker
* @{
*/
define('PRIORITY_UNDEFINED', 0);
define('PRIORITY_SYSTEM', 10);
define('PRIORITY_HIGH', 20);
define('PRIORITY_MEDIUM', 30);
define('PRIORITY_LOW', 40);
define('PRIORITY_UNDEFINED', 0);
define('PRIORITY_CRITICAL', 10);
define('PRIORITY_HIGH', 20);
define('PRIORITY_MEDIUM', 30);
define('PRIORITY_LOW', 40);
define('PRIORITY_NEGLIGIBLE',50);
/* @}*/
@ -1098,6 +1099,42 @@ class App {
}
/**
* @brief Log active processes into the "process" table
*/
function start_process() {
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
$command = basename($trace[0]["file"]);
$this->remove_inactive_processes();
$r = q("SELECT `pid` FROM `process` WHERE `pid` = %d", intval(getmypid()));
if(!dbm::is_result($r))
q("INSERT INTO `process` (`pid`,`command`,`created`) VALUES (%d, '%s', '%s')",
intval(getmypid()),
dbesc($command),
dbesc(datetime_convert()));
}
/**
* @brief Remove inactive processes
*/
function remove_inactive_processes() {
$r = q("SELECT `pid` FROM `process`");
if(dbm::is_result($r))
foreach ($r AS $process)
if (!posix_kill($process["pid"], 0))
q("DELETE FROM `process` WHERE `pid` = %d", intval($process["pid"]));
}
/**
* @brief Remove the active process from the "process" table
*/
function end_process() {
q("DELETE FROM `process` WHERE `pid` = %d", intval(getmypid()));
}
/**
* @brief Returns a string with a callstack. Can be used for logging.
*
@ -1266,8 +1303,20 @@ class App {
function proc_run($args) {
// Add the php path if it is a php call
if (count($args) && ($args[0] === 'php' OR is_int($args[0])))
if (count($args) && ($args[0] === 'php' OR is_int($args[0]))) {
// If the last worker fork was less than 10 seconds before then don't fork another one.
// This should prevent the forking of masses of workers.
if (get_config("system", "worker")) {
if ((time() - get_config("system", "proc_run_started")) < 10)
return;
// Set the timestamp of the last proc_run
set_config("system", "proc_run_started", time());
}
$args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php');
}
// add baseurl to args. cli scripts can't construct it
$args[] = $this->get_baseurl();
@ -1398,7 +1447,7 @@ function check_db() {
$build = DB_UPDATE_VERSION;
}
if($build != DB_UPDATE_VERSION)
proc_run(PRIORITY_SYSTEM, 'include/dbupdate.php');
proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php');
}
@ -1686,7 +1735,10 @@ function login($register = false, $hiddens=false) {
* @brief Used to end the current process, after saving session state.
*/
function killme() {
session_write_close();
if (!get_app()->is_backend())
session_write_close();
exit;
}

310
database.sql
View file

@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `addon` (
`timestamp` bigint(20) NOT NULL DEFAULT 0,
`plugin_admin` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE attach
@ -31,12 +31,12 @@ CREATE TABLE IF NOT EXISTS `attach` (
`data` longblob NOT NULL,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,
`deny_gid` mediumtext NOT NULL,
`allow_cid` mediumtext,
`allow_gid` mediumtext,
`deny_cid` mediumtext,
`deny_gid` mediumtext,
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE auth_codes
@ -48,19 +48,19 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
`expires` int(11) NOT NULL DEFAULT 0,
`scope` varchar(250) NOT NULL DEFAULT '',
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE cache
--
CREATE TABLE IF NOT EXISTS `cache` (
`k` varchar(255) NOT NULL,
`v` text NOT NULL,
`v` text,
`expire_mode` int(11) NOT NULL DEFAULT 0,
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`k`),
INDEX `updated` (`updated`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE challenge
@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `challenge` (
`type` varchar(255) NOT NULL DEFAULT '',
`last_update` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE clients
@ -86,7 +86,7 @@ CREATE TABLE IF NOT EXISTS `clients` (
`icon` text,
`uid` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY(`client_id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE config
@ -95,10 +95,10 @@ CREATE TABLE IF NOT EXISTS `config` (
`id` int(10) unsigned NOT NULL auto_increment,
`cat` varchar(255) NOT NULL DEFAULT '',
`k` varchar(255) NOT NULL DEFAULT '',
`v` text NOT NULL,
`v` text,
PRIMARY KEY(`id`),
INDEX `cat_k` (`cat`(30),`k`(30))
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE contact
@ -115,29 +115,29 @@ CREATE TABLE IF NOT EXISTS `contact` (
`name` varchar(255) NOT NULL DEFAULT '',
`nick` varchar(255) NOT NULL DEFAULT '',
`location` varchar(255) NOT NULL DEFAULT '',
`about` text NOT NULL,
`keywords` text NOT NULL,
`about` text,
`keywords` text,
`gender` varchar(32) NOT NULL DEFAULT '',
`attag` varchar(255) NOT NULL DEFAULT '',
`avatar` varchar(255) NOT NULL DEFAULT '',
`photo` text NOT NULL,
`thumb` text NOT NULL,
`micro` text NOT NULL,
`site-pubkey` text NOT NULL,
`photo` text,
`thumb` text,
`micro` text,
`site-pubkey` text,
`issued-id` varchar(255) NOT NULL DEFAULT '',
`dfrn-id` varchar(255) NOT NULL DEFAULT '',
`url` varchar(255) NOT NULL DEFAULT '',
`nurl` varchar(255) NOT NULL DEFAULT '',
`addr` varchar(255) NOT NULL DEFAULT '',
`alias` varchar(255) NOT NULL DEFAULT '',
`pubkey` text NOT NULL,
`prvkey` text NOT NULL,
`pubkey` text,
`prvkey` text,
`batch` varchar(255) NOT NULL DEFAULT '',
`request` text NOT NULL,
`notify` text NOT NULL,
`poll` text NOT NULL,
`confirm` text NOT NULL,
`poco` text NOT NULL,
`request` text,
`notify` text,
`poll` text,
`confirm` text,
`poco` text,
`aes_allow` tinyint(1) NOT NULL DEFAULT 0,
`ret-aes` tinyint(1) NOT NULL DEFAULT 0,
`usehub` tinyint(1) NOT NULL DEFAULT 0,
@ -161,19 +161,19 @@ CREATE TABLE IF NOT EXISTS `contact` (
`archive` tinyint(1) NOT NULL DEFAULT 0,
`pending` tinyint(1) NOT NULL DEFAULT 1,
`rating` tinyint(1) NOT NULL DEFAULT 0,
`reason` text NOT NULL,
`reason` text,
`closeness` tinyint(2) NOT NULL DEFAULT 99,
`info` mediumtext NOT NULL,
`info` mediumtext,
`profile-id` int(11) NOT NULL DEFAULT 0,
`bdyear` varchar(4) NOT NULL DEFAULT '',
`bd` date NOT NULL DEFAULT '0000-00-00',
`notify_new_posts` tinyint(1) NOT NULL DEFAULT 0,
`fetch_further_information` tinyint(1) NOT NULL DEFAULT 0,
`ffi_keyword_blacklist` mediumtext NOT NULL,
`ffi_keyword_blacklist` mediumtext,
PRIMARY KEY(`id`),
INDEX `uid` (`uid`),
INDEX `nurl` (`nurl`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE conv
@ -181,15 +181,15 @@ CREATE TABLE IF NOT EXISTS `contact` (
CREATE TABLE IF NOT EXISTS `conv` (
`id` int(10) unsigned NOT NULL auto_increment,
`guid` varchar(64) NOT NULL DEFAULT '',
`recips` mediumtext NOT NULL,
`recips` mediumtext,
`uid` int(11) NOT NULL DEFAULT 0,
`creator` varchar(255) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`subject` mediumtext NOT NULL,
`subject` mediumtext,
PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE deliverq
@ -200,7 +200,7 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
`item` int(11) NOT NULL DEFAULT 0,
`contact` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE event
@ -214,20 +214,20 @@ CREATE TABLE IF NOT EXISTS `event` (
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`summary` text NOT NULL,
`desc` text NOT NULL,
`location` text NOT NULL,
`summary` text,
`desc` text,
`location` text,
`type` varchar(255) NOT NULL DEFAULT '',
`nofinish` tinyint(1) NOT NULL DEFAULT 0,
`adjust` tinyint(1) NOT NULL DEFAULT 1,
`ignore` tinyint(1) unsigned NOT NULL DEFAULT 0,
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,
`deny_gid` mediumtext NOT NULL,
`allow_cid` mediumtext,
`allow_gid` mediumtext,
`deny_cid` mediumtext,
`deny_gid` mediumtext,
PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE fcontact
@ -248,11 +248,11 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
`priority` tinyint(1) NOT NULL DEFAULT 0,
`network` varchar(32) NOT NULL DEFAULT '',
`alias` varchar(255) NOT NULL DEFAULT '',
`pubkey` text NOT NULL,
`pubkey` text,
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`),
INDEX `addr` (`addr`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE ffinder
@ -263,7 +263,7 @@ CREATE TABLE IF NOT EXISTS `ffinder` (
`cid` int(10) unsigned NOT NULL DEFAULT 0,
`fid` int(10) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE fserver
@ -272,10 +272,10 @@ CREATE TABLE IF NOT EXISTS `fserver` (
`id` int(11) NOT NULL auto_increment,
`server` varchar(255) NOT NULL DEFAULT '',
`posturl` varchar(255) NOT NULL DEFAULT '',
`key` text NOT NULL,
`key` text,
PRIMARY KEY(`id`),
INDEX `server` (`server`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE fsuggest
@ -288,10 +288,10 @@ CREATE TABLE IF NOT EXISTS `fsuggest` (
`url` varchar(255) NOT NULL DEFAULT '',
`request` varchar(255) NOT NULL DEFAULT '',
`photo` varchar(255) NOT NULL DEFAULT '',
`note` text NOT NULL,
`note` text,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE gcign
@ -303,7 +303,7 @@ CREATE TABLE IF NOT EXISTS `gcign` (
PRIMARY KEY(`id`),
INDEX `uid` (`uid`),
INDEX `gcid` (`gcid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE gcontact
@ -321,8 +321,8 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
`last_contact` datetime DEFAULT '0000-00-00 00:00:00',
`last_failure` datetime DEFAULT '0000-00-00 00:00:00',
`location` varchar(255) NOT NULL DEFAULT '',
`about` text NOT NULL,
`keywords` text NOT NULL,
`about` text,
`keywords` text,
`gender` varchar(32) NOT NULL DEFAULT '',
`birthday` varchar(32) NOT NULL DEFAULT '0000-00-00',
`community` tinyint(1) NOT NULL DEFAULT 0,
@ -330,7 +330,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
`nsfw` tinyint(1) NOT NULL DEFAULT 0,
`network` varchar(255) NOT NULL DEFAULT '',
`addr` varchar(255) NOT NULL DEFAULT '',
`notify` text NOT NULL,
`notify` text,
`alias` varchar(255) NOT NULL DEFAULT '',
`generation` tinyint(3) NOT NULL DEFAULT 0,
`server_url` varchar(255) NOT NULL DEFAULT '',
@ -340,7 +340,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
INDEX `nick` (`nick`),
INDEX `addr` (`addr`),
INDEX `updated` (`updated`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE glink
@ -356,7 +356,7 @@ CREATE TABLE IF NOT EXISTS `glink` (
INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`),
INDEX `gcid` (`gcid`),
INDEX `zcid` (`zcid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE group
@ -369,7 +369,7 @@ CREATE TABLE IF NOT EXISTS `group` (
`name` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE group_member
@ -381,7 +381,7 @@ CREATE TABLE IF NOT EXISTS `group_member` (
`contact-id` int(10) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
INDEX `uid_gid_contactid` (`uid`,`gid`,`contact-id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE gserver
@ -392,7 +392,7 @@ CREATE TABLE IF NOT EXISTS `gserver` (
`nurl` varchar(255) NOT NULL DEFAULT '',
`version` varchar(255) NOT NULL DEFAULT '',
`site_name` varchar(255) NOT NULL DEFAULT '',
`info` text NOT NULL,
`info` text,
`register_policy` tinyint(1) NOT NULL DEFAULT 0,
`poco` varchar(255) NOT NULL DEFAULT '',
`noscrape` varchar(255) NOT NULL DEFAULT '',
@ -404,7 +404,7 @@ CREATE TABLE IF NOT EXISTS `gserver` (
`last_failure` datetime DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`),
INDEX `nurl` (`nurl`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE hook
@ -417,7 +417,7 @@ CREATE TABLE IF NOT EXISTS `hook` (
`priority` int(11) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
INDEX `hook_file_function` (`hook`(30),`file`(60),`function`(30))
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE intro
@ -429,13 +429,13 @@ CREATE TABLE IF NOT EXISTS `intro` (
`contact-id` int(11) NOT NULL DEFAULT 0,
`knowyou` tinyint(1) NOT NULL DEFAULT 0,
`duplex` tinyint(1) NOT NULL DEFAULT 0,
`note` text NOT NULL,
`note` text,
`hash` varchar(255) NOT NULL DEFAULT '',
`datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`blocked` tinyint(1) NOT NULL DEFAULT 1,
`ignore` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE item
@ -468,27 +468,27 @@ CREATE TABLE IF NOT EXISTS `item` (
`author-link` varchar(255) NOT NULL DEFAULT '',
`author-avatar` varchar(255) NOT NULL DEFAULT '',
`title` varchar(255) NOT NULL DEFAULT '',
`body` mediumtext NOT NULL,
`body` mediumtext,
`app` varchar(255) NOT NULL DEFAULT '',
`verb` varchar(255) NOT NULL DEFAULT '',
`object-type` varchar(255) NOT NULL DEFAULT '',
`object` text NOT NULL,
`object` text,
`target-type` varchar(255) NOT NULL DEFAULT '',
`target` text NOT NULL,
`postopts` text NOT NULL,
`target` text,
`postopts` text,
`plink` varchar(255) NOT NULL DEFAULT '',
`resource-id` varchar(255) NOT NULL DEFAULT '',
`event-id` int(11) NOT NULL DEFAULT 0,
`tag` mediumtext NOT NULL,
`attach` mediumtext NOT NULL,
`inform` mediumtext NOT NULL,
`file` mediumtext NOT NULL,
`tag` mediumtext,
`attach` mediumtext,
`inform` mediumtext,
`file` mediumtext,
`location` varchar(255) NOT NULL DEFAULT '',
`coord` varchar(255) NOT NULL DEFAULT '',
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,
`deny_gid` mediumtext NOT NULL,
`allow_cid` mediumtext,
`allow_gid` mediumtext,
`deny_cid` mediumtext,
`deny_gid` mediumtext,
`private` tinyint(1) NOT NULL DEFAULT 0,
`pubmail` tinyint(1) NOT NULL DEFAULT 0,
`moderated` tinyint(1) NOT NULL DEFAULT 0,
@ -504,7 +504,7 @@ CREATE TABLE IF NOT EXISTS `item` (
`mention` tinyint(1) NOT NULL DEFAULT 0,
`network` varchar(32) NOT NULL DEFAULT '',
`rendered-hash` varchar(32) NOT NULL DEFAULT '',
`rendered-html` mediumtext NOT NULL,
`rendered-html` mediumtext,
`global` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
INDEX `guid` (`guid`),
@ -543,7 +543,7 @@ CREATE TABLE IF NOT EXISTS `item` (
INDEX `uid_eventid` (`uid`,`event-id`),
INDEX `uid_authorlink` (`uid`,`author-link`),
INDEX `uid_ownerlink` (`uid`,`owner-link`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE item_id
@ -559,7 +559,7 @@ CREATE TABLE IF NOT EXISTS `item_id` (
INDEX `sid` (`sid`),
INDEX `service` (`service`),
INDEX `iid` (`iid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE locks
@ -570,7 +570,7 @@ CREATE TABLE IF NOT EXISTS `locks` (
`locked` tinyint(1) NOT NULL DEFAULT 0,
`created` datetime DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE mail
@ -585,7 +585,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
`contact-id` varchar(255) NOT NULL DEFAULT '',
`convid` int(11) unsigned NOT NULL DEFAULT 0,
`title` varchar(255) NOT NULL DEFAULT '',
`body` mediumtext NOT NULL,
`body` mediumtext,
`seen` tinyint(1) NOT NULL DEFAULT 0,
`reply` tinyint(1) NOT NULL DEFAULT 0,
`replied` tinyint(1) NOT NULL DEFAULT 0,
@ -600,7 +600,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
INDEX `reply` (`reply`),
INDEX `uri` (`uri`),
INDEX `parent-uri` (`parent-uri`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE mailacct
@ -613,14 +613,14 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
`ssltype` varchar(16) NOT NULL DEFAULT '',
`mailbox` varchar(255) NOT NULL DEFAULT '',
`user` varchar(255) NOT NULL DEFAULT '',
`pass` text NOT NULL,
`pass` text,
`reply_to` varchar(255) NOT NULL DEFAULT '',
`action` int(11) NOT NULL DEFAULT 0,
`movetofolder` varchar(255) NOT NULL DEFAULT '',
`pubmail` tinyint(1) NOT NULL DEFAULT 0,
`last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE manage
@ -631,7 +631,7 @@ CREATE TABLE IF NOT EXISTS `manage` (
`mid` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
INDEX `uid_mid` (`uid`,`mid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE notify
@ -644,7 +644,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
`url` varchar(255) NOT NULL DEFAULT '',
`photo` varchar(255) NOT NULL DEFAULT '',
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`msg` mediumtext NOT NULL,
`msg` mediumtext,
`uid` int(11) NOT NULL DEFAULT 0,
`link` varchar(255) NOT NULL DEFAULT '',
`iid` int(11) NOT NULL DEFAULT 0,
@ -654,7 +654,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
`otype` varchar(16) NOT NULL DEFAULT '',
PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE notify-threads
@ -668,18 +668,18 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
PRIMARY KEY(`id`),
INDEX `master-parent-item` (`master-parent-item`),
INDEX `receiver-uid` (`receiver-uid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE oembed
--
CREATE TABLE IF NOT EXISTS `oembed` (
`url` varchar(255) NOT NULL,
`content` text NOT NULL,
`content` text,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`url`),
INDEX `created` (`created`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE parsed_url
@ -688,11 +688,11 @@ CREATE TABLE IF NOT EXISTS `parsed_url` (
`url` varchar(255) NOT NULL,
`guessing` tinyint(1) NOT NULL DEFAULT 0,
`oembed` tinyint(1) NOT NULL DEFAULT 0,
`content` text NOT NULL,
`content` text,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`url`,`guessing`,`oembed`),
INDEX `created` (`created`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE pconfig
@ -702,10 +702,10 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
`uid` int(11) NOT NULL DEFAULT 0,
`cat` varchar(255) NOT NULL DEFAULT '',
`k` varchar(255) NOT NULL DEFAULT '',
`v` mediumtext NOT NULL,
`v` mediumtext,
PRIMARY KEY(`id`),
INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30))
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE photo
@ -719,7 +719,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`title` varchar(255) NOT NULL DEFAULT '',
`desc` text NOT NULL,
`desc` text,
`album` varchar(255) NOT NULL DEFAULT '',
`filename` varchar(255) NOT NULL DEFAULT '',
`type` varchar(128) NOT NULL DEFAULT 'image/jpeg',
@ -729,15 +729,15 @@ CREATE TABLE IF NOT EXISTS `photo` (
`data` mediumblob NOT NULL,
`scale` tinyint(3) NOT NULL DEFAULT 0,
`profile` tinyint(1) NOT NULL DEFAULT 0,
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,
`deny_gid` mediumtext NOT NULL,
`allow_cid` mediumtext,
`allow_gid` mediumtext,
`deny_cid` mediumtext,
`deny_gid` mediumtext,
PRIMARY KEY(`id`),
INDEX `uid` (`uid`),
INDEX `resource-id` (`resource-id`),
INDEX `guid` (`guid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE poll
@ -745,19 +745,19 @@ CREATE TABLE IF NOT EXISTS `photo` (
CREATE TABLE IF NOT EXISTS `poll` (
`id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`q0` mediumtext NOT NULL,
`q1` mediumtext NOT NULL,
`q2` mediumtext NOT NULL,
`q3` mediumtext NOT NULL,
`q4` mediumtext NOT NULL,
`q5` mediumtext NOT NULL,
`q6` mediumtext NOT NULL,
`q7` mediumtext NOT NULL,
`q8` mediumtext NOT NULL,
`q9` mediumtext NOT NULL,
`q0` mediumtext,
`q1` mediumtext,
`q2` mediumtext,
`q3` mediumtext,
`q4` mediumtext,
`q5` mediumtext,
`q6` mediumtext,
`q7` mediumtext,
`q8` mediumtext,
`q9` mediumtext,
PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE poll_result
@ -769,7 +769,7 @@ CREATE TABLE IF NOT EXISTS `poll_result` (
PRIMARY KEY(`id`),
INDEX `poll_id` (`poll_id`),
INDEX `choice` (`choice`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE profile
@ -791,26 +791,26 @@ CREATE TABLE IF NOT EXISTS `profile` (
`hometown` varchar(255) NOT NULL DEFAULT '',
`gender` varchar(32) NOT NULL DEFAULT '',
`marital` varchar(255) NOT NULL DEFAULT '',
`with` text NOT NULL,
`with` text,
`howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`sexual` varchar(255) NOT NULL DEFAULT '',
`politic` varchar(255) NOT NULL DEFAULT '',
`religion` varchar(255) NOT NULL DEFAULT '',
`pub_keywords` text NOT NULL,
`prv_keywords` text NOT NULL,
`likes` text NOT NULL,
`dislikes` text NOT NULL,
`about` text NOT NULL,
`pub_keywords` text,
`prv_keywords` text,
`likes` text,
`dislikes` text,
`about` text,
`summary` varchar(255) NOT NULL DEFAULT '',
`music` text NOT NULL,
`book` text NOT NULL,
`tv` text NOT NULL,
`film` text NOT NULL,
`interest` text NOT NULL,
`romance` text NOT NULL,
`work` text NOT NULL,
`education` text NOT NULL,
`contact` text NOT NULL,
`music` text,
`book` text,
`tv` text,
`film` text,
`interest` text,
`romance` text,
`work` text,
`education` text,
`contact` text,
`homepage` varchar(255) NOT NULL DEFAULT '',
`photo` varchar(255) NOT NULL DEFAULT '',
`thumb` varchar(255) NOT NULL DEFAULT '',
@ -818,7 +818,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
`net-publish` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
INDEX `hometown` (`hometown`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE profile_check
@ -831,7 +831,7 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
`sec` varchar(255) NOT NULL DEFAULT '',
`expire` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE push_subscriber
@ -846,7 +846,7 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
`last_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`secret` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE queue
@ -857,7 +857,7 @@ CREATE TABLE IF NOT EXISTS `queue` (
`network` varchar(32) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`content` mediumtext NOT NULL,
`content` mediumtext,
`batch` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
INDEX `cid` (`cid`),
@ -865,7 +865,7 @@ CREATE TABLE IF NOT EXISTS `queue` (
INDEX `last` (`last`),
INDEX `network` (`network`),
INDEX `batch` (`batch`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE register
@ -878,7 +878,7 @@ CREATE TABLE IF NOT EXISTS `register` (
`password` varchar(255) NOT NULL DEFAULT '',
`language` varchar(16) NOT NULL DEFAULT '',
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE search
@ -890,7 +890,7 @@ CREATE TABLE IF NOT EXISTS `search` (
PRIMARY KEY(`id`),
INDEX `uid` (`uid`),
INDEX `term` (`term`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE session
@ -898,12 +898,12 @@ CREATE TABLE IF NOT EXISTS `search` (
CREATE TABLE IF NOT EXISTS `session` (
`id` bigint(20) unsigned NOT NULL auto_increment,
`sid` varchar(255) NOT NULL DEFAULT '',
`data` text NOT NULL,
`data` text,
`expire` int(10) unsigned NOT NULL DEFAULT 0,
PRIMARY KEY(`id`),
INDEX `sid` (`sid`),
INDEX `expire` (`expire`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE sign
@ -911,12 +911,12 @@ CREATE TABLE IF NOT EXISTS `session` (
CREATE TABLE IF NOT EXISTS `sign` (
`id` int(10) unsigned NOT NULL auto_increment,
`iid` int(10) unsigned NOT NULL DEFAULT 0,
`signed_text` mediumtext NOT NULL,
`signature` text NOT NULL,
`signed_text` mediumtext,
`signature` text,
`signer` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY(`id`),
INDEX `iid` (`iid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE spam
@ -933,7 +933,7 @@ CREATE TABLE IF NOT EXISTS `spam` (
INDEX `spam` (`spam`),
INDEX `ham` (`ham`),
INDEX `term` (`term`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE term
@ -958,7 +958,7 @@ CREATE TABLE IF NOT EXISTS `term` (
INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`,`global`,`created`),
INDEX `otype_type_term_tid` (`otype`,`type`,`term`,`tid`),
INDEX `guid` (`guid`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE thread
@ -1002,20 +1002,20 @@ CREATE TABLE IF NOT EXISTS `thread` (
INDEX `wall_private_received` (`wall`,`private`,`received`),
INDEX `uid_created` (`uid`,`created`),
INDEX `uid_commented` (`uid`,`commented`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE tokens
--
CREATE TABLE IF NOT EXISTS `tokens` (
`id` varchar(40) NOT NULL,
`secret` text NOT NULL,
`secret` text,
`client_id` varchar(20) NOT NULL DEFAULT '',
`expires` int(11) NOT NULL DEFAULT 0,
`scope` varchar(200) NOT NULL DEFAULT '',
`uid` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY(`id`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE user
@ -1035,10 +1035,10 @@ CREATE TABLE IF NOT EXISTS `user` (
`default-location` varchar(255) NOT NULL DEFAULT '',
`allow_location` tinyint(1) NOT NULL DEFAULT 0,
`theme` varchar(255) NOT NULL DEFAULT '',
`pubkey` text NOT NULL,
`prvkey` text NOT NULL,
`spubkey` text NOT NULL,
`sprvkey` text NOT NULL,
`pubkey` text,
`prvkey` text,
`spubkey` text,
`sprvkey` text,
`verified` tinyint(1) unsigned NOT NULL DEFAULT 0,
`blocked` tinyint(1) unsigned NOT NULL DEFAULT 0,
`blockwall` tinyint(1) unsigned NOT NULL DEFAULT 0,
@ -1058,14 +1058,14 @@ CREATE TABLE IF NOT EXISTS `user` (
`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`service_class` varchar(32) NOT NULL DEFAULT '',
`def_gid` int(11) NOT NULL DEFAULT 0,
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,
`deny_gid` mediumtext NOT NULL,
`openidserver` text NOT NULL,
`allow_cid` mediumtext,
`allow_gid` mediumtext,
`deny_cid` mediumtext,
`deny_gid` mediumtext,
`openidserver` text,
PRIMARY KEY(`uid`),
INDEX `nickname` (`nickname`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE userd
@ -1075,19 +1075,19 @@ CREATE TABLE IF NOT EXISTS `userd` (
`username` varchar(255) NOT NULL,
PRIMARY KEY(`id`),
INDEX `username` (`username`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;
--
-- TABLE workerqueue
--
CREATE TABLE IF NOT EXISTS `workerqueue` (
`id` int(11) NOT NULL auto_increment,
`parameter` text NOT NULL,
`parameter` text,
`priority` tinyint(3) unsigned NOT NULL DEFAULT 0,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`pid` int(11) NOT NULL DEFAULT 0,
`executed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(`id`),
INDEX `created` (`created`)
) DEFAULT CHARSET=utf8;
) DEFAULT CHARSET=utf8mb4;

4
doc/Developers-Intro.md
View file

@ -16,7 +16,7 @@ Contact us
The discussion of Friendica development takes place in the following Friendica forums:
* The main [forum for Friendica development](https://friendika.openmindspace.org/profile/friendicadevelopers)
* The main [forum for Friendica development](https://helpers.pyxis.uberspace.de/profile/developers)
* The [forum for Friendica theme development](https://friendica.eu/profile/ftdevs)
Help other users
@ -79,7 +79,7 @@ If you want to get involved here:
* Look at the first steps that were made (e.g. the clean theme).
Ask us to find out whom to talk to about their experiences.
* Talk to design people if you know any.
* Let us know about your plans [in the dev forum](https://friendika.openmindspace.org/profile/friendicadevelopers) and the [theme developer forum](https://friendica.eu/profile/ftdevs).
* Let us know about your plans [in the dev forum](https://helpers.pyxis.uberspace.de/profile/developers) and the [theme developer forum](https://friendica.eu/profile/ftdevs).
Do not worry about cross-posting.
###Client software

2
doc/Home.md
View file

@ -28,7 +28,7 @@ Friendica Documentation and Resources
**Admin Manual**
* [Install](help/Install)
* [Settings](help/Settings)
* [Settings & Admin Panel](help/Settings)
* [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
* [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
* [Message Flow](help/Message-Flow)

6
doc/Install.md
View file

@ -10,7 +10,7 @@ Not every PHP/MySQL hosting provider will be able to support Friendica.
Many will.
But **please** review the requirements and confirm these with your hosting provider prior to installation.
Also if you encounter installation issues, please let us know via the [helper](http://helpers.pyxis.uberspace.de/profile/helpers) or the [developer](https://friendika.openmindspace.org/profile/friendicadevelopers) forum or [file an issue](https://github.com/friendica/friendica/issues).
Also if you encounter installation issues, please let us know via the [helper](http://helpers.pyxis.uberspace.de/profile/helpers) or the [developer](https://helpers.pyxis.uberspace.de/profile/developers) forum or [file an issue](https://github.com/friendica/friendica/issues).
Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future.
Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.
If you do not have a Friendica account yet, you can register a temporary one at [tryfriendica.de](https://tryfriendica.de) and join the forums mentioned above from there.
@ -26,12 +26,12 @@ Requirements
---
* Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file
* PHP 5.2+. The later the better. You'll need 5.3 for encryption of key exchange conversations. On a Windows environment, 5.2+ might not work as the function dns_get_record() is only available with version 5.3.
* PHP 5.4+.
* PHP *command line* access with register_argc_argv set to true in the php.ini file
* curl, gd, mysql, hash and openssl extensions
* some form of email server or email gateway such that PHP mail() works
* mcrypt (optional; used for server-to-server message encryption)
* Mysql 5.x or an equivalant alternative for MySQL (MariaDB etc.)
* Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
* the ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) (Note: other options are presented in Section 7 of this document.)
* Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will not be as convenient to use and have not been thoroughly tested.
* If your hosting provider doesn't allow Unix shell access, you might have trouble getting everything to work.

2
doc/de/Home.md
View file

@ -29,7 +29,7 @@ Friendica - Dokumentation und Ressourcen
**Technische Dokumentation**
* [Installation](help/Install)
* [Konfigurationen](help/Settings)
* [Konfigurationen & Admin-Panel](help/Settings)
* [Plugins](help/Plugins)
* [Konnektoren (Connectors) installieren (Twitter/GNU Social)](help/Installing-Connectors)
* [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/install-ejabberd) (EN)

2
doc/htconfig.md
View file

@ -57,7 +57,7 @@ line to your .htconfig.php:
* qsearch_limit - Default value is 100.
* relay_server - Experimental Diaspora feature. Address of the relay server where public posts should be send to. For example https://podrelay.net
* relay_subscribe (Boolean) - Enables the receiving of public posts from the relay. They will be included in the search and on the community page when it is set up to show all public items.
* relay_scope - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts witt selected tags should be received.
* relay_scope - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.
* relay_server_tags - Comma separated list of tags for the "tags" subscription (see "relay_scrope")
* relay_user_tags (Boolean) - If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
* remove_multiplicated_lines (Boolean) - If enabled, multiple linefeeds in items are stripped to a single one.

2
doc/readme.md
View file

@ -27,7 +27,7 @@ Friendica Documentation and Resources
**Technical Documentation**
* [Install](help/Install)
* [Settings](help/Settings)
* [Settings & Admin Panel](help/Settings)
* [Plugins](help/Plugins)
* [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
* [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)

5
htconfig.php
View file

@ -16,6 +16,11 @@ $db_user = 'mysqlusername';
$db_pass = 'mysqlpassword';
$db_data = 'mysqldatabasename';
// Set the database connection charset to UTF8.
// Changing this value will likely corrupt the special characters.
// You have been warned.
$a->config['system']['db_charset'] = "utf8mb4";
// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
// It can be changed later and only applies to timestamps for anonymous viewers.

3
include/Probe.php
View file

@ -788,6 +788,9 @@ class Probe {
isset($data["pubkey"]) AND ($hcard != "")) {
$data["network"] = NETWORK_DIASPORA;
// The Diaspora handle must always be lowercase
$data["addr"] = strtolower($data["addr"]);
// We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
$data["notify"] = $data["baseurl"]."/receive/users/".$data["guid"];
$data["batch"] = $data["baseurl"]."/receive/public";

45
include/api.php
View file

@ -2362,29 +2362,54 @@
'attendno' => array(),
'attendmaybe' => array()
);
$items = q('SELECT * FROM item
WHERE uid=%d AND `thr-parent`="%s" AND visible AND NOT deleted',
intval($item['uid']),
dbesc($item['uri']));
foreach ($items as $i){
builtin_activity_puller($i, $activities);
// not used as result should be structured like other user data
//builtin_activity_puller($i, $activities);
// get user data and add it to the array of the activity
$user = api_get_user($a, $i['author-link']);
switch($i['verb']) {
case ACTIVITY_LIKE:
$activities['like'][] = $user;
break;
case ACTIVITY_DISLIKE:
$activities['dislike'][] = $user;
break;
case ACTIVITY_ATTEND:
$activities['attendyes'][] = $user;
break;
case ACTIVITY_ATTENDNO:
$activities['attendno'][] = $user;
break;
case ACTIVITY_ATTENDMAYBE:
$activities['attendmaybe'][] = $user;
break;
default:
break;
}
}
if ($type == "xml") {
$xml_activities = array();
foreach ($activities as $k => $v)
foreach ($activities as $k => $v) {
// change xml element from "like" to "friendica:like"
$xml_activities["friendica:".$k] = $v;
// add user data into xml output
$k_user = 0;
foreach ($v as $user)
$xml_activities["friendica:".$k][$k_user++.":user"] = $user;
}
$activities = $xml_activities;
}
$res = array();
$uri = $item['uri']."-l";
foreach($activities as $k => $v) {
$res[$k] = (x($v,$uri)?count($v[$uri]):0);
#$res[$k] = ( x($v,$uri) ? array_map("api_contactlink_to_array", $v[$uri]) : array() );
}
return $res;
return $activities;
}
/**

6
include/bbcode.php
View file

@ -34,7 +34,6 @@ function bb_map_location($match) {
function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
$data = get_attachment_data($Text);
if (!$data)
return $Text;
@ -85,7 +84,7 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) {
$text .= $oembed;
if (trim($data["description"]) != "")
$text .= sprintf('<blockquote>%s</blockquote></span>', trim($data["description"]));
$text .= sprintf('<blockquote>%s</blockquote></span>', trim(bbcode($data["description"])));
}
}
return $data["text"].$text.$data["after"];
@ -921,6 +920,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
$Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text);
$Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
// Check for paragraph
$Text = preg_replace("(\[p\](.*?)\[\/p\])ism",'<p>$1</p>',$Text);
// Check for bold text
$Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'<strong>$1</strong>',$Text);

2
include/cli_startup.php
View file

@ -11,7 +11,7 @@ function cli_startup() {
if(is_null($a)) {
$a = new App;
}
if(is_null($db)) {
@include(".htconfig.php");
require_once("dba.php");

8
include/conversation.php
View file

@ -390,7 +390,6 @@ function item_fieldlists() {
/*
These Fields are not added below (yet). They are here to for bug search.
`item`.`type`,
`item`.`object`,
`item`.`extid`,
`item`.`received`,
`item`.`changed`,
@ -399,7 +398,6 @@ These Fields are not added below (yet). They are here to for bug search.
`item`.`target`,
`item`.`resource-id`,
`item`.`tag`,
`item`.`attach`,
`item`.`inform`,
`item`.`pubmail`,
`item`.`visible`,
@ -424,8 +422,8 @@ These Fields are not added below (yet). They are here to for bug search.
`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
`item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`,
`item`.`location`, `item`.`coord`, `item`.`app`,
`item`.`rendered-hash`, `item`.`rendered-html`,
`item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`,
`item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
`item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
`item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
@ -887,7 +885,7 @@ function best_link_url($item,&$sparkle,$ssl_state = false) {
$clean_url = normalise_link($item['author-link']);
if (local_user()) {
$r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' LIMIT 1",
$r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1",
dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url)));
if ($r) {
$best_url = 'redir/'.$r[0]['id'];

3
include/cron.php
View file

@ -27,7 +27,6 @@ function cron_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
require_once('include/session.php');
require_once('include/datetime.php');
require_once('include/items.php');
@ -70,7 +69,7 @@ function cron_run(&$argv, &$argc){
// run queue delivery process in the background
proc_run(PRIORITY_LOW,"include/queue.php");
proc_run(PRIORITY_NEGLIGIBLE,"include/queue.php");
// run the process to discover global contacts in the background

1
include/cronjobs.php
View file

@ -27,7 +27,6 @@ function cronjobs_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
require_once('include/session.php');
require_once('include/datetime.php');
require_once('include/ostatus.php');

23
include/dba.php
View file

@ -66,6 +66,8 @@ class dba {
if(! mysqli_connect_errno()) {
$this->connected = true;
}
if (isset($a->config["system"]["db_charset"]))
$this->db->set_charset($a->config["system"]["db_charset"]);
}
else {
$this->mysqli = false;
@ -73,6 +75,8 @@ class dba {
if($this->db && mysql_select_db($db,$this->db)) {
$this->connected = true;
}
if (isset($a->config["system"]["db_charset"]))
mysql_set_charset($a->config["system"]["db_charset"], $this->db);
}
if(! $this->connected) {
$this->db = null;
@ -95,6 +99,14 @@ class dba {
$this->error = '';
// Check the connection (This can reconnect the connection - if configured)
if ($this->mysqli)
$connected = $this->db->ping();
else
$connected = mysql_ping($this->db);
$connstr = ($connected ? "Connected": "Disonnected");
$stamp1 = microtime(true);
if($this->mysqli)
@ -122,14 +134,17 @@ class dba {
}
if($this->mysqli) {
if($this->db->errno)
if($this->db->errno) {
$this->error = $this->db->error;
$this->errorno = $this->db->errno;
}
} elseif(mysql_errno($this->db)) {
$this->error = mysql_error($this->db);
$this->errorno = mysql_errno($this->db);
}
elseif(mysql_errno($this->db))
$this->error = mysql_error($this->db);
if(strlen($this->error)) {
logger('dba: ' . $this->error);
logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error);
}
if($this->debug) {

4
include/dbm.php
View file

@ -20,8 +20,8 @@ class dbm {
foreach ($r AS $process) {
$state = trim($process["State"]);
// Filter out all idle processes
if (!in_array($state, array("", "init", "statistics"))) {
// Filter out all non blocking processes
if (!in_array($state, array("", "init", "statistics", "updating"))) {
++$states[$state];
++$processes;
}

227
include/dbstructure.php
View file

@ -260,6 +260,13 @@ function db_field_command($parameters, $create = true) {
function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
global $a, $db;
if (isset($a->config["system"]["db_charset"]))
$charset = $a->config["system"]["db_charset"];
elseif ($verbose)
$charset = "utf8mb4";
else
$charset = "utf8";
$r = true;
$sql = "";
@ -282,7 +289,7 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
$sql = implode(",\n\t", $sql_rows);
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8";
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=".$charset;
if ($verbose)
echo $sql.";\n";
@ -365,10 +372,10 @@ function db_definition() {
"data" => array("type" => "longblob", "not null" => "1"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"allow_cid" => array("type" => "mediumtext", "not null" => "1"),
"allow_gid" => array("type" => "mediumtext", "not null" => "1"),
"deny_cid" => array("type" => "mediumtext", "not null" => "1"),
"deny_gid" => array("type" => "mediumtext", "not null" => "1"),
"allow_cid" => array("type" => "mediumtext"),
"allow_gid" => array("type" => "mediumtext"),
"deny_cid" => array("type" => "mediumtext"),
"deny_gid" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -389,7 +396,7 @@ function db_definition() {
$database["cache"] = array(
"fields" => array(
"k" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
"v" => array("type" => "text", "not null" => "1"),
"v" => array("type" => "text"),
"expire_mode" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
@ -429,7 +436,7 @@ function db_definition() {
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"v" => array("type" => "text", "not null" => "1"),
"v" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -449,29 +456,29 @@ function db_definition() {
"name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"nick" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"about" => array("type" => "text", "not null" => "1"),
"keywords" => array("type" => "text", "not null" => "1"),
"about" => array("type" => "text"),
"keywords" => array("type" => "text"),
"gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"attag" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "text", "not null" => "1"),
"thumb" => array("type" => "text", "not null" => "1"),
"micro" => array("type" => "text", "not null" => "1"),
"site-pubkey" => array("type" => "text", "not null" => "1"),
"photo" => array("type" => "text"),
"thumb" => array("type" => "text"),
"micro" => array("type" => "text"),
"site-pubkey" => array("type" => "text"),
"issued-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"dfrn-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"pubkey" => array("type" => "text", "not null" => "1"),
"prvkey" => array("type" => "text", "not null" => "1"),
"pubkey" => array("type" => "text"),
"prvkey" => array("type" => "text"),
"batch" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"request" => array("type" => "text", "not null" => "1"),
"notify" => array("type" => "text", "not null" => "1"),
"poll" => array("type" => "text", "not null" => "1"),
"confirm" => array("type" => "text", "not null" => "1"),
"poco" => array("type" => "text", "not null" => "1"),
"request" => array("type" => "text"),
"notify" => array("type" => "text"),
"poll" => array("type" => "text"),
"confirm" => array("type" => "text"),
"poco" => array("type" => "text"),
"aes_allow" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"ret-aes" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"usehub" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@ -495,15 +502,15 @@ function db_definition() {
"archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"rating" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"reason" => array("type" => "text", "not null" => "1"),
"reason" => array("type" => "text"),
"closeness" => array("type" => "tinyint(2)", "not null" => "1", "default" => "99"),
"info" => array("type" => "mediumtext", "not null" => "1"),
"info" => array("type" => "mediumtext"),
"profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""),
"bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"),
"notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"ffi_keyword_blacklist" => array("type" => "mediumtext", "not null" => "1"),
"ffi_keyword_blacklist" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -515,12 +522,12 @@ function db_definition() {
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
"recips" => array("type" => "mediumtext", "not null" => "1"),
"recips" => array("type" => "mediumtext"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"creator" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"subject" => array("type" => "mediumtext", "not null" => "1"),
"subject" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -548,17 +555,17 @@ function db_definition() {
"edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"start" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"finish" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"summary" => array("type" => "text", "not null" => "1"),
"desc" => array("type" => "text", "not null" => "1"),
"location" => array("type" => "text", "not null" => "1"),
"summary" => array("type" => "text"),
"desc" => array("type" => "text"),
"location" => array("type" => "text"),
"type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
"allow_cid" => array("type" => "mediumtext", "not null" => "1"),
"allow_gid" => array("type" => "mediumtext", "not null" => "1"),
"deny_cid" => array("type" => "mediumtext", "not null" => "1"),
"deny_gid" => array("type" => "mediumtext", "not null" => "1"),
"allow_cid" => array("type" => "mediumtext"),
"allow_gid" => array("type" => "mediumtext"),
"deny_cid" => array("type" => "mediumtext"),
"deny_gid" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -582,7 +589,7 @@ function db_definition() {
"priority" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"pubkey" => array("type" => "text", "not null" => "1"),
"pubkey" => array("type" => "text"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
@ -606,7 +613,7 @@ function db_definition() {
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"server" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"posturl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"key" => array("type" => "text", "not null" => "1"),
"key" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -622,7 +629,7 @@ function db_definition() {
"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"request" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"note" => array("type" => "text", "not null" => "1"),
"note" => array("type" => "text"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
@ -655,8 +662,8 @@ function db_definition() {
"last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
"last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
"location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"about" => array("type" => "text", "not null" => "1"),
"keywords" => array("type" => "text", "not null" => "1"),
"about" => array("type" => "text"),
"keywords" => array("type" => "text"),
"gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"),
"community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@ -664,7 +671,7 @@ function db_definition() {
"nsfw" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"network" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"notify" => array("type" => "text", "not null" => "1"),
"notify" => array("type" => "text"),
"alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"generation" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
"server_url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@ -726,7 +733,7 @@ function db_definition() {
"nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"version" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"site_name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"info" => array("type" => "text", "not null" => "1"),
"info" => array("type" => "text"),
"register_policy" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"poco" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"noscrape" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@ -763,7 +770,7 @@ function db_definition() {
"contact-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"knowyou" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"duplex" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"note" => array("type" => "text", "not null" => "1"),
"note" => array("type" => "text"),
"hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"datetime" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
@ -802,27 +809,27 @@ function db_definition() {
"author-link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"author-avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"body" => array("type" => "mediumtext", "not null" => "1"),
"body" => array("type" => "mediumtext"),
"app" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"object-type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"object" => array("type" => "text", "not null" => "1"),
"object" => array("type" => "text"),
"target-type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"target" => array("type" => "text", "not null" => "1"),
"postopts" => array("type" => "text", "not null" => "1"),
"target" => array("type" => "text"),
"postopts" => array("type" => "text"),
"plink" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"resource-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"event-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"tag" => array("type" => "mediumtext", "not null" => "1"),
"attach" => array("type" => "mediumtext", "not null" => "1"),
"inform" => array("type" => "mediumtext", "not null" => "1"),
"file" => array("type" => "mediumtext", "not null" => "1"),
"tag" => array("type" => "mediumtext"),
"attach" => array("type" => "mediumtext"),
"inform" => array("type" => "mediumtext"),
"file" => array("type" => "mediumtext"),
"location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"coord" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"allow_cid" => array("type" => "mediumtext", "not null" => "1"),
"allow_gid" => array("type" => "mediumtext", "not null" => "1"),
"deny_cid" => array("type" => "mediumtext", "not null" => "1"),
"deny_gid" => array("type" => "mediumtext", "not null" => "1"),
"allow_cid" => array("type" => "mediumtext"),
"allow_gid" => array("type" => "mediumtext"),
"deny_cid" => array("type" => "mediumtext"),
"deny_gid" => array("type" => "mediumtext"),
"private" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"pubmail" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"moderated" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@ -838,7 +845,7 @@ function db_definition() {
"mention" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"rendered-hash" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"rendered-html" => array("type" => "mediumtext", "not null" => "1"),
"rendered-html" => array("type" => "mediumtext"),
"global" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
),
"indexes" => array(
@ -919,7 +926,7 @@ function db_definition() {
"contact-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"convid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
"title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"body" => array("type" => "mediumtext", "not null" => "1"),
"body" => array("type" => "mediumtext"),
"seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"reply" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"replied" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@ -947,7 +954,7 @@ function db_definition() {
"ssltype" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
"mailbox" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"user" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"pass" => array("type" => "text", "not null" => "1"),
"pass" => array("type" => "text"),
"reply_to" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"action" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"movetofolder" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@ -978,7 +985,7 @@ function db_definition() {
"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"msg" => array("type" => "mediumtext", "not null" => "1"),
"msg" => array("type" => "mediumtext"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
@ -1009,7 +1016,7 @@ function db_definition() {
$database["oembed"] = array(
"fields" => array(
"url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
"content" => array("type" => "text", "not null" => "1"),
"content" => array("type" => "text"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
@ -1022,7 +1029,7 @@ function db_definition() {
"url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
"guessing" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
"oembed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
"content" => array("type" => "text", "not null" => "1"),
"content" => array("type" => "text"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
@ -1036,7 +1043,7 @@ function db_definition() {
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"v" => array("type" => "mediumtext", "not null" => "1"),
"v" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -1053,7 +1060,7 @@ function db_definition() {
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"desc" => array("type" => "text", "not null" => "1"),
"desc" => array("type" => "text"),
"album" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"filename" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"type" => array("type" => "varchar(128)", "not null" => "1", "default" => "image/jpeg"),
@ -1063,10 +1070,10 @@ function db_definition() {
"data" => array("type" => "mediumblob", "not null" => "1"),
"scale" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
"profile" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"allow_cid" => array("type" => "mediumtext", "not null" => "1"),
"allow_gid" => array("type" => "mediumtext", "not null" => "1"),
"deny_cid" => array("type" => "mediumtext", "not null" => "1"),
"deny_gid" => array("type" => "mediumtext", "not null" => "1"),
"allow_cid" => array("type" => "mediumtext"),
"allow_gid" => array("type" => "mediumtext"),
"deny_cid" => array("type" => "mediumtext"),
"deny_gid" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -1079,16 +1086,16 @@ function db_definition() {
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"q0" => array("type" => "mediumtext", "not null" => "1"),
"q1" => array("type" => "mediumtext", "not null" => "1"),
"q2" => array("type" => "mediumtext", "not null" => "1"),
"q3" => array("type" => "mediumtext", "not null" => "1"),
"q4" => array("type" => "mediumtext", "not null" => "1"),
"q5" => array("type" => "mediumtext", "not null" => "1"),
"q6" => array("type" => "mediumtext", "not null" => "1"),
"q7" => array("type" => "mediumtext", "not null" => "1"),
"q8" => array("type" => "mediumtext", "not null" => "1"),
"q9" => array("type" => "mediumtext", "not null" => "1"),
"q0" => array("type" => "mediumtext"),
"q1" => array("type" => "mediumtext"),
"q2" => array("type" => "mediumtext"),
"q3" => array("type" => "mediumtext"),
"q4" => array("type" => "mediumtext"),
"q5" => array("type" => "mediumtext"),
"q6" => array("type" => "mediumtext"),
"q7" => array("type" => "mediumtext"),
"q8" => array("type" => "mediumtext"),
"q9" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
@ -1107,6 +1114,17 @@ function db_definition() {
"choice" => array("choice"),
)
);
$database["process"] = array(
"fields" => array(
"pid" => array("type" => "int(10) unsigned", "not null" => "1", "primary" => "1"),
"command" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
"PRIMARY" => array("pid"),
"command" => array("command"),
)
);
$database["profile"] = array(
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
@ -1125,26 +1143,26 @@ function db_definition() {
"hometown" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"marital" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"with" => array("type" => "text", "not null" => "1"),
"with" => array("type" => "text"),
"howlong" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"sexual" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"politic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"religion" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"pub_keywords" => array("type" => "text", "not null" => "1"),
"prv_keywords" => array("type" => "text", "not null" => "1"),
"likes" => array("type" => "text", "not null" => "1"),
"dislikes" => array("type" => "text", "not null" => "1"),
"about" => array("type" => "text", "not null" => "1"),
"pub_keywords" => array("type" => "text"),
"prv_keywords" => array("type" => "text"),
"likes" => array("type" => "text"),
"dislikes" => array("type" => "text"),
"about" => array("type" => "text"),
"summary" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"music" => array("type" => "text", "not null" => "1"),
"book" => array("type" => "text", "not null" => "1"),
"tv" => array("type" => "text", "not null" => "1"),
"film" => array("type" => "text", "not null" => "1"),
"interest" => array("type" => "text", "not null" => "1"),
"romance" => array("type" => "text", "not null" => "1"),
"work" => array("type" => "text", "not null" => "1"),
"education" => array("type" => "text", "not null" => "1"),
"contact" => array("type" => "text", "not null" => "1"),
"music" => array("type" => "text"),
"book" => array("type" => "text"),
"tv" => array("type" => "text"),
"film" => array("type" => "text"),
"interest" => array("type" => "text"),
"romance" => array("type" => "text"),
"work" => array("type" => "text"),
"education" => array("type" => "text"),
"contact" => array("type" => "text"),
"homepage" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"thumb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@ -1191,7 +1209,7 @@ function db_definition() {
"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"last" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"content" => array("type" => "mediumtext", "not null" => "1"),
"content" => array("type" => "mediumtext"),
"batch" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
),
"indexes" => array(
@ -1232,7 +1250,7 @@ function db_definition() {
"fields" => array(
"id" => array("type" => "bigint(20) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"sid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"data" => array("type" => "text", "not null" => "1"),
"data" => array("type" => "text"),
"expire" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
),
"indexes" => array(
@ -1245,8 +1263,8 @@ function db_definition() {
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"iid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
"signed_text" => array("type" => "mediumtext", "not null" => "1"),
"signature" => array("type" => "text", "not null" => "1"),
"signed_text" => array("type" => "mediumtext"),
"signature" => array("type" => "text"),
"signer" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
),
"indexes" => array(
@ -1343,7 +1361,7 @@ function db_definition() {
$database["tokens"] = array(
"fields" => array(
"id" => array("type" => "varchar(40)", "not null" => "1", "primary" => "1"),
"secret" => array("type" => "text", "not null" => "1"),
"secret" => array("type" => "text"),
"client_id" => array("type" => "varchar(20)", "not null" => "1", "default" => ""),
"expires" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"scope" => array("type" => "varchar(200)", "not null" => "1", "default" => ""),
@ -1369,10 +1387,10 @@ function db_definition() {
"default-location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"allow_location" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"theme" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"pubkey" => array("type" => "text", "not null" => "1"),
"prvkey" => array("type" => "text", "not null" => "1"),
"spubkey" => array("type" => "text", "not null" => "1"),
"sprvkey" => array("type" => "text", "not null" => "1"),
"pubkey" => array("type" => "text"),
"prvkey" => array("type" => "text"),
"spubkey" => array("type" => "text"),
"sprvkey" => array("type" => "text"),
"verified" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
"blocked" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
"blockwall" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
@ -1392,11 +1410,11 @@ function db_definition() {
"expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"allow_cid" => array("type" => "mediumtext", "not null" => "1"),
"allow_gid" => array("type" => "mediumtext", "not null" => "1"),
"deny_cid" => array("type" => "mediumtext", "not null" => "1"),
"deny_gid" => array("type" => "mediumtext", "not null" => "1"),
"openidserver" => array("type" => "text", "not null" => "1"),
"allow_cid" => array("type" => "mediumtext"),
"allow_gid" => array("type" => "mediumtext"),
"deny_cid" => array("type" => "mediumtext"),
"deny_gid" => array("type" => "mediumtext"),
"openidserver" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("uid"),
@ -1416,7 +1434,7 @@ function db_definition() {
$database["workerqueue"] = array(
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"parameter" => array("type" => "text", "not null" => "1"),
"parameter" => array("type" => "text"),
"priority" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
@ -1453,6 +1471,7 @@ function dbstructure_run(&$argv, &$argc) {
switch ($argv[1]) {
case "update":
update_structure(true, true);
set_config('system','build',DB_UPDATE_VERSION);
return;
case "dumpsql":
print_structure(db_definition());

8
include/diaspora.php
View file

@ -623,7 +623,7 @@ class diaspora {
dbesc($arr["photo"]),
dbesc($arr["request"]),
dbesc($arr["nick"]),
dbesc($arr["addr"]),
dbesc(strtolower($arr["addr"])),
dbesc($arr["guid"]),
dbesc($arr["batch"]),
dbesc($arr["notify"]),
@ -677,7 +677,7 @@ class diaspora {
$r = q("SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
intval($gcontact_id));
if ($r)
return $r[0]["addr"];
return strtolower($r[0]["addr"]);
}
$r = q("SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
@ -697,7 +697,7 @@ class diaspora {
}
}
return $handle;
return strtolower($handle);
}
/**
@ -1652,7 +1652,7 @@ class diaspora {
* @return bool Success
*/
private function receive_profile($importer, $data) {
$author = notags(unxmlify($data->author));
$author = strtolower(notags(unxmlify($data->author)));
$contact = self::contact_by_handle($importer["uid"], $author);
if (!$contact)

10
include/event.php
View file

@ -293,7 +293,7 @@ function event_store($arr) {
`location` = '%s',
`type` = '%s',
`adjust` = %d,
`nofinish` = %d,
`nofinish` = %d
WHERE `id` = %d AND `uid` = %d",
dbesc($arr['edited']),
@ -673,7 +673,7 @@ function event_format_export ($events, $format = 'ical', $timezone) {
$dtformat = "%Y%m%dT%H%M%S".$UTC;
$o .= 'DTSTART:'.strftime($dtformat, $tmp).PHP_EOL;
}
if ($event['finish']) {
if (!$event['nofinish']) {
$tmp = strtotime($event['finish']);
$dtformat = "%Y%m%dT%H%M%S".$UTC;
$o .= 'DTEND:'.strftime($dtformat, $tmp).PHP_EOL;
@ -732,13 +732,13 @@ function events_by_uid($uid = 0, $sql_extra = '') {
// requested? then show all of your events, otherwise only those that
// don't have limitations set in allow_cid and allow_gid
if (local_user() == $uid) {
$r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`
$r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish`
FROM `event` WHERE `uid`= %d AND `cid` = 0 ",
intval($uid)
);
} else {
$r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`FROM `event`
WHERE `uid` = %d AND `cid` = 0 $sql_extra ",
$r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish`
FROM `event` WHERE `uid`= %d AND `cid` = 0 $sql_extra ",
intval($uid)
);
}

4
include/identity.php
View file

@ -71,8 +71,8 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
// if (!$profiledata)
// $_SESSION['theme'] = $a->profile['theme'];
if (!$profiledata && !get_pconfig(local_user(),'system','always_my_theme'))
$_SESSION['theme'] = $a->profile['theme'];
$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];

1
include/onepoll.php
View file

@ -24,7 +24,6 @@ function onepoll_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
require_once('include/session.php');
require_once('include/datetime.php');
require_once('include/items.php');

2
include/plaintext.php
View file

@ -82,7 +82,7 @@ function get_attachment_data($body) {
$data = array();
if (!preg_match("/(.*)\[attachment(.*)\](.*?)\[\/attachment\](.*)/ism", $body, $match))
if (!preg_match("/(.*)\[attachment(.*?)\](.*?)\[\/attachment\](.*)/ism", $body, $match))
return get_old_attachment_data($body);
$attributes = $match[2];

55
include/poller.php
View file

@ -29,6 +29,10 @@ function poller_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
$a->start_process();
$mypid = getmypid();
if ($a->max_processes_reached())
return;
@ -81,15 +85,19 @@ function poller_run(&$argv, &$argc){
q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
dbesc(datetime_convert()),
intval(getmypid()),
intval($mypid),
intval($r[0]["id"]));
// Assure that there are no tasks executed twice
$id = q("SELECT `id` FROM `workerqueue` WHERE `id` = %d AND `pid` = %d",
intval($r[0]["id"]),
intval(getmypid()));
$id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
if (!$id) {
logger("Queue item ".$r[0]["id"]." was executed multiple times - skip this execution", LOGGER_DEBUG);
logger("Queue item ".$r[0]["id"]." vanished - skip this execution", LOGGER_DEBUG);
continue;
} elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
logger("Entry for queue item ".$r[0]["id"]." wasn't stored - we better stop here", LOGGER_DEBUG);
return;
} elseif ($id[0]["pid"] != $mypid) {
logger("Queue item ".$r[0]["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
continue;
}
@ -111,15 +119,15 @@ function poller_run(&$argv, &$argc){
$funcname = str_replace(".php", "", basename($argv[0]))."_run";
if (function_exists($funcname)) {
logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
$funcname($argv, $argc);
if ($cooldown > 0) {
logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
sleep($cooldown);
}
logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
} else
@ -232,17 +240,20 @@ function poller_kill_stale_workers() {
// Kill long running processes
// Check if the priority is in a valid range
if (!in_array($pid["priority"], array(PRIORITY_SYSTEM, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW)))
if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE)))
$pid["priority"] = PRIORITY_MEDIUM;
// Define the maximum durations
$max_duration_defaults = array(PRIORITY_SYSTEM => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180);
$max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360);
$max_duration = $max_duration_defaults[$pid["priority"]];
$argv = json_decode($pid["parameter"]);
$argv[0] = basename($argv[0]);
// How long is the process already running?
$duration = (time() - strtotime($pid["executed"])) / 60;
if ($duration > $max_duration) {
logger("Worker process ".$pid["pid"]." (".$pid["parameter"].") took more than ".$max_duration." minutes. It will be killed now.");
logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") took more than ".$max_duration." minutes. It will be killed now.");
posix_kill($pid["pid"], SIGTERM);
// We killed the stale process.
@ -251,10 +262,10 @@ function poller_kill_stale_workers() {
q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `created` = '%s',
`priority` = %d, `pid` = 0 WHERE `pid` = %d",
dbesc(datetime_convert()),
intval(PRIORITY_LOW),
intval(PRIORITY_NEGLIGIBLE),
intval($pid["pid"]));
} else
logger("Worker process ".$pid["pid"]." now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
}
}
@ -291,12 +302,11 @@ function poller_too_much_workers() {
$s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority` LIMIT 1");
$top_priority = $s[0]["priority"];
$s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `priority` <= %d AND `executed` != '0000-00-00 00:00:00'",
$s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` != '0000-00-00 00:00:00' LIMIT 1",
intval($top_priority));
$high_running = $s[0]["total"];
$high_running = dbm::is_result($s);
/// @todo define maximum number of fastlanes
if (($high_running == 0) AND ($top_priority != PRIORITY_UNDEFINED) AND ($top_priority < PRIORITY_LOW)) {
if (!$high_running AND ($top_priority > PRIORITY_UNDEFINED) AND ($top_priority < PRIORITY_NEGLIGIBLE)) {
logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG);
$queues = $active + 1;
}
@ -317,13 +327,16 @@ function poller_too_much_workers() {
}
function poller_active_workers() {
$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
$workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'poller.php'");
return($workers[0]["workers"]);
return($workers[0]["processes"]);
}
if (array_search(__file__,get_included_files())===0){
poller_run($_SERVER["argv"],$_SERVER["argc"]);
killme();
poller_run($_SERVER["argv"],$_SERVER["argc"]);
get_app()->end_process();
killme();
}
?>

2
include/post_update.php
View file

@ -159,7 +159,7 @@ function post_update_1198() {
logger("Start", LOGGER_DEBUG);
// Check if the first step is done (Setting "author-id" and "owner-id" in the item table)
$r = q("SELECT `author-link`, `owner-link`, `uid` FROM `item` WHERE `author-id` = 0 AND `owner-id` = 0 LIMIT 1000");
$r = q("SELECT `author-link`, `owner-link`, `uid` FROM `item` WHERE `author-id` = 0 AND `owner-id` = 0 LIMIT 100");
if (!$r) {
// Are there unfinished entries in the thread table?
$r = q("SELECT COUNT(*) AS `total` FROM `thread`

84
include/queue.php
View file

@ -17,7 +17,6 @@ function queue_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data);
};
require_once("include/session.php");
require_once("include/datetime.php");
require_once('include/items.php');
@ -45,55 +44,57 @@ function queue_run(&$argv, &$argc){
$deadservers = array();
$serverlist = array();
logger('queue: start');
if (!$queue_id) {
// Handling the pubsubhubbub requests
proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
logger('queue: start');
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
// Handling the pubsubhubbub requests
proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
// If we are using the worker we don't need a delivery interval
if (get_config("system", "worker"))
$interval = false;
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
$r = q("select * from deliverq where 1");
if($r) {
foreach($r as $rr) {
logger('queue: deliverq');
proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
if($interval)
// If we are using the worker we don't need a delivery interval
if (get_config("system", "worker"))
$interval = false;
$r = q("select * from deliverq where 1");
if($r) {
foreach($r as $rr) {
logger('queue: deliverq');
proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
}
}
}
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
if($r) {
foreach($r as $rr) {
logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
if($r) {
foreach($r as $rr) {
logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
}
q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
}
q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
}
if($queue_id) {
$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id)
);
}
else {
// For the first 12 hours we'll try to deliver every 15 minutes
// After that, we'll only attempt delivery once per hour.
$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
} else {
logger('queue: start for id '.$queue_id);
$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id)
);
}
if(! $r){
if (!$r){
return;
}
if(! $queue_id)
if (!$queue_id)
call_hooks('queue_predeliver', $a, $r);
@ -107,16 +108,17 @@ function queue_run(&$argv, &$argc){
// queue_predeliver hooks may have changed the queue db details,
// so check again if this entry still needs processing
if($queue_id) {
if($queue_id)
$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id)
);
}
else {
intval($queue_id));
elseif (get_config("system", "worker")) {
logger('Call queue for id '.$q_item['id']);
proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']);
continue;
} else
$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
intval($q_item['id'])
);
}
intval($q_item['id']));
if(! count($qi))
continue;

2
include/threads.php
View file

@ -176,7 +176,7 @@ function delete_thread($itemid, $itemuri = "") {
intval($item["uid"])
);
if (!count($r)) {
$r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0)",
$r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0",
dbesc($itemuri)
);
logger("delete_thread: Deleted shadow for item ".$itemuri." - ".print_r($result, true), LOGGER_DEBUG);

20
include/xml.php
View file

@ -61,6 +61,18 @@ class xml {
continue;
}
$element_parts = explode(":", $key);
if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
$namespace = $namespaces[$element_parts[0]];
elseif (isset($namespaces[""])) {
$namespace = $namespaces[""];
} else
$namespace = NULL;
// Remove undefined namespaces from the key
if ((count($element_parts) > 1) AND is_null($namespace))
$key = $element_parts[1];
if (substr($key, 0, 11) == "@attributes") {
if (!isset($element) OR !is_array($value))
continue;
@ -78,14 +90,6 @@ class xml {
continue;
}
$element_parts = explode(":", $key);
if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
$namespace = $namespaces[$element_parts[0]];
elseif (isset($namespaces[""]))
$namespace = $namespaces[""];
else
$namespace = NULL;
if (!is_array($value))
$element = $xml->addChild($key, xmlify($value), $namespace);
elseif (is_array($value)) {

6
index.php
View file

@ -489,7 +489,8 @@ if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
echo substr($target->saveHTML(), 6, -8);
session_write_close();
if (!$a->is_backend())
session_write_close();
exit;
}
@ -514,5 +515,6 @@ if(!$template) {
require_once($template);
session_write_close();
if (!$a->is_backend())
session_write_close();
exit;

17
mod/cal.php
View file

@ -304,25 +304,32 @@ function cal_content(&$a) {
// Test permissions
// Respect the export feature setting for all other /cal pages if it's not the own profile
if( ((local_user() !== $owner_uid)) && ! feature_enabled($owner_uid, "export_calendar")) {
if( ((local_user() !== intval($owner_uid))) && ! feature_enabled($owner_uid, "export_calendar")) {
notice( t('Permission denied.') . EOL);
return;
goaway('cal/' . $nick);
}
// Get the export data by uid
$evexport = event_export($owner_uid, $format);
if ($evexport["success"] == false ) {
if (!$evexport["success"]) {
if($evexport["content"])
notice( t('This calendar format is not supported') );
else
notice( t('No exportable data found'));
return;
// If it the own calendar return to the events page
// otherwise to the profile calendar page
if (local_user() === intval($owner_uid))
$return_path = "events";
else
$returnpath = "cal/".$nick;
goaway($return_path);
}
// If nothing went wrong we can echo the export content
if ($evexport["success"] == true ) {
if ($evexport["success"]) {
header('Content-type: text/calendar');
header('content-disposition: attachment; filename="' . t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"' );
echo $evexport["content"];

3
mod/events.php
View file

@ -506,7 +506,8 @@ function events_content(&$a) {
'$acl' => $acl,
'$submit' => t('Submit'),
'$basic' => t("Basic"),
'$advanced' => t("Advanced")
'$advanced' => t("Advanced"),
'$permissions' => t('Permissions'),
));

1
mod/hostxrd.php
View file

@ -25,7 +25,6 @@ function hostxrd_init(&$a) {
'$zot_post' => z_root() . '/post',
'$bigkey' => salmon_key(get_config('system','site_pubkey')),
));
session_write_close();
exit();
}

2
mod/notifications.php
View file

@ -285,7 +285,7 @@ function notifications_content(&$a) {
'$item_label' => $it['label'],
'$item_link' => $it['link'],
'$item_image' => $it['image'],
'$item_text' => $it['text'],
'$item_text' => htmlentities($it['text']),
'$item_when' => $it['when'],
'$item_seen' => $it['seen'],
));

209
mod/ping.php
View file

@ -4,22 +4,18 @@ require_once('include/bbcode.php');
require_once('include/ForumManager.php');
require_once('include/group.php');
require_once("mod/proxy.php");
require_once('include/xml.php');
function ping_init(&$a) {
header("Content-type: text/xml");
echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
<result>";
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
if(local_user()){
$xmlhead = "<"."?xml version='1.0' encoding='UTF-8' ?".">";
if (local_user()){
// Different login session than the page that is calling us.
if(intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
echo '<invalid>1</invalid></result>';
if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
$data = array("invalid" => 1);
header("Content-type: text/xml");
echo xml::from_array(array("result" => $data), $xml);
killme();
}
@ -51,14 +47,14 @@ function ping_init(&$a) {
intval(local_user()), intval(local_user())
);
if(dbm::is_result($r)) {
if (dbm::is_result($r)) {
$arr = array('items' => $r);
call_hooks('network_ping', $arr);
foreach ($r as $it) {
if($it['wall'])
if ($it['wall'])
$home ++;
else
$network ++;
@ -84,20 +80,20 @@ function ping_init(&$a) {
if ($it['parent']!=$it['id']) {
$comments[] = $it;
} else {
if(! $it['wall'])
if (!$it['wall'])
$posts[] = $it;
}
}
}
}
if($network) {
if(intval(feature_enabled(local_user(),'groups'))) {
if ($network) {
if (intval(feature_enabled(local_user(),'groups'))) {
// Find out how unseen network posts are spread across groups
$groups_unseen = groups_count_unseen();
}
if(intval(feature_enabled(local_user(),'forumlist_widget'))) {
if (intval(feature_enabled(local_user(),'forumlist_widget'))) {
$forums_unseen = ForumManager::count_unseen_items();
}
}
@ -128,7 +124,7 @@ function ping_init(&$a) {
if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
if($regs)
if ($regs)
$register = $regs[0]['total'];
} else {
$register = "0";
@ -150,23 +146,23 @@ function ping_init(&$a) {
dbesc(datetime_convert('UTC','UTC','now'))
);
if(dbm::is_result($ev)) {
if (dbm::is_result($ev)) {
$all_events = intval($ev[0]['total']);
if($all_events) {
if ($all_events) {
$str_now = datetime_convert('UTC',$a->timezone,'now','Y-m-d');
foreach($ev as $x) {
$bd = false;
if($x['type'] === 'birthday') {
if ($x['type'] === 'birthday') {
$birthdays ++;
$bd = true;
}
else {
$events ++;
}
if(datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) {
if (datetime_convert('UTC',((intval($x['adjust'])) ? $a->timezone : 'UTC'), $x['start'],'Y-m-d') === $str_now) {
$all_events_today ++;
if($bd)
if ($bd)
$birthdays_today ++;
else
$events_today ++;
@ -175,92 +171,58 @@ function ping_init(&$a) {
}
}
$data = array();
$data["intro"] = $intro;
$data["mail"] = $mail;
$data["net"] = $network;
$data["home"] = $home;
/**
* return xml from notification array
*
* @param array $n Notification array:
* 'href' => notification link
* 'name' => subject name
* 'url' => subject url
* 'photo' => subject photo
* 'date' => notification date
* 'seen' => bool true/false
* 'message' => notification message. "{0}" will be replaced by subject name
**/
function xmlize($n){
if ($register!=0)
$data["register"] = $register;
$contact = get_contact_details_by_url($n['url']);
if (isset($contact["micro"]))
$n['photo'] = proxy_url($contact["micro"], false, PROXY_SIZE_MICRO);
else
$n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
$groups = array();
$n['message'] = html_entity_decode($n['message'], ENT_COMPAT | ENT_HTML401, "UTF-8");
$n['name'] = html_entity_decode($n['name'], ENT_COMPAT | ENT_HTML401, "UTF-8");
// Are the nofications calles from the regular process or via the friendica app?
$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
$a = get_app();
if ($a->is_friendica_app() OR !$regularnotifications)
$n['message'] = str_replace("{0}", $n['name'], $n['message']);
$local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
call_hooks('ping_xmlize', $n);
$notsxml = '<note id="%d" href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" timestamp="%s" >%s</note>'."\n";
return sprintf ( $notsxml, intval($n['id']),
xmlify($n['href']), xmlify(xmlify($n['name'])), xmlify($n['url']), xmlify($n['photo']),
xmlify(relative_date($n['date'])), xmlify($n['seen']), xmlify(strtotime($local_time)),
xmlify($n['message'])
);
}
echo "<intro>$intro</intro>
<mail>$mail</mail>
<net>$network</net>
<home>$home</home>\r\n";
if ($register!=0) echo "<register>$register</register>";
if ( dbm::is_result($groups_unseen) ) {
echo '<groups>';
if (dbm::is_result($groups_unseen)) {
$count = 0;
foreach ($groups_unseen as $it)
if ($it['count'] > 0)
echo '<group id="'.$it['id'].'">'.$it['count']."</group>";
echo "</groups>";
if ($it['count'] > 0) {
$count++;
$groups[$count.":group"] = $it['count'];
$groups[$count.":@attributes"] = array("id" => $it['id']);
}
$data["groups"] = $groups;
}
if ( dbm::is_result($forums_unseen) ) {
echo '<forums>';
$forums = array();
if (dbm::is_result($forums_unseen)) {
$count = 0;
foreach ($forums_unseen as $it)
if ($it['count'] > 0)
echo '<forum id="'.$it['id'].'">'.$it['count']."</forum>";
echo "</forums>";
if ($it['count'] > 0) {
$count++;
$forums[$count.":forum"] = $it['count'];
$forums[$count.":@attributes"] = array("id" => $it['id']);
}
$data["forums"] = $forums;
}
echo "<all-events>$all_events</all-events>
<all-events-today>$all_events_today</all-events-today>
<events>$events</events>
<events-today>$events_today</events-today>
<birthdays>$birthdays</birthdays>
<birthdays-today>$birthdays_today</birthdays-today>\r\n";
$data["all-events"] = $all_events;
$data["all-events-today"] = $all_events_today;
$data["events"] = $events;
$data["events-today"] = $events_today;
$data["birthdays"] = $birthdays;
$data["birthdays-today"] = $birthdays_today;
if (dbm::is_result($notifs) && (! $sysnotify)) {
if (dbm::is_result($notifs) && !$sysnotify) {
foreach ($notifs as $zz) {
if($zz['seen'] == 0)
if ($zz['seen'] == 0)
$sysnotify ++;
}
}
echo ' <notif count="'. ($sysnotify + $intro + $mail + $register) .'">';
// merge all notification types in one array
if ( dbm::is_result($intros) ) {
if (dbm::is_result($intros)) {
foreach ($intros as $i) {
$n = array(
'href' => $a->get_baseurl().'/notifications/intros/'.$i['id'],
@ -275,7 +237,7 @@ function ping_init(&$a) {
}
}
if ( dbm::is_result($mails) ) {
if (dbm::is_result($mails)) {
foreach ($mails as $i) {
$n = array(
'href' => $a->get_baseurl().'/message/'.$i['id'],
@ -290,7 +252,7 @@ function ping_init(&$a) {
}
}
if ( dbm::is_result($regs) ) {
if (dbm::is_result($regs)) {
foreach ($regs as $i) {
$n = array(
'href' => $a->get_baseurl().'/admin/users/',
@ -316,34 +278,69 @@ function ping_init(&$a) {
};
usort($notifs, $sort_function);
if( dbm::is_result($notifs) ) {
if (dbm::is_result($notifs)) {
// Are the nofications calles from the regular process or via the friendica app?
$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
$count = 0;
foreach($notifs as $n) {
echo xmlize($n);
$count++;
if ($a->is_friendica_app() OR !$regularnotifications)
$n['message'] = str_replace("{0}", $n['name'], $n['message']);
$notifications[$count.":note"] = $n['message'];
$contact = get_contact_details_by_url($n['url']);
if (isset($contact["micro"]))
$n['photo'] = proxy_url($contact["micro"], false, PROXY_SIZE_MICRO);
else
$n['photo'] = proxy_url($n['photo'], false, PROXY_SIZE_MICRO);
$local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
call_hooks('ping_xmlize', $n);
$notifications[$count.":@attributes"] = array("id" => $n["id"],
"href" => $n['href'],
"name" => $n['name'],
"url" => $n['url'],
"photo" => $n['photo'],
"date" => relative_date($n['date']),
"seen" => $n['seen'],
"timestamp" => strtotime($local_time));
}
}
echo " </notif>";
$data["notif"] = $notifications;
$data["@attributes"] = array("count" => $sysnotify + $intro + $mail + $register);
}
echo " <sysmsgs>";
if(x($_SESSION,'sysmsg')){
$sysmsg = array();
if (x($_SESSION,'sysmsg')){
$count = 0;
foreach ($_SESSION['sysmsg'] as $m){
echo "<notice>".xmlify($m)."</notice>";
$count++;
$sysmsg[$count.":notice"] = $m;
}
unset($_SESSION['sysmsg']);
}
if(x($_SESSION,'sysmsg_info')){
if (x($_SESSION,'sysmsg_info')){
$count = 0;
foreach ($_SESSION['sysmsg_info'] as $m){
echo "<info>".xmlify($m)."</info>";
$count++;
$sysmsg[$count.":info"] = $m;
}
unset($_SESSION['sysmsg_info']);
}
echo " </sysmsgs>";
echo"</result>
";
$data["sysmsgs"] = $sysmsg;
header("Content-type: text/xml");
echo xml::from_array(array("result" => $data), $xml);
killme();
}

24
object/Item.php
View file

@ -89,14 +89,14 @@ class Item extends BaseObject {
$a = $this->get_app();
$item = $this->get_data();
$edited = false;
if (strcmp($item['created'], $item['edited'])<>0) {
$edited = array(
'label' => t('This entry was edited'),
'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
'relative' => relative_date($item['edited'])
);
}
$edited = false;
if (strcmp($item['created'], $item['edited'])<>0) {
$edited = array(
'label' => t('This entry was edited'),
'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
'relative' => relative_date($item['edited'])
);
}
$commentww = '';
$sparkle = '';
$buttons = '';
@ -439,10 +439,10 @@ class Item extends BaseObject {
}
}
if ($this->is_toplevel()) {
$result['total_comments_num'] = "$total_children";
$result['total_comments_text'] = tt('comment', 'comments', $total_children);
}
if ($this->is_toplevel()) {
$result['total_comments_num'] = "$total_children";
$result['total_comments_text'] = tt('comment', 'comments', $total_children);
}
$result['private'] = $item['private'];
$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');

2
update.php
View file

@ -1,6 +1,6 @@
<?php
define('UPDATE_VERSION' , 1200);
define('UPDATE_VERSION' , 1202);
/**
*

5
util/credits.txt
View file

@ -17,13 +17,16 @@ aweiher
axelt
balderino
Beanow
Beatriz Vital
Ben Roberts
ben-utzer
bufalo1973
Calango Jr
Carlos Solís
Carsten Pfeiffer
Cat Gray
Chris Case
Christian González
Christian M. Grube
Christian Vogeley
Cohan Robinson
@ -72,6 +75,7 @@ Hubert Kościański
Jak
Jakob
jensp
Jeroen S
jeroenpraat
Johannes Schwab
John Brazil
@ -160,6 +164,7 @@ tomamplius
tomtom84
Tony Baldwin
TORminator
trebor
tschlotfeldt
Tubuntu
Tupambae.org

2
util/make_credits.py
View file

@ -23,7 +23,7 @@ import os, glob, subprocess
# not work in some cases.
dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m',
'leberwurscht', 'abinoam', 'fabrixxm', 'FULL NAME', 'Hauke Zuehl',
'Michal Supler', 'michal_s', 'Manuel Pérez']
'Michal Supler', 'michal_s', 'Manuel Pérez', 'rabuzarus']
# this script is in the /util sub-directory of the friendica installation

1623
view/de/messages.po
View file

@ -35,9 +35,9 @@ msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-04 09:06+0200\n"
"PO-Revision-Date: 2016-08-04 09:25+0000\n"
"Last-Translator: Andreas H.\n"
"POT-Creation-Date: 2016-08-09 18:10+0200\n"
"PO-Revision-Date: 2016-08-10 10:19+0000\n"
"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -238,7 +238,7 @@ msgstr[1] "%d gemeinsame Kontakte"
#: include/contact_widgets.php:242 include/ForumManager.php:119
#: include/items.php:2122 mod/content.php:624 object/Item.php:432
#: view/theme/vier/theme.php:260 boot.php:900
#: view/theme/vier/theme.php:260 boot.php:903
msgid "show more"
msgstr "mehr anzeigen"
@ -548,11 +548,6 @@ msgstr "Foren"
msgid "External link to forum"
msgstr "Externer Link zum Forum"
#: include/dba.php:56 include/dba_pdo.php:72
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."
#: include/event.php:16 include/bb2diaspora.php:148 mod/localtime.php:12
msgid "l F d, Y \\@ g:i A"
msgstr "l, d. F Y\\, H:i"
@ -566,8 +561,8 @@ msgid "Finishes:"
msgstr "Endet:"
#: include/event.php:39 include/event.php:63 include/bb2diaspora.php:170
#: include/identity.php:329 mod/directory.php:145 mod/notifications.php:208
#: mod/contacts.php:628 mod/events.php:495
#: include/identity.php:329 mod/directory.php:145 mod/contacts.php:628
#: mod/events.php:495 mod/notifications.php:232
msgid "Location:"
msgstr "Ort:"
@ -1024,6 +1019,11 @@ msgstr "$1 hat geschrieben:"
msgid "Encrypted content"
msgstr "Verschlüsselter Inhalt"
#: include/dba_pdo.php:72 include/dba.php:56
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."
#: include/auth.php:45
msgid "Logged out."
msgstr "Abgemeldet."
@ -1174,11 +1174,11 @@ msgid "An error occurred creating your default profile. Please try again."
msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
#: include/user.php:345 include/user.php:352 include/user.php:359
#: mod/photos.php:79 mod/photos.php:193 mod/photos.php:770 mod/photos.php:1233
#: mod/photos.php:1256 mod/photos.php:1850 mod/profile_photo.php:74
#: mod/profile_photo.php:81 mod/profile_photo.php:88 mod/profile_photo.php:210
#: mod/profile_photo.php:302 mod/profile_photo.php:311
#: view/theme/diabook/theme.php:500
#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
#: mod/profile_photo.php:210 mod/profile_photo.php:302
#: mod/profile_photo.php:311 mod/photos.php:79 mod/photos.php:193
#: mod/photos.php:770 mod/photos.php:1233 mod/photos.php:1256
#: mod/photos.php:1849 view/theme/diabook/theme.php:500
msgid "Profile Photos"
msgstr "Profilbilder"
@ -1441,7 +1441,7 @@ msgstr "Bereinige Benachrichtigungen"
msgid "@name, !forum, #tags, content"
msgstr "@name, !forum, #tags, content"
#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1652
#: include/nav.php:75 view/theme/frio/theme.php:243 boot.php:1655
msgid "Logout"
msgstr "Abmelden"
@ -1510,7 +1510,7 @@ msgstr "Persönliche Notizen"
msgid "Your personal notes"
msgstr "Deine persönlichen Notizen"
#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1653
#: include/nav.php:94 mod/bookmarklet.php:12 boot.php:1656
msgid "Login"
msgstr "Anmeldung"
@ -1518,8 +1518,8 @@ msgstr "Anmeldung"
msgid "Sign in"
msgstr "Anmelden"
#: include/nav.php:107 include/nav.php:163 mod/notifications.php:545
#: view/theme/diabook/theme.php:123
#: include/nav.php:107 include/nav.php:163
#: include/NotificationsManager.php:174 view/theme/diabook/theme.php:123
msgid "Home"
msgstr "Pinnwand"
@ -1527,7 +1527,7 @@ msgstr "Pinnwand"
msgid "Home Page"
msgstr "Homepage"
#: include/nav.php:111 mod/register.php:280 boot.php:1628
#: include/nav.php:111 mod/register.php:280 boot.php:1631
msgid "Register"
msgstr "Registrieren"
@ -1608,7 +1608,7 @@ msgstr "Information"
msgid "Information about this friendica instance"
msgstr "Informationen zu dieser Friendica Instanz"
#: include/nav.php:160 mod/notifications.php:533 mod/admin.php:402
#: include/nav.php:160 include/NotificationsManager.php:160 mod/admin.php:402
#: view/theme/frio/theme.php:253
msgid "Network"
msgstr "Netzwerk"
@ -1625,7 +1625,7 @@ msgstr "Netzwerk zurücksetzen"
msgid "Load Network page with no filters"
msgstr "Netzwerk-Seite ohne Filter laden"
#: include/nav.php:168 mod/notifications.php:551
#: include/nav.php:168 include/NotificationsManager.php:181
msgid "Introductions"
msgstr "Kontaktanfragen"
@ -1633,7 +1633,7 @@ msgstr "Kontaktanfragen"
msgid "Friend Requests"
msgstr "Kontaktanfragen"
#: include/nav.php:171 mod/notifications.php:87
#: include/nav.php:171 mod/notifications.php:96
msgid "Notifications"
msgstr "Benachrichtigungen"
@ -1915,39 +1915,39 @@ msgstr "Nachricht/Beitrag"
msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1635
#: mod/profiles.php:345
#: include/conversation.php:587 mod/content.php:372 mod/profiles.php:345
#: mod/photos.php:1634
msgid "Likes"
msgstr "Likes"
#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1635
#: mod/profiles.php:349
#: include/conversation.php:587 mod/content.php:372 mod/profiles.php:349
#: mod/photos.php:1634
msgid "Dislikes"
msgstr "Dislikes"
#: include/conversation.php:588 include/conversation.php:1471
#: mod/content.php:373 mod/photos.php:1636
#: mod/content.php:373 mod/photos.php:1635
msgid "Attending"
msgid_plural "Attending"
msgstr[0] "Teilnehmend"
msgstr[1] "Teilnehmend"
#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1636
#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1635
msgid "Not attending"
msgstr "Nicht teilnehmend"
#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1636
#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1635
msgid "Might attend"
msgstr "Eventuell teilnehmend"
#: include/conversation.php:710 mod/content.php:453 mod/content.php:758
#: mod/photos.php:1710 object/Item.php:133
#: mod/photos.php:1709 object/Item.php:133
msgid "Select"
msgstr "Auswählen"
#: include/conversation.php:711 mod/group.php:171 mod/content.php:454
#: mod/content.php:759 mod/admin.php:1391 mod/contacts.php:806
#: mod/contacts.php:1021 mod/photos.php:1711 mod/settings.php:726
#: mod/contacts.php:1021 mod/settings.php:726 mod/photos.php:1710
#: object/Item.php:134
msgid "Delete"
msgstr "Löschen"
@ -1979,7 +1979,7 @@ msgstr "Im Zusammenhang betrachten"
#: include/conversation.php:793 include/conversation.php:1255
#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
#: mod/message.php:548 mod/content.php:515 mod/content.php:948
#: mod/photos.php:1598 object/Item.php:406
#: mod/photos.php:1597 object/Item.php:406
msgid "Please wait"
msgstr "Bitte warten"
@ -2145,7 +2145,7 @@ msgstr "Wo hältst Du Dich jetzt gerade auf?"
msgid "Delete item(s)?"
msgstr "Einträge löschen?"
#: include/conversation.php:1236 mod/photos.php:1597
#: include/conversation.php:1236 mod/photos.php:1596
msgid "Share"
msgstr "Teilen"
@ -2228,17 +2228,17 @@ msgid "Public post"
msgstr "Öffentlicher Beitrag"
#: include/conversation.php:1270 mod/editpost.php:145 mod/content.php:737
#: mod/events.php:505 mod/photos.php:1619 mod/photos.php:1667
#: mod/photos.php:1755 object/Item.php:729
#: mod/events.php:505 mod/photos.php:1618 mod/photos.php:1666
#: mod/photos.php:1754 object/Item.php:729
msgid "Preview"
msgstr "Vorschau"
#: include/conversation.php:1274 include/items.php:1849 mod/fbrowser.php:101
#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
#: mod/suggest.php:32 mod/editpost.php:148 mod/message.php:220
#: mod/dfrn_request.php:875 mod/contacts.php:445 mod/photos.php:248
#: mod/photos.php:337 mod/settings.php:664 mod/settings.php:690
#: mod/videos.php:131
#: mod/dfrn_request.php:875 mod/contacts.php:445 mod/settings.php:664
#: mod/settings.php:690 mod/videos.php:131 mod/photos.php:248
#: mod/photos.php:337
msgid "Cancel"
msgstr "Abbrechen"
@ -2356,7 +2356,7 @@ msgstr "Cc: E-Mail-Addressen"
msgid "Example: bob@example.com, mary@example.com"
msgstr "Z.B.: bob@example.com, mary@example.com"
#: include/acl_selectors.php:349 mod/photos.php:1178 mod/photos.php:1563
#: include/acl_selectors.php:349 mod/photos.php:1178 mod/photos.php:1562
msgid "Permissions"
msgstr "Berechtigungen"
@ -2495,13 +2495,13 @@ msgstr "Sichtbarkeit bearbeiten"
#: mod/viewcontacts.php:105 mod/allfriends.php:79 mod/cal.php:44
#: mod/suggest.php:98 mod/hovercard.php:80 mod/common.php:123
#: mod/network.php:517 mod/contacts.php:51 mod/contacts.php:626
#: mod/contacts.php:953 mod/dirfind.php:223 mod/photos.php:42
#: mod/videos.php:37
#: mod/contacts.php:953 mod/dirfind.php:223 mod/videos.php:37
#: mod/photos.php:42
msgid "Forum"
msgstr "Forum"
#: include/identity.php:331 include/identity.php:614 mod/directory.php:147
#: mod/notifications.php:214
#: mod/notifications.php:238
msgid "Gender:"
msgstr "Geschlecht:"
@ -2514,11 +2514,11 @@ msgid "Homepage:"
msgstr "Homepage:"
#: include/identity.php:338 include/identity.php:655 mod/directory.php:153
#: mod/notifications.php:210 mod/contacts.php:630
#: mod/contacts.php:630 mod/notifications.php:234
msgid "About:"
msgstr "Über:"
#: include/identity.php:420 mod/notifications.php:222 mod/contacts.php:50
#: include/identity.php:420 mod/contacts.php:50 mod/notifications.php:246
msgid "Network:"
msgstr "Netzwerk:"
@ -2583,8 +2583,8 @@ msgstr "Sexuelle Vorlieben:"
msgid "Hometown:"
msgstr "Heimatort:"
#: include/identity.php:649 mod/follow.php:134 mod/notifications.php:212
#: mod/contacts.php:632
#: include/identity.php:649 mod/follow.php:134 mod/contacts.php:632
#: mod/notifications.php:236
msgid "Tags:"
msgstr "Tags:"
@ -2709,13 +2709,14 @@ msgstr "Ja"
#: mod/wallmessage.php:79 mod/wallmessage.php:103 mod/api.php:26
#: mod/api.php:31 mod/ostatus_subscribe.php:9 mod/message.php:46
#: mod/message.php:182 mod/manage.php:96 mod/crepair.php:100
#: mod/notifications.php:65 mod/contacts.php:350 mod/dfrn_confirm.php:57
#: mod/dirfind.php:11 mod/events.php:190 mod/fsuggest.php:78 mod/item.php:185
#: mod/item.php:197 mod/mood.php:114 mod/photos.php:172 mod/photos.php:1093
#: mod/poke.php:150 mod/profile_photo.php:19 mod/profile_photo.php:175
#: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/profiles.php:166
#: mod/profiles.php:598 mod/register.php:42 mod/regmod.php:110
#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:650 index.php:397
#: mod/contacts.php:350 mod/dfrn_confirm.php:57 mod/dirfind.php:11
#: mod/events.php:190 mod/fsuggest.php:78 mod/item.php:185 mod/item.php:197
#: mod/mood.php:114 mod/poke.php:150 mod/profile_photo.php:19
#: mod/profile_photo.php:175 mod/profile_photo.php:186
#: mod/profile_photo.php:199 mod/profiles.php:166 mod/profiles.php:598
#: mod/register.php:42 mod/regmod.php:110 mod/settings.php:22
#: mod/settings.php:128 mod/settings.php:650 mod/notifications.php:71
#: mod/photos.php:172 mod/photos.php:1093 index.php:397
msgid "Permission denied."
msgstr "Zugriff verweigert."
@ -3008,6 +3009,67 @@ msgstr[1] "%d Kontakte nicht importiert"
msgid "Done. You can now login with your username and password"
msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"
#: include/NotificationsManager.php:153
msgid "System"
msgstr "System"
#: include/NotificationsManager.php:167 mod/network.php:844
#: mod/profiles.php:696
msgid "Personal"
msgstr "Persönlich"
#: include/NotificationsManager.php:234 include/NotificationsManager.php:245
#, php-format
msgid "%s commented on %s's post"
msgstr "%s hat %ss Beitrag kommentiert"
#: include/NotificationsManager.php:244
#, php-format
msgid "%s created a new post"
msgstr "%s hat einen neuen Beitrag erstellt"
#: include/NotificationsManager.php:258
#, php-format
msgid "%s liked %s's post"
msgstr "%s mag %ss Beitrag"
#: include/NotificationsManager.php:269
#, php-format
msgid "%s disliked %s's post"
msgstr "%s mag %ss Beitrag nicht"
#: include/NotificationsManager.php:280
#, php-format
msgid "%s is attending %s's event"
msgstr "%s nimmt an %s's Event teil"
#: include/NotificationsManager.php:291
#, php-format
msgid "%s is not attending %s's event"
msgstr "%s nimmt nicht an %s's Event teil"
#: include/NotificationsManager.php:302
#, php-format
msgid "%s may attend %s's event"
msgstr "%s nimmt eventuell an %s's Event teil"
#: include/NotificationsManager.php:317
#, php-format
msgid "%s is now friends with %s"
msgstr "%s ist jetzt mit %s befreundet"
#: include/NotificationsManager.php:750
msgid "Friend Suggestion"
msgstr "Kontaktvorschlag"
#: include/NotificationsManager.php:783
msgid "Friend/Connect Request"
msgstr "Kontakt-/Freundschaftsanfrage"
#: include/NotificationsManager.php:783
msgid "New Follower"
msgstr "Neuer Bewunderer"
#: mod/oexchange.php:25
msgid "Post successful."
msgstr "Beitrag erfolgreich veröffentlicht."
@ -3027,11 +3089,11 @@ msgstr "Zugriff verweigert."
msgid "Welcome to %s"
msgstr "Willkommen zu %s"
#: mod/notify.php:60 mod/notifications.php:338
#: mod/notify.php:60
msgid "No more system notifications."
msgstr "Keine weiteren Systembenachrichtigungen."
#: mod/notify.php:64 mod/notifications.php:318
#: mod/notify.php:64 mod/notifications.php:111
msgid "System Notifications"
msgstr "Systembenachrichtigungen"
@ -3041,7 +3103,7 @@ msgstr "Begriff entfernen"
#: mod/search.php:93 mod/search.php:99 mod/directory.php:37
#: mod/viewcontacts.php:35 mod/display.php:199 mod/community.php:22
#: mod/dfrn_request.php:790 mod/photos.php:964 mod/videos.php:197
#: mod/dfrn_request.php:790 mod/videos.php:197 mod/photos.php:964
msgid "Public access denied."
msgstr "Öffentlicher Zugriff verweigert."
@ -3159,7 +3221,7 @@ msgid ""
"Password reset failed."
msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
#: mod/lostpass.php:109 boot.php:1667
#: mod/lostpass.php:109 boot.php:1670
msgid "Password Reset"
msgstr "Passwort zurücksetzen"
@ -3225,7 +3287,7 @@ msgid ""
"your email for further instructions."
msgstr "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet."
#: mod/lostpass.php:161 boot.php:1655
#: mod/lostpass.php:161 boot.php:1658
msgid "Nickname or Email: "
msgstr "Spitzname oder E-Mail:"
@ -3256,16 +3318,16 @@ msgstr "Seite nicht gefunden."
msgid "Invalid request."
msgstr "Ungültige Anfrage"
#: mod/wall_upload.php:151 mod/photos.php:806 mod/profile_photo.php:150
#: mod/wall_upload.php:151 mod/profile_photo.php:150 mod/photos.php:806
#, php-format
msgid "Image exceeds size limit of %s"
msgstr "Bildgröße überschreitet das Limit von %s"
#: mod/wall_upload.php:188 mod/photos.php:846 mod/profile_photo.php:159
#: mod/wall_upload.php:188 mod/profile_photo.php:159 mod/photos.php:846
msgid "Unable to process image."
msgstr "Konnte das Bild nicht bearbeiten."
#: mod/wall_upload.php:221 mod/photos.php:873 mod/profile_photo.php:307
#: mod/wall_upload.php:221 mod/profile_photo.php:307 mod/photos.php:873
msgid "Image upload failed."
msgstr "Hochladen des Bildes gescheitert."
@ -3500,24 +3562,23 @@ msgid ""
"important, please visit http://friendica.com"
msgstr "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com"
#: mod/invite.php:140 mod/install.php:272 mod/install.php:312
#: mod/localtime.php:45 mod/message.php:357 mod/message.php:547
#: mod/manage.php:143 mod/crepair.php:154 mod/content.php:728
#: mod/contacts.php:577 mod/events.php:507 mod/fsuggest.php:107
#: mod/mood.php:137 mod/photos.php:1125 mod/photos.php:1249
#: mod/photos.php:1567 mod/photos.php:1618 mod/photos.php:1666
#: mod/photos.php:1754 mod/poke.php:199 mod/profiles.php:681
#: object/Item.php:720 view/theme/frio/config.php:59
#: view/theme/cleanzero/config.php:80 view/theme/quattro/config.php:64
#: view/theme/dispy/config.php:70 view/theme/vier/config.php:107
#: view/theme/diabook/theme.php:633 view/theme/diabook/config.php:148
#: view/theme/duepuntozero/config.php:59
#: mod/invite.php:140 mod/localtime.php:45 mod/message.php:357
#: mod/message.php:547 mod/manage.php:143 mod/crepair.php:154
#: mod/content.php:728 mod/contacts.php:577 mod/events.php:507
#: mod/fsuggest.php:107 mod/mood.php:137 mod/poke.php:199 mod/profiles.php:681
#: mod/install.php:272 mod/install.php:312 mod/photos.php:1125
#: mod/photos.php:1249 mod/photos.php:1566 mod/photos.php:1617
#: mod/photos.php:1665 mod/photos.php:1753 object/Item.php:720
#: view/theme/frio/config.php:59 view/theme/cleanzero/config.php:80
#: view/theme/quattro/config.php:64 view/theme/dispy/config.php:70
#: view/theme/vier/config.php:107 view/theme/diabook/theme.php:633
#: view/theme/diabook/config.php:148 view/theme/duepuntozero/config.php:59
msgid "Submit"
msgstr "Senden"
#: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:63
#: mod/photos.php:193 mod/photos.php:1107 mod/photos.php:1233
#: mod/photos.php:1256 mod/photos.php:1826 mod/photos.php:1838
#: mod/photos.php:1256 mod/photos.php:1825 mod/photos.php:1837
#: view/theme/diabook/theme.php:499
msgid "Contact Photos"
msgstr "Kontaktbilder"
@ -3619,7 +3680,7 @@ msgstr "Ansehen"
msgid "Previous"
msgstr "Vorherige"
#: mod/cal.php:281 mod/install.php:231 mod/events.php:383
#: mod/cal.php:281 mod/events.php:383 mod/install.php:231
msgid "Next"
msgstr "Nächste"
@ -3701,351 +3762,6 @@ msgstr "Friendica ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler
msgid "- select -"
msgstr "- auswählen -"
#: mod/install.php:139
msgid "Friendica Communications Server - Setup"
msgstr "Friendica-Server für soziale Netzwerke – Setup"
#: mod/install.php:145
msgid "Could not connect to database."
msgstr "Verbindung zur Datenbank gescheitert."
#: mod/install.php:149
msgid "Could not create table."
msgstr "Tabelle konnte nicht angelegt werden."
#: mod/install.php:155
msgid "Your Friendica site database has been installed."
msgstr "Die Datenbank Deiner Friendicaseite wurde installiert."
#: mod/install.php:160
msgid ""
"You may need to import the file \"database.sql\" manually using phpmyadmin "
"or mysql."
msgstr "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."
#: mod/install.php:161 mod/install.php:230 mod/install.php:597
msgid "Please see the file \"INSTALL.txt\"."
msgstr "Lies bitte die \"INSTALL.txt\"."
#: mod/install.php:173
msgid "Database already in use."
msgstr "Die Datenbank wird bereits verwendet."
#: mod/install.php:227
msgid "System check"
msgstr "Systemtest"
#: mod/install.php:232
msgid "Check again"
msgstr "Noch einmal testen"
#: mod/install.php:251
msgid "Database connection"
msgstr "Datenbankverbindung"
#: mod/install.php:252
msgid ""
"In order to install Friendica we need to know how to connect to your "
"database."
msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können."
#: mod/install.php:253
msgid ""
"Please contact your hosting provider or site administrator if you have "
"questions about these settings."
msgstr "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."
#: mod/install.php:254
msgid ""
"The database you specify below should already exist. If it does not, please "
"create it before continuing."
msgstr "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst."
#: mod/install.php:258
msgid "Database Server Name"
msgstr "Datenbank-Server"
#: mod/install.php:259
msgid "Database Login Name"
msgstr "Datenbank-Nutzer"
#: mod/install.php:260
msgid "Database Login Password"
msgstr "Datenbank-Passwort"
#: mod/install.php:261
msgid "Database Name"
msgstr "Datenbank-Name"
#: mod/install.php:262 mod/install.php:303
msgid "Site administrator email address"
msgstr "E-Mail-Adresse des Administrators"
#: mod/install.php:262 mod/install.php:303
msgid ""
"Your account email address must match this in order to use the web admin "
"panel."
msgstr "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst."
#: mod/install.php:266 mod/install.php:306
msgid "Please select a default timezone for your website"
msgstr "Bitte wähle die Standardzeitzone Deiner Webseite"
#: mod/install.php:293
msgid "Site settings"
msgstr "Server-Einstellungen"
#: mod/install.php:307
msgid "System Language:"
msgstr "Systemsprache:"
#: mod/install.php:307
msgid ""
"Set the default language for your Friendica installation interface and to "
"send emails."
msgstr "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand"
#: mod/install.php:347
msgid "Could not find a command line version of PHP in the web server PATH."
msgstr "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."
#: mod/install.php:348
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='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
"up-the-poller'>'Setup the poller'</a>"
msgstr "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"
#: mod/install.php:352
msgid "PHP executable path"
msgstr "Pfad zu PHP"
#: mod/install.php:352
msgid ""
"Enter full path to php executable. You can leave this blank to continue the "
"installation."
msgstr "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."
#: mod/install.php:357
msgid "Command line PHP"
msgstr "Kommandozeilen-PHP"
#: mod/install.php:366
msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
msgstr "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)"
#: mod/install.php:367
msgid "Found PHP version: "
msgstr "Gefundene PHP Version:"
#: mod/install.php:369
msgid "PHP cli binary"
msgstr "PHP CLI Binary"
#: mod/install.php:380
msgid ""
"The command line version of PHP on your system does not have "
"\"register_argc_argv\" enabled."
msgstr "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert."
#: mod/install.php:381
msgid "This is required for message delivery to work."
msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
#: mod/install.php:383
msgid "PHP register_argc_argv"
msgstr "PHP register_argc_argv"
#: mod/install.php:404
msgid ""
"Error: the \"openssl_pkey_new\" function on this system is not able to "
"generate encryption keys"
msgstr "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"
#: mod/install.php:405
msgid ""
"If running under Windows, please see "
"\"http://www.php.net/manual/en/openssl.installation.php\"."
msgstr "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."
#: mod/install.php:407
msgid "Generate encryption keys"
msgstr "Schlüssel erzeugen"
#: mod/install.php:414
msgid "libCurl PHP module"
msgstr "PHP: libCurl-Modul"
#: mod/install.php:415
msgid "GD graphics PHP module"
msgstr "PHP: GD-Grafikmodul"
#: mod/install.php:416
msgid "OpenSSL PHP module"
msgstr "PHP: OpenSSL-Modul"
#: mod/install.php:417
msgid "mysqli PHP module"
msgstr "PHP: mysqli-Modul"
#: mod/install.php:418
msgid "mb_string PHP module"
msgstr "PHP: mb_string-Modul"
#: mod/install.php:419
msgid "mcrypt PHP module"
msgstr "PHP mcrypt Modul"
#: mod/install.php:420
msgid "XML PHP module"
msgstr "XML PHP Modul"
#: mod/install.php:424 mod/install.php:426
msgid "Apache mod_rewrite module"
msgstr "Apache mod_rewrite module"
#: mod/install.php:424
msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed."
msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."
#: mod/install.php:432
msgid "Error: libCURL PHP module required but not installed."
msgstr "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."
#: mod/install.php:436
msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed."
msgstr "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."
#: mod/install.php:440
msgid "Error: openssl PHP module required but not installed."
msgstr "Fehler: Das openssl-Modul von PHP ist nicht installiert."
#: mod/install.php:444
msgid "Error: mysqli PHP module required but not installed."
msgstr "Fehler: Das mysqli-Modul von PHP ist nicht installiert."
#: mod/install.php:448
msgid "Error: mb_string PHP module required but not installed."
msgstr "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert."
#: mod/install.php:452
msgid "Error: mcrypt PHP module required but not installed."
msgstr "Fehler: Das mcrypt Modul von PHP ist nicht installiert"
#: mod/install.php:461
msgid ""
"If you are using php_cli, please make sure that mcrypt module is enabled in "
"its config file"
msgstr "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. "
#: mod/install.php:464
msgid ""
"Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 "
"encryption layer."
msgstr "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren."
#: mod/install.php:466
msgid "mcrypt_create_iv() function"
msgstr "mcrypt_create_iv() function"
#: mod/install.php:474
msgid "Error, XML PHP module required but not installed."
msgstr "Fehler: XML PHP Modul erforderlich aber nicht installiert."
#: mod/install.php:489
msgid ""
"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."
msgstr "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun."
#: mod/install.php:490
msgid ""
"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."
msgstr "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast."
#: mod/install.php:491
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 "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst."
#: mod/install.php:492
msgid ""
"You can alternatively skip this procedure and perform a manual installation."
" Please see the file \"INSTALL.txt\" for instructions."
msgstr "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt."
#: mod/install.php:495
msgid ".htconfig.php is writable"
msgstr "Schreibrechte auf .htconfig.php"
#: mod/install.php:505
msgid ""
"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
"compiles templates to PHP to speed up rendering."
msgstr "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."
#: mod/install.php:506
msgid ""
"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 "
"folder."
msgstr "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."
#: mod/install.php:507
msgid ""
"Please ensure that the user that your web server runs as (e.g. www-data) has"
" write access to this folder."
msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."
#: mod/install.php:508
msgid ""
"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."
msgstr "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."
#: mod/install.php:511
msgid "view/smarty3 is writable"
msgstr "view/smarty3 ist schreibbar"
#: mod/install.php:527
msgid ""
"Url rewrite in .htaccess is not working. Check your server configuration."
msgstr "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers."
#: mod/install.php:529
msgid "Url rewrite is working"
msgstr "URL rewrite funktioniert"
#: mod/install.php:546
msgid "ImageMagick PHP extension is installed"
msgstr "ImageMagick PHP Erweiterung ist installiert"
#: mod/install.php:548
msgid "ImageMagick supports GIF"
msgstr "ImageMagick unterstützt GIF"
#: mod/install.php:556
msgid ""
"The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web "
"server root."
msgstr "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen."
#: mod/install.php:595
msgid "<h1>What next</h1>"
msgstr "<h1>Wie geht es weiter?</h1>"
#: mod/install.php:596
msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the "
"poller."
msgstr "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."
#: mod/subthread.php:103
#, php-format
msgid "%1$s is following %2$s's %3$s"
@ -4106,7 +3822,7 @@ msgstr "Eine persönliche Notiz beifügen:"
msgid "Your Identity Address:"
msgstr "Adresse Deines Profils:"
#: mod/follow.php:126 mod/notifications.php:219 mod/contacts.php:624
#: mod/follow.php:126 mod/contacts.php:624 mod/notifications.php:243
msgid "Profile URL"
msgstr "Profil URL"
@ -4396,10 +4112,6 @@ msgstr "Neueste Beiträge"
msgid "Sort by Post Date"
msgstr "Nach Beitragsdatum sortieren"
#: mod/network.php:844 mod/notifications.php:539 mod/profiles.php:696
msgid "Personal"
msgstr "Persönlich"
#: mod/network.php:847
msgid "Posts that mention or involve you"
msgstr "Beiträge, in denen es um Dich geht"
@ -5004,11 +4716,11 @@ msgid_plural "%d comments"
msgstr[0] "%d Kommentar"
msgstr[1] "%d Kommentare"
#: mod/content.php:638 mod/photos.php:1406 object/Item.php:117
#: mod/content.php:638 mod/photos.php:1405 object/Item.php:117
msgid "Private Message"
msgstr "Private Nachricht"
#: mod/content.php:702 mod/photos.php:1595 object/Item.php:263
#: mod/content.php:702 mod/photos.php:1594 object/Item.php:263
msgid "I like this (toggle)"
msgstr "Ich mag das (toggle)"
@ -5016,7 +4728,7 @@ msgstr "Ich mag das (toggle)"
msgid "like"
msgstr "mag ich"
#: mod/content.php:703 mod/photos.php:1596 object/Item.php:264
#: mod/content.php:703 mod/photos.php:1595 object/Item.php:264
msgid "I don't like this (toggle)"
msgstr "Ich mag das nicht (toggle)"
@ -5032,14 +4744,14 @@ msgstr "Weitersagen"
msgid "share"
msgstr "Teilen"
#: mod/content.php:725 mod/photos.php:1615 mod/photos.php:1663
#: mod/photos.php:1751 object/Item.php:717
#: mod/content.php:725 mod/photos.php:1614 mod/photos.php:1662
#: mod/photos.php:1750 object/Item.php:717
msgid "This is you"
msgstr "Das bist Du"
#: mod/content.php:727 mod/content.php:945 mod/photos.php:1617
#: mod/photos.php:1665 mod/photos.php:1753 object/Item.php:403
#: object/Item.php:719 boot.php:899
#: mod/content.php:727 mod/content.php:945 mod/photos.php:1616
#: mod/photos.php:1664 mod/photos.php:1752 object/Item.php:403
#: object/Item.php:719 boot.php:902
msgid "Comment"
msgstr "Kommentar"
@ -5140,165 +4852,6 @@ msgstr "Wall-to-Wall"
msgid "via Wall-To-Wall:"
msgstr "via Wall-To-Wall:"
#: mod/notifications.php:29
msgid "Invalid request identifier."
msgstr "Invalid request identifier."
#: mod/notifications.php:38 mod/notifications.php:143
#: mod/notifications.php:228
msgid "Discard"
msgstr "Verwerfen"
#: mod/notifications.php:54 mod/notifications.php:142
#: mod/notifications.php:227 mod/contacts.php:606 mod/contacts.php:804
#: mod/contacts.php:1005
msgid "Ignore"
msgstr "Ignorieren"
#: mod/notifications.php:91
msgid "Show Ignored Requests"
msgstr "Zeige ignorierte Anfragen"
#: mod/notifications.php:91
msgid "Hide Ignored Requests"
msgstr "Verberge ignorierte Anfragen"
#: mod/notifications.php:127 mod/notifications.php:198
msgid "Notification type: "
msgstr "Benachrichtigungstyp: "
#: mod/notifications.php:128
msgid "Friend Suggestion"
msgstr "Kontaktvorschlag"
#: mod/notifications.php:130
#, php-format
msgid "suggested by %s"
msgstr "vorgeschlagen von %s"
#: mod/notifications.php:135 mod/notifications.php:215 mod/contacts.php:613
msgid "Hide this contact from others"
msgstr "Verbirg diesen Kontakt vor andere"
#: mod/notifications.php:136 mod/notifications.php:216
msgid "Post a new friend activity"
msgstr "Neue-Kontakt Nachricht senden"
#: mod/notifications.php:136 mod/notifications.php:216
msgid "if applicable"
msgstr "falls anwendbar"
#: mod/notifications.php:139 mod/notifications.php:225 mod/admin.php:1389
msgid "Approve"
msgstr "Genehmigen"
#: mod/notifications.php:159
msgid "Claims to be known to you: "
msgstr "Behauptet Dich zu kennen: "
#: mod/notifications.php:160
msgid "yes"
msgstr "ja"
#: mod/notifications.php:160
msgid "no"
msgstr "nein"
#: mod/notifications.php:161
msgid ""
"Shall your connection be bidirectional or not? \"Friend\" implies that you "
"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that "
"you allow to read but you do not want to read theirs. Approve as: "
msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"
#: mod/notifications.php:164
msgid ""
"Shall your connection be bidirectional or not? \"Friend\" implies that you "
"allow to read and you subscribe to their posts. \"Sharer\" means that you "
"allow to read but you do not want to read theirs. Approve as: "
msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"
#: mod/notifications.php:172
msgid "Friend"
msgstr "Kontakt"
#: mod/notifications.php:173
msgid "Sharer"
msgstr "Teilenden"
#: mod/notifications.php:173
msgid "Fan/Admirer"
msgstr "Fan/Verehrer"
#: mod/notifications.php:199
msgid "Friend/Connect Request"
msgstr "Kontakt-/Freundschaftsanfrage"
#: mod/notifications.php:199
msgid "New Follower"
msgstr "Neuer Bewunderer"
#: mod/notifications.php:234
msgid "No introductions."
msgstr "Keine Kontaktanfragen."
#: mod/notifications.php:238
msgid "Network Notifications"
msgstr "Netzwerk Benachrichtigungen"
#: mod/notifications.php:265 mod/notifications.php:382
#: mod/notifications.php:461
#, php-format
msgid "%s liked %s's post"
msgstr "%s mag %ss Beitrag"
#: mod/notifications.php:275 mod/notifications.php:392
#: mod/notifications.php:471
#, php-format
msgid "%s disliked %s's post"
msgstr "%s mag %ss Beitrag nicht"
#: mod/notifications.php:290 mod/notifications.php:407
#: mod/notifications.php:486
#, php-format
msgid "%s is now friends with %s"
msgstr "%s ist jetzt mit %s befreundet"
#: mod/notifications.php:297 mod/notifications.php:414
#, php-format
msgid "%s created a new post"
msgstr "%s hat einen neuen Beitrag erstellt"
#: mod/notifications.php:298 mod/notifications.php:415
#: mod/notifications.php:496
#, php-format
msgid "%s commented on %s's post"
msgstr "%s hat %ss Beitrag kommentiert"
#: mod/notifications.php:313
msgid "No more network notifications."
msgstr "Keine weiteren Netzwerk-Benachrichtigungen."
#: mod/notifications.php:343
msgid "Personal Notifications"
msgstr "Persönliche Benachrichtigungen"
#: mod/notifications.php:430
msgid "No more personal notifications."
msgstr "Keine weiteren persönlichen Benachrichtigungen"
#: mod/notifications.php:435
msgid "Home Notifications"
msgstr "Pinnwand Benachrichtigungen"
#: mod/notifications.php:503
msgid "No more home notifications."
msgstr "Keine weiteren Pinnwand-Benachrichtigungen"
#: mod/notifications.php:527
msgid "System"
msgstr "System"
#: mod/admin.php:92
msgid "Theme settings updated."
msgstr "Themeneinstellungen aktualisiert."
@ -6488,6 +6041,10 @@ msgstr "Anfragedatum"
msgid "No registrations."
msgstr "Keine Neuanmeldungen."
#: mod/admin.php:1389 mod/notifications.php:176 mod/notifications.php:249
msgid "Approve"
msgstr "Genehmigen"
#: mod/admin.php:1390
msgid "Deny"
msgstr "Verwehren"
@ -6831,6 +6388,12 @@ msgstr "Jetzt aktualisieren"
msgid "Unignore"
msgstr "Ignorieren aufheben"
#: mod/contacts.php:606 mod/contacts.php:804 mod/contacts.php:1005
#: mod/notifications.php:60 mod/notifications.php:179
#: mod/notifications.php:251
msgid "Ignore"
msgstr "Ignorieren"
#: mod/contacts.php:610
msgid "Currently blocked"
msgstr "Derzeit geblockt"
@ -6843,6 +6406,10 @@ msgstr "Derzeit ignoriert"
msgid "Currently archived"
msgstr "Momentan archiviert"
#: mod/contacts.php:613 mod/notifications.php:172 mod/notifications.php:239
msgid "Hide this contact from others"
msgstr "Verbirg diesen Kontakt vor andere"
#: mod/contacts.php:613
msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
@ -7184,193 +6751,6 @@ msgstr "Stimmung"
msgid "Set your current mood and tell your friends"
msgstr "Wähle Deine aktuelle Stimmung und erzähle sie Deinen Kontakten"
#: mod/photos.php:101 mod/photos.php:1887
msgid "Recent Photos"
msgstr "Neueste Fotos"
#: mod/photos.php:104 mod/photos.php:1308 mod/photos.php:1889
msgid "Upload New Photos"
msgstr "Neue Fotos hochladen"
#: mod/photos.php:118 mod/settings.php:36
msgid "everybody"
msgstr "jeder"
#: mod/photos.php:182
msgid "Contact information unavailable"
msgstr "Kontaktinformationen nicht verfügbar"
#: mod/photos.php:203
msgid "Album not found."
msgstr "Album nicht gefunden."
#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1250
msgid "Delete Album"
msgstr "Album löschen"
#: mod/photos.php:243
msgid "Do you really want to delete this photo album and all its photos?"
msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?"
#: mod/photos.php:323 mod/photos.php:334 mod/photos.php:1568
msgid "Delete Photo"
msgstr "Foto löschen"
#: mod/photos.php:332
msgid "Do you really want to delete this photo?"
msgstr "Möchtest Du wirklich dieses Foto löschen?"
#: mod/photos.php:707
#, php-format
msgid "%1$s was tagged in %2$s by %3$s"
msgstr "%1$s wurde von %3$s in %2$s getaggt"
#: mod/photos.php:707
msgid "a photo"
msgstr "einem Foto"
#: mod/photos.php:814
msgid "Image file is empty."
msgstr "Bilddatei ist leer."
#: mod/photos.php:974
msgid "No photos selected"
msgstr "Keine Bilder ausgewählt"
#: mod/photos.php:1075 mod/videos.php:308
msgid "Access to this item is restricted."
msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
#: mod/photos.php:1135
#, php-format
msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers."
#: mod/photos.php:1170
msgid "Upload Photos"
msgstr "Bilder hochladen"
#: mod/photos.php:1174 mod/photos.php:1245
msgid "New album name: "
msgstr "Name des neuen Albums: "
#: mod/photos.php:1175
msgid "or existing album name: "
msgstr "oder existierender Albumname: "
#: mod/photos.php:1176
msgid "Do not show a status post for this upload"
msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
#: mod/photos.php:1187 mod/photos.php:1572 mod/settings.php:1250
msgid "Show to Groups"
msgstr "Zeige den Gruppen"
#: mod/photos.php:1188 mod/photos.php:1573 mod/settings.php:1251
msgid "Show to Contacts"
msgstr "Zeige den Kontakten"
#: mod/photos.php:1189
msgid "Private Photo"
msgstr "Privates Foto"
#: mod/photos.php:1190
msgid "Public Photo"
msgstr "Öffentliches Foto"
#: mod/photos.php:1258
msgid "Edit Album"
msgstr "Album bearbeiten"
#: mod/photos.php:1264
msgid "Show Newest First"
msgstr "Zeige neueste zuerst"
#: mod/photos.php:1266
msgid "Show Oldest First"
msgstr "Zeige älteste zuerst"
#: mod/photos.php:1294 mod/photos.php:1872
msgid "View Photo"
msgstr "Foto betrachten"
#: mod/photos.php:1341
msgid "Permission denied. Access to this item may be restricted."
msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."
#: mod/photos.php:1343
msgid "Photo not available"
msgstr "Foto nicht verfügbar"
#: mod/photos.php:1399
msgid "View photo"
msgstr "Fotos ansehen"
#: mod/photos.php:1399
msgid "Edit photo"
msgstr "Foto bearbeiten"
#: mod/photos.php:1400
msgid "Use as profile photo"
msgstr "Als Profilbild verwenden"
#: mod/photos.php:1425
msgid "View Full Size"
msgstr "Betrachte Originalgröße"
#: mod/photos.php:1511
msgid "Tags: "
msgstr "Tags: "
#: mod/photos.php:1514
msgid "[Remove any tag]"
msgstr "[Tag entfernen]"
#: mod/photos.php:1554
msgid "New album name"
msgstr "Name des neuen Albums"
#: mod/photos.php:1555
msgid "Caption"
msgstr "Bildunterschrift"
#: mod/photos.php:1556
msgid "Add a Tag"
msgstr "Tag hinzufügen"
#: mod/photos.php:1556
msgid ""
"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
#: mod/photos.php:1557
msgid "Do not rotate"
msgstr "Nicht rotieren"
#: mod/photos.php:1558
msgid "Rotate CW (right)"
msgstr "Drehen US (rechts)"
#: mod/photos.php:1559
msgid "Rotate CCW (left)"
msgstr "Drehen EUS (links)"
#: mod/photos.php:1574
msgid "Private photo"
msgstr "Privates Foto"
#: mod/photos.php:1575
msgid "Public photo"
msgstr "Öffentliches Foto"
#: mod/photos.php:1801
msgid "Map"
msgstr "Karte"
#: mod/photos.php:1878 mod/videos.php:390
msgid "View Album"
msgstr "Album betrachten"
#: mod/poke.php:192
msgid "Poke/Prod"
msgstr "Anstupsen"
@ -7836,6 +7216,10 @@ msgstr "Registrierung für %s wurde zurückgezogen"
msgid "Please login."
msgstr "Bitte melde Dich an."
#: mod/settings.php:36 mod/photos.php:118
msgid "everybody"
msgstr "jeder"
#: mod/settings.php:60
msgid "Display"
msgstr "Anzeige"
@ -8381,6 +7765,14 @@ msgstr "Standard-Zugriffsrechte für Beiträge"
msgid "(click to open/close)"
msgstr "(klicke zum öffnen/schließen)"
#: mod/settings.php:1250 mod/photos.php:1187 mod/photos.php:1571
msgid "Show to Groups"
msgstr "Zeige den Gruppen"
#: mod/settings.php:1251 mod/photos.php:1188 mod/photos.php:1572
msgid "Show to Contacts"
msgstr "Zeige den Kontakten"
#: mod/settings.php:1252
msgid "Default Private Post"
msgstr "Privater Standardbeitrag"
@ -8503,6 +7895,14 @@ msgstr "Video Löschen"
msgid "No videos selected"
msgstr "Keine Videos ausgewählt"
#: mod/videos.php:308 mod/photos.php:1075
msgid "Access to this item is restricted."
msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
#: mod/videos.php:390 mod/photos.php:1877
msgid "View Album"
msgstr "Album betrachten"
#: mod/videos.php:399
msgid "Recent Videos"
msgstr "Neueste Videos"
@ -8511,6 +7911,627 @@ msgstr "Neueste Videos"
msgid "Upload New Videos"
msgstr "Neues Video hochladen"
#: mod/install.php:139
msgid "Friendica Communications Server - Setup"
msgstr "Friendica-Server für soziale Netzwerke – Setup"
#: mod/install.php:145
msgid "Could not connect to database."
msgstr "Verbindung zur Datenbank gescheitert."
#: mod/install.php:149
msgid "Could not create table."
msgstr "Tabelle konnte nicht angelegt werden."
#: mod/install.php:155
msgid "Your Friendica site database has been installed."
msgstr "Die Datenbank Deiner Friendicaseite wurde installiert."
#: mod/install.php:160
msgid ""
"You may need to import the file \"database.sql\" manually using phpmyadmin "
"or mysql."
msgstr "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."
#: mod/install.php:161 mod/install.php:230 mod/install.php:602
msgid "Please see the file \"INSTALL.txt\"."
msgstr "Lies bitte die \"INSTALL.txt\"."
#: mod/install.php:173
msgid "Database already in use."
msgstr "Die Datenbank wird bereits verwendet."
#: mod/install.php:227
msgid "System check"
msgstr "Systemtest"
#: mod/install.php:232
msgid "Check again"
msgstr "Noch einmal testen"
#: mod/install.php:251
msgid "Database connection"
msgstr "Datenbankverbindung"
#: mod/install.php:252
msgid ""
"In order to install Friendica we need to know how to connect to your "
"database."
msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können."
#: mod/install.php:253
msgid ""
"Please contact your hosting provider or site administrator if you have "
"questions about these settings."
msgstr "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."
#: mod/install.php:254
msgid ""
"The database you specify below should already exist. If it does not, please "
"create it before continuing."
msgstr "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst."
#: mod/install.php:258
msgid "Database Server Name"
msgstr "Datenbank-Server"
#: mod/install.php:259
msgid "Database Login Name"
msgstr "Datenbank-Nutzer"
#: mod/install.php:260
msgid "Database Login Password"
msgstr "Datenbank-Passwort"
#: mod/install.php:261
msgid "Database Name"
msgstr "Datenbank-Name"
#: mod/install.php:262 mod/install.php:303
msgid "Site administrator email address"
msgstr "E-Mail-Adresse des Administrators"
#: mod/install.php:262 mod/install.php:303
msgid ""
"Your account email address must match this in order to use the web admin "
"panel."
msgstr "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst."
#: mod/install.php:266 mod/install.php:306
msgid "Please select a default timezone for your website"
msgstr "Bitte wähle die Standardzeitzone Deiner Webseite"
#: mod/install.php:293
msgid "Site settings"
msgstr "Server-Einstellungen"
#: mod/install.php:307
msgid "System Language:"
msgstr "Systemsprache:"
#: mod/install.php:307
msgid ""
"Set the default language for your Friendica installation interface and to "
"send emails."
msgstr "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand"
#: mod/install.php:347
msgid "Could not find a command line version of PHP in the web server PATH."
msgstr "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."
#: mod/install.php:348
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='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
"up-the-poller'>'Setup the poller'</a>"
msgstr "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"
#: mod/install.php:352
msgid "PHP executable path"
msgstr "Pfad zu PHP"
#: mod/install.php:352
msgid ""
"Enter full path to php executable. You can leave this blank to continue the "
"installation."
msgstr "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."
#: mod/install.php:357
msgid "Command line PHP"
msgstr "Kommandozeilen-PHP"
#: mod/install.php:366
msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
msgstr "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)"
#: mod/install.php:367
msgid "Found PHP version: "
msgstr "Gefundene PHP Version:"
#: mod/install.php:369
msgid "PHP cli binary"
msgstr "PHP CLI Binary"
#: mod/install.php:380
msgid ""
"The command line version of PHP on your system does not have "
"\"register_argc_argv\" enabled."
msgstr "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert."
#: mod/install.php:381
msgid "This is required for message delivery to work."
msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
#: mod/install.php:383
msgid "PHP register_argc_argv"
msgstr "PHP register_argc_argv"
#: mod/install.php:404
msgid ""
"Error: the \"openssl_pkey_new\" function on this system is not able to "
"generate encryption keys"
msgstr "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"
#: mod/install.php:405
msgid ""
"If running under Windows, please see "
"\"http://www.php.net/manual/en/openssl.installation.php\"."
msgstr "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."
#: mod/install.php:407
msgid "Generate encryption keys"
msgstr "Schlüssel erzeugen"
#: mod/install.php:414
msgid "libCurl PHP module"
msgstr "PHP: libCurl-Modul"
#: mod/install.php:415
msgid "GD graphics PHP module"
msgstr "PHP: GD-Grafikmodul"
#: mod/install.php:416
msgid "OpenSSL PHP module"
msgstr "PHP: OpenSSL-Modul"
#: mod/install.php:417
msgid "mysqli PHP module"
msgstr "PHP: mysqli-Modul"
#: mod/install.php:418
msgid "mb_string PHP module"
msgstr "PHP: mb_string-Modul"
#: mod/install.php:419
msgid "mcrypt PHP module"
msgstr "PHP mcrypt Modul"
#: mod/install.php:420
msgid "XML PHP module"
msgstr "XML PHP Modul"
#: mod/install.php:421
msgid "iconv module"
msgstr "iconv module"
#: mod/install.php:425 mod/install.php:427
msgid "Apache mod_rewrite module"
msgstr "Apache mod_rewrite module"
#: mod/install.php:425
msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed."
msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."
#: mod/install.php:433
msgid "Error: libCURL PHP module required but not installed."
msgstr "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."
#: mod/install.php:437
msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed."
msgstr "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."
#: mod/install.php:441
msgid "Error: openssl PHP module required but not installed."
msgstr "Fehler: Das openssl-Modul von PHP ist nicht installiert."
#: mod/install.php:445
msgid "Error: mysqli PHP module required but not installed."
msgstr "Fehler: Das mysqli-Modul von PHP ist nicht installiert."
#: mod/install.php:449
msgid "Error: mb_string PHP module required but not installed."
msgstr "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert."
#: mod/install.php:453
msgid "Error: mcrypt PHP module required but not installed."
msgstr "Fehler: Das mcrypt Modul von PHP ist nicht installiert"
#: mod/install.php:457
msgid "Error: iconv PHP module required but not installed."
msgstr "Fehler: Das iconv-Modul von PHP ist nicht installiert."
#: mod/install.php:466
msgid ""
"If you are using php_cli, please make sure that mcrypt module is enabled in "
"its config file"
msgstr "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. "
#: mod/install.php:469
msgid ""
"Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 "
"encryption layer."
msgstr "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren."
#: mod/install.php:471
msgid "mcrypt_create_iv() function"
msgstr "mcrypt_create_iv() function"
#: mod/install.php:479
msgid "Error, XML PHP module required but not installed."
msgstr "Fehler: XML PHP Modul erforderlich aber nicht installiert."
#: mod/install.php:494
msgid ""
"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."
msgstr "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun."
#: mod/install.php:495
msgid ""
"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."
msgstr "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast."
#: mod/install.php:496
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 "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst."
#: mod/install.php:497
msgid ""
"You can alternatively skip this procedure and perform a manual installation."
" Please see the file \"INSTALL.txt\" for instructions."
msgstr "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt."
#: mod/install.php:500
msgid ".htconfig.php is writable"
msgstr "Schreibrechte auf .htconfig.php"
#: mod/install.php:510
msgid ""
"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
"compiles templates to PHP to speed up rendering."
msgstr "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."
#: mod/install.php:511
msgid ""
"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 "
"folder."
msgstr "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica."
#: mod/install.php:512
msgid ""
"Please ensure that the user that your web server runs as (e.g. www-data) has"
" write access to this folder."
msgstr "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."
#: mod/install.php:513
msgid ""
"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."
msgstr "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."
#: mod/install.php:516
msgid "view/smarty3 is writable"
msgstr "view/smarty3 ist schreibbar"
#: mod/install.php:532
msgid ""
"Url rewrite in .htaccess is not working. Check your server configuration."
msgstr "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers."
#: mod/install.php:534
msgid "Url rewrite is working"
msgstr "URL rewrite funktioniert"
#: mod/install.php:551
msgid "ImageMagick PHP extension is installed"
msgstr "ImageMagick PHP Erweiterung ist installiert"
#: mod/install.php:553
msgid "ImageMagick supports GIF"
msgstr "ImageMagick unterstützt GIF"
#: mod/install.php:561
msgid ""
"The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web "
"server root."
msgstr "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen."
#: mod/install.php:600
msgid "<h1>What next</h1>"
msgstr "<h1>Wie geht es weiter?</h1>"
#: mod/install.php:601
msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the "
"poller."
msgstr "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."
#: mod/notifications.php:35
msgid "Invalid request identifier."
msgstr "Invalid request identifier."
#: mod/notifications.php:44 mod/notifications.php:180
#: mod/notifications.php:252
msgid "Discard"
msgstr "Verwerfen"
#: mod/notifications.php:105
msgid "Network Notifications"
msgstr "Netzwerk Benachrichtigungen"
#: mod/notifications.php:117
msgid "Personal Notifications"
msgstr "Persönliche Benachrichtigungen"
#: mod/notifications.php:123
msgid "Home Notifications"
msgstr "Pinnwand Benachrichtigungen"
#: mod/notifications.php:152
msgid "Show Ignored Requests"
msgstr "Zeige ignorierte Anfragen"
#: mod/notifications.php:152
msgid "Hide Ignored Requests"
msgstr "Verberge ignorierte Anfragen"
#: mod/notifications.php:164 mod/notifications.php:222
msgid "Notification type: "
msgstr "Benachrichtigungstyp: "
#: mod/notifications.php:167
#, php-format
msgid "suggested by %s"
msgstr "vorgeschlagen von %s"
#: mod/notifications.php:173 mod/notifications.php:240
msgid "Post a new friend activity"
msgstr "Neue-Kontakt Nachricht senden"
#: mod/notifications.php:173 mod/notifications.php:240
msgid "if applicable"
msgstr "falls anwendbar"
#: mod/notifications.php:195
msgid "Claims to be known to you: "
msgstr "Behauptet Dich zu kennen: "
#: mod/notifications.php:196
msgid "yes"
msgstr "ja"
#: mod/notifications.php:196
msgid "no"
msgstr "nein"
#: mod/notifications.php:197
msgid ""
"Shall your connection be bidirectional or not? \"Friend\" implies that you "
"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that "
"you allow to read but you do not want to read theirs. Approve as: "
msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"
#: mod/notifications.php:200
msgid ""
"Shall your connection be bidirectional or not? \"Friend\" implies that you "
"allow to read and you subscribe to their posts. \"Sharer\" means that you "
"allow to read but you do not want to read theirs. Approve as: "
msgstr "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:"
#: mod/notifications.php:209
msgid "Friend"
msgstr "Kontakt"
#: mod/notifications.php:210
msgid "Sharer"
msgstr "Teilenden"
#: mod/notifications.php:210
msgid "Fan/Admirer"
msgstr "Fan/Verehrer"
#: mod/notifications.php:260
msgid "No introductions."
msgstr "Keine Kontaktanfragen."
#: mod/notifications.php:299
msgid "Show unread"
msgstr "Ungelesene anzeigen"
#: mod/notifications.php:299
msgid "Show all"
msgstr "Alle anzeigen"
#: mod/notifications.php:305
#, php-format
msgid "No more %s notifications."
msgstr "Keine weiteren %s Benachrichtigungen"
#: mod/photos.php:101 mod/photos.php:1886
msgid "Recent Photos"
msgstr "Neueste Fotos"
#: mod/photos.php:104 mod/photos.php:1308 mod/photos.php:1888
msgid "Upload New Photos"
msgstr "Neue Fotos hochladen"
#: mod/photos.php:182
msgid "Contact information unavailable"
msgstr "Kontaktinformationen nicht verfügbar"
#: mod/photos.php:203
msgid "Album not found."
msgstr "Album nicht gefunden."
#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1250
msgid "Delete Album"
msgstr "Album löschen"
#: mod/photos.php:243
msgid "Do you really want to delete this photo album and all its photos?"
msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?"
#: mod/photos.php:323 mod/photos.php:334 mod/photos.php:1567
msgid "Delete Photo"
msgstr "Foto löschen"
#: mod/photos.php:332
msgid "Do you really want to delete this photo?"
msgstr "Möchtest Du wirklich dieses Foto löschen?"
#: mod/photos.php:707
#, php-format
msgid "%1$s was tagged in %2$s by %3$s"
msgstr "%1$s wurde von %3$s in %2$s getaggt"
#: mod/photos.php:707
msgid "a photo"
msgstr "einem Foto"
#: mod/photos.php:814
msgid "Image file is empty."
msgstr "Bilddatei ist leer."
#: mod/photos.php:974
msgid "No photos selected"
msgstr "Keine Bilder ausgewählt"
#: mod/photos.php:1135
#, php-format
msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers."
#: mod/photos.php:1170
msgid "Upload Photos"
msgstr "Bilder hochladen"
#: mod/photos.php:1174 mod/photos.php:1245
msgid "New album name: "
msgstr "Name des neuen Albums: "
#: mod/photos.php:1175
msgid "or existing album name: "
msgstr "oder existierender Albumname: "
#: mod/photos.php:1176
msgid "Do not show a status post for this upload"
msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
#: mod/photos.php:1189
msgid "Private Photo"
msgstr "Privates Foto"
#: mod/photos.php:1190
msgid "Public Photo"
msgstr "Öffentliches Foto"
#: mod/photos.php:1258
msgid "Edit Album"
msgstr "Album bearbeiten"
#: mod/photos.php:1264
msgid "Show Newest First"
msgstr "Zeige neueste zuerst"
#: mod/photos.php:1266
msgid "Show Oldest First"
msgstr "Zeige älteste zuerst"
#: mod/photos.php:1294 mod/photos.php:1871
msgid "View Photo"
msgstr "Foto betrachten"
#: mod/photos.php:1340
msgid "Permission denied. Access to this item may be restricted."
msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."
#: mod/photos.php:1342
msgid "Photo not available"
msgstr "Foto nicht verfügbar"
#: mod/photos.php:1398
msgid "View photo"
msgstr "Fotos ansehen"
#: mod/photos.php:1398
msgid "Edit photo"
msgstr "Foto bearbeiten"
#: mod/photos.php:1399
msgid "Use as profile photo"
msgstr "Als Profilbild verwenden"
#: mod/photos.php:1424
msgid "View Full Size"
msgstr "Betrachte Originalgröße"
#: mod/photos.php:1510
msgid "Tags: "
msgstr "Tags: "
#: mod/photos.php:1513
msgid "[Remove any tag]"
msgstr "[Tag entfernen]"
#: mod/photos.php:1553
msgid "New album name"
msgstr "Name des neuen Albums"
#: mod/photos.php:1554
msgid "Caption"
msgstr "Bildunterschrift"
#: mod/photos.php:1555
msgid "Add a Tag"
msgstr "Tag hinzufügen"
#: mod/photos.php:1555
msgid ""
"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
#: mod/photos.php:1556
msgid "Do not rotate"
msgstr "Nicht rotieren"
#: mod/photos.php:1557
msgid "Rotate CW (right)"
msgstr "Drehen US (rechts)"
#: mod/photos.php:1558
msgid "Rotate CCW (left)"
msgstr "Drehen EUS (links)"
#: mod/photos.php:1573
msgid "Private photo"
msgstr "Privates Foto"
#: mod/photos.php:1574
msgid "Public photo"
msgstr "Öffentliches Foto"
#: mod/photos.php:1800
msgid "Map"
msgstr "Karte"
#: object/Item.php:370
msgid "via"
msgstr "via"
@ -8547,14 +8568,6 @@ msgstr "Größe anpassen - Optimale Größe"
msgid "Resize to best fit and retain aspect ratio."
msgstr "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten"
#: view/theme/frio/theme.php:226
msgid "Remote"
msgstr "Entferne"
#: view/theme/frio/theme.php:232
msgid "Visitor"
msgstr "Besucher"
#: view/theme/frio/config.php:42
msgid "Default"
msgstr "Standard"
@ -8595,6 +8608,14 @@ msgstr "Transparanz des Hintergrunds von Beiträgem"
msgid "Set the background image"
msgstr "Hintergrundbild festlegen"
#: view/theme/frio/theme.php:226
msgid "Guest"
msgstr "Gast"
#: view/theme/frio/theme.php:232
msgid "Visitor"
msgstr "Besucher"
#: view/theme/cleanzero/config.php:83
msgid "Set resize level for images in posts and comments (width and height)"
msgstr "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)"
@ -8774,51 +8795,51 @@ msgstr "Variationen"
msgid "toggle mobile"
msgstr "auf/von Mobile Ansicht wechseln"
#: boot.php:898
#: boot.php:901
msgid "Delete this item?"
msgstr "Diesen Beitrag löschen?"
#: boot.php:901
#: boot.php:904
msgid "show fewer"
msgstr "weniger anzeigen"
#: boot.php:1515
#: boot.php:1518
#, php-format
msgid "Update %s failed. See error logs."
msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
#: boot.php:1627
#: boot.php:1630
msgid "Create a New Account"
msgstr "Neues Konto erstellen"
#: boot.php:1656
#: boot.php:1659
msgid "Password: "
msgstr "Passwort: "
#: boot.php:1657
#: boot.php:1660
msgid "Remember me"
msgstr "Anmeldedaten merken"
#: boot.php:1660
#: boot.php:1663
msgid "Or login using OpenID: "
msgstr "Oder melde Dich mit Deiner OpenID an: "
#: boot.php:1666
#: boot.php:1669
msgid "Forgot your password?"
msgstr "Passwort vergessen?"
#: boot.php:1669
#: boot.php:1672
msgid "Website Terms of Service"
msgstr "Website Nutzungsbedingungen"
#: boot.php:1670
#: boot.php:1673
msgid "terms of service"
msgstr "Nutzungsbedingungen"
#: boot.php:1672
#: boot.php:1675
msgid "Website Privacy Policy"
msgstr "Website Datenschutzerklärung"
#: boot.php:1673
#: boot.php:1676
msgid "privacy policy"
msgstr "Datenschutzerklärung"

321
view/de/strings.php
View file

@ -117,7 +117,6 @@ $a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\
$a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s um die Anfrage zu bearbeiten.";
$a->strings["Forums"] = "Foren";
$a->strings["External link to forum"] = "Externer Link zum Forum";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln.";
$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i";
$a->strings["Starts:"] = "Beginnt:";
$a->strings["Finishes:"] = "Endet:";
@ -237,6 +236,7 @@ $a->strings["Image/photo"] = "Bild/Foto";
$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
$a->strings["$1 wrote:"] = "$1 hat geschrieben:";
$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln.";
$a->strings["Logged out."] = "Abgemeldet.";
$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast.";
@ -700,6 +700,19 @@ $a->strings["%d contact not imported"] = array(
1 => "%d Kontakte nicht importiert",
);
$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden";
$a->strings["System"] = "System";
$a->strings["Personal"] = "Persönlich";
$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag";
$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht";
$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil";
$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil";
$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil";
$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet";
$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
$a->strings["New Follower"] = "Neuer Bewunderer";
$a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
$a->strings["Access denied."] = "Zugriff verweigert.";
@ -844,79 +857,6 @@ $a->strings["No entries."] = "Keine Einträge.";
$a->strings["Credits"] = "Credits";
$a->strings["Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!"] = "Friendica ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !";
$a->strings["- select -"] = "- auswählen -";
$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden.";
$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert.";
$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet.";
$a->strings["System check"] = "Systemtest";
$a->strings["Check again"] = "Noch einmal testen";
$a->strings["Database connection"] = "Datenbankverbindung";
$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können.";
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst.";
$a->strings["Database Server Name"] = "Datenbank-Server";
$a->strings["Database Login Name"] = "Datenbank-Nutzer";
$a->strings["Database Login Password"] = "Datenbank-Passwort";
$a->strings["Database Name"] = "Datenbank-Name";
$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators";
$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst.";
$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite";
$a->strings["Site settings"] = "Server-Einstellungen";
$a->strings["System Language:"] = "Systemsprache:";
$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand";
$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
$a->strings["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='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"] = "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>";
$a->strings["PHP executable path"] = "Pfad zu PHP";
$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren.";
$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)";
$a->strings["Found PHP version: "] = "Gefundene PHP Version:";
$a->strings["PHP cli binary"] = "PHP CLI Binary";
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert.";
$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
$a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul";
$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul";
$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
$a->strings["mysqli PHP module"] = "PHP: mysqli-Modul";
$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
$a->strings["mcrypt PHP module"] = "PHP mcrypt Modul";
$a->strings["XML PHP module"] = "XML PHP Modul";
$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert.";
$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert.";
$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das mcrypt Modul von PHP ist nicht installiert";
$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. ";
$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren.";
$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() function";
$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert.";
$a->strings["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."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
$a->strings["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."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast.";
$a->strings["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."] = "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst.";
$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt.";
$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen.";
$a->strings["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 folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat.";
$a->strings["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."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten.";
$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar";
$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers.";
$a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert";
$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF";
$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen.";
$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s";
$a->strings["Item not available."] = "Beitrag nicht verfügbar.";
$a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden.";
@ -992,7 +932,6 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren";
$a->strings["Posted Order"] = "Neueste Beiträge";
$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren";
$a->strings["Personal"] = "Persönlich";
$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht";
$a->strings["New"] = "Neue";
$a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum";
@ -1172,41 +1111,6 @@ $a->strings["I might attend"] = "Ich werde eventuell teilnehmen";
$a->strings["to"] = "zu";
$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
$a->strings["Invalid request identifier."] = "Invalid request identifier.";
$a->strings["Discard"] = "Verwerfen";
$a->strings["Ignore"] = "Ignorieren";
$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
$a->strings["Notification type: "] = "Benachrichtigungstyp: ";
$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
$a->strings["suggested by %s"] = "vorgeschlagen von %s";
$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor andere";
$a->strings["Post a new friend activity"] = "Neue-Kontakt Nachricht senden";
$a->strings["if applicable"] = "falls anwendbar";
$a->strings["Approve"] = "Genehmigen";
$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: ";
$a->strings["yes"] = "ja";
$a->strings["no"] = "nein";
$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:";
$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:";
$a->strings["Friend"] = "Kontakt";
$a->strings["Sharer"] = "Teilenden";
$a->strings["Fan/Admirer"] = "Fan/Verehrer";
$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
$a->strings["New Follower"] = "Neuer Bewunderer";
$a->strings["No introductions."] = "Keine Kontaktanfragen.";
$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen";
$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag";
$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht";
$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet";
$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
$a->strings["No more network notifications."] = "Keine weiteren Netzwerk-Benachrichtigungen.";
$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen";
$a->strings["No more personal notifications."] = "Keine weiteren persönlichen Benachrichtigungen";
$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen";
$a->strings["No more home notifications."] = "Keine weiteren Pinnwand-Benachrichtigungen";
$a->strings["System"] = "System";
$a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
$a->strings["Site"] = "Seite";
$a->strings["Users"] = "Nutzer";
@ -1465,6 +1369,7 @@ $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf
$a->strings["User waiting for permanent deletion"] = "Nutzer wartet auf permanente Löschung";
$a->strings["Request date"] = "Anfragedatum";
$a->strings["No registrations."] = "Keine Neuanmeldungen.";
$a->strings["Approve"] = "Genehmigen";
$a->strings["Deny"] = "Verwehren";
$a->strings["Block"] = "Sperren";
$a->strings["Unblock"] = "Entsperren";
@ -1546,9 +1451,11 @@ $a->strings["Last update:"] = "Letzte Aktualisierung: ";
$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
$a->strings["Update now"] = "Jetzt aktualisieren";
$a->strings["Unignore"] = "Ignorieren aufheben";
$a->strings["Ignore"] = "Ignorieren";
$a->strings["Currently blocked"] = "Derzeit geblockt";
$a->strings["Currently ignored"] = "Derzeit ignoriert";
$a->strings["Currently archived"] = "Momentan archiviert";
$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor andere";
$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen";
$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt.";
@ -1629,52 +1536,6 @@ $a->strings["Please contact the sender by replying to this post if you do not wi
$a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht.";
$a->strings["Mood"] = "Stimmung";
$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und erzähle sie Deinen Kontakten";
$a->strings["Recent Photos"] = "Neueste Fotos";
$a->strings["Upload New Photos"] = "Neue Fotos hochladen";
$a->strings["everybody"] = "jeder";
$a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar";
$a->strings["Album not found."] = "Album nicht gefunden.";
$a->strings["Delete Album"] = "Album löschen";
$a->strings["Do you really want to delete this photo album and all its photos?"] = "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?";
$a->strings["Delete Photo"] = "Foto löschen";
$a->strings["Do you really want to delete this photo?"] = "Möchtest Du wirklich dieses Foto löschen?";
$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt";
$a->strings["a photo"] = "einem Foto";
$a->strings["Image file is empty."] = "Bilddatei ist leer.";
$a->strings["No photos selected"] = "Keine Bilder ausgewählt";
$a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt.";
$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers.";
$a->strings["Upload Photos"] = "Bilder hochladen";
$a->strings["New album name: "] = "Name des neuen Albums: ";
$a->strings["or existing album name: "] = "oder existierender Albumname: ";
$a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen";
$a->strings["Show to Groups"] = "Zeige den Gruppen";
$a->strings["Show to Contacts"] = "Zeige den Kontakten";
$a->strings["Private Photo"] = "Privates Foto";
$a->strings["Public Photo"] = "Öffentliches Foto";
$a->strings["Edit Album"] = "Album bearbeiten";
$a->strings["Show Newest First"] = "Zeige neueste zuerst";
$a->strings["Show Oldest First"] = "Zeige älteste zuerst";
$a->strings["View Photo"] = "Foto betrachten";
$a->strings["Permission denied. Access to this item may be restricted."] = "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein.";
$a->strings["Photo not available"] = "Foto nicht verfügbar";
$a->strings["View photo"] = "Fotos ansehen";
$a->strings["Edit photo"] = "Foto bearbeiten";
$a->strings["Use as profile photo"] = "Als Profilbild verwenden";
$a->strings["View Full Size"] = "Betrachte Originalgröße";
$a->strings["Tags: "] = "Tags: ";
$a->strings["[Remove any tag]"] = "[Tag entfernen]";
$a->strings["New album name"] = "Name des neuen Albums";
$a->strings["Caption"] = "Bildunterschrift";
$a->strings["Add a Tag"] = "Tag hinzufügen";
$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
$a->strings["Do not rotate"] = "Nicht rotieren";
$a->strings["Rotate CW (right)"] = "Drehen US (rechts)";
$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)";
$a->strings["Private photo"] = "Privates Foto";
$a->strings["Public photo"] = "Öffentliches Foto";
$a->strings["Map"] = "Karte";
$a->strings["View Album"] = "Album betrachten";
$a->strings["Poke/Prod"] = "Anstupsen";
$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
$a->strings["Recipient"] = "Empfänger";
@ -1786,6 +1647,7 @@ $a->strings["Import your profile to this friendica instance"] = "Importiere Dein
$a->strings["Account approved."] = "Konto freigegeben.";
$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen";
$a->strings["Please login."] = "Bitte melde Dich an.";
$a->strings["everybody"] = "jeder";
$a->strings["Display"] = "Anzeige";
$a->strings["Social Networks"] = "Soziale Netzwerke";
$a->strings["Connected apps"] = "Verbundene Programme";
@ -1917,6 +1779,8 @@ $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl vonKontaktanfrage
$a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)";
$a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge";
$a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
$a->strings["Show to Groups"] = "Zeige den Gruppen";
$a->strings["Show to Contacts"] = "Zeige den Kontakten";
$a->strings["Default Private Post"] = "Privater Standardbeitrag";
$a->strings["Default Public Post"] = "Öffentlicher Standardbeitrag";
$a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für neue Beiträge";
@ -1947,8 +1811,149 @@ $a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung ern
$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?";
$a->strings["Delete Video"] = "Video Löschen";
$a->strings["No videos selected"] = "Keine Videos ausgewählt";
$a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt.";
$a->strings["View Album"] = "Album betrachten";
$a->strings["Recent Videos"] = "Neueste Videos";
$a->strings["Upload New Videos"] = "Neues Video hochladen";
$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden.";
$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert.";
$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet.";
$a->strings["System check"] = "Systemtest";
$a->strings["Check again"] = "Noch einmal testen";
$a->strings["Database connection"] = "Datenbankverbindung";
$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können.";
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst.";
$a->strings["Database Server Name"] = "Datenbank-Server";
$a->strings["Database Login Name"] = "Datenbank-Nutzer";
$a->strings["Database Login Password"] = "Datenbank-Passwort";
$a->strings["Database Name"] = "Datenbank-Name";
$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators";
$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst.";
$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite";
$a->strings["Site settings"] = "Server-Einstellungen";
$a->strings["System Language:"] = "Systemsprache:";
$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand";
$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
$a->strings["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='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>"] = "Wenn Du keine Kommandozeilen-Version von PHP auf Deinem Server installiert hast, kannst Du keine Hintergrundprozesse via cron starten. Siehe <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>";
$a->strings["PHP executable path"] = "Pfad zu PHP";
$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren.";
$a->strings["Command line PHP"] = "Kommandozeilen-PHP";
$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)";
$a->strings["Found PHP version: "] = "Gefundene PHP Version:";
$a->strings["PHP cli binary"] = "PHP CLI Binary";
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert.";
$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen";
$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
$a->strings["Generate encryption keys"] = "Schlüssel erzeugen";
$a->strings["libCurl PHP module"] = "PHP: libCurl-Modul";
$a->strings["GD graphics PHP module"] = "PHP: GD-Grafikmodul";
$a->strings["OpenSSL PHP module"] = "PHP: OpenSSL-Modul";
$a->strings["mysqli PHP module"] = "PHP: mysqli-Modul";
$a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
$a->strings["mcrypt PHP module"] = "PHP mcrypt Modul";
$a->strings["XML PHP module"] = "XML PHP Modul";
$a->strings["iconv module"] = "iconv module";
$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert.";
$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert.";
$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das mcrypt Modul von PHP ist nicht installiert";
$a->strings["Error: iconv PHP module required but not installed."] = "Fehler: Das iconv-Modul von PHP ist nicht installiert.";
$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "Wenn du das Modul \"php_cli\" benutzt dann versichere dich, daß das mcrypt Modul in seiner Konfigurationsdatei aktiviert ist. ";
$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "Die Funktion mcrypt_create_iv() ist nicht festgelegt. Dies ist notwendig um den RINO2-Encryption-Layer zu aktivieren.";
$a->strings["mcrypt_create_iv() function"] = "mcrypt_create_iv() function";
$a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert.";
$a->strings["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."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
$a->strings["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."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast.";
$a->strings["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."] = "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst.";
$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt.";
$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen.";
$a->strings["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 folder."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat.";
$a->strings["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."] = "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten.";
$a->strings["view/smarty3 is writable"] = "view/smarty3 ist schreibbar";
$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers.";
$a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert";
$a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF";
$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen.";
$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
$a->strings["Invalid request identifier."] = "Invalid request identifier.";
$a->strings["Discard"] = "Verwerfen";
$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen";
$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen";
$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen";
$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
$a->strings["Notification type: "] = "Benachrichtigungstyp: ";
$a->strings["suggested by %s"] = "vorgeschlagen von %s";
$a->strings["Post a new friend activity"] = "Neue-Kontakt Nachricht senden";
$a->strings["if applicable"] = "falls anwendbar";
$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: ";
$a->strings["yes"] = "ja";
$a->strings["no"] = "nein";
$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Kontakt\" bedeutet, ihr könnt gegenseitig die Beiträge des Anderen lesen dürft. \"Fan/Verehrer\", dass du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:";
$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Soll Deine Beziehung beidseitig sein oder nicht? \"Freund\" bedeutet, ihr gegenseitig die Beiträge des Anderen lesen dürft. \"Teilenden\", das du das lesen deiner Beiträge erlaubst aber nicht die Beiträge der anderen Seite lesen möchtest. Genehmigen als:";
$a->strings["Friend"] = "Kontakt";
$a->strings["Sharer"] = "Teilenden";
$a->strings["Fan/Admirer"] = "Fan/Verehrer";
$a->strings["No introductions."] = "Keine Kontaktanfragen.";
$a->strings["Show unread"] = "Ungelesene anzeigen";
$a->strings["Show all"] = "Alle anzeigen";
$a->strings["No more %s notifications."] = "Keine weiteren %s Benachrichtigungen";
$a->strings["Recent Photos"] = "Neueste Fotos";
$a->strings["Upload New Photos"] = "Neue Fotos hochladen";
$a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar";
$a->strings["Album not found."] = "Album nicht gefunden.";
$a->strings["Delete Album"] = "Album löschen";
$a->strings["Do you really want to delete this photo album and all its photos?"] = "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?";
$a->strings["Delete Photo"] = "Foto löschen";
$a->strings["Do you really want to delete this photo?"] = "Möchtest Du wirklich dieses Foto löschen?";
$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s wurde von %3\$s in %2\$s getaggt";
$a->strings["a photo"] = "einem Foto";
$a->strings["Image file is empty."] = "Bilddatei ist leer.";
$a->strings["No photos selected"] = "Keine Bilder ausgewählt";
$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers.";
$a->strings["Upload Photos"] = "Bilder hochladen";
$a->strings["New album name: "] = "Name des neuen Albums: ";
$a->strings["or existing album name: "] = "oder existierender Albumname: ";
$a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen";
$a->strings["Private Photo"] = "Privates Foto";
$a->strings["Public Photo"] = "Öffentliches Foto";
$a->strings["Edit Album"] = "Album bearbeiten";
$a->strings["Show Newest First"] = "Zeige neueste zuerst";
$a->strings["Show Oldest First"] = "Zeige älteste zuerst";
$a->strings["View Photo"] = "Foto betrachten";
$a->strings["Permission denied. Access to this item may be restricted."] = "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein.";
$a->strings["Photo not available"] = "Foto nicht verfügbar";
$a->strings["View photo"] = "Fotos ansehen";
$a->strings["Edit photo"] = "Foto bearbeiten";
$a->strings["Use as profile photo"] = "Als Profilbild verwenden";
$a->strings["View Full Size"] = "Betrachte Originalgröße";
$a->strings["Tags: "] = "Tags: ";
$a->strings["[Remove any tag]"] = "[Tag entfernen]";
$a->strings["New album name"] = "Name des neuen Albums";
$a->strings["Caption"] = "Bildunterschrift";
$a->strings["Add a Tag"] = "Tag hinzufügen";
$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
$a->strings["Do not rotate"] = "Nicht rotieren";
$a->strings["Rotate CW (right)"] = "Drehen US (rechts)";
$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)";
$a->strings["Private photo"] = "Privates Foto";
$a->strings["Public photo"] = "Öffentliches Foto";
$a->strings["Map"] = "Karte";
$a->strings["via"] = "via";
$a->strings["Repeat the image"] = "Bild wiederholen";
$a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen.";
@ -1958,8 +1963,6 @@ $a->strings["Resize fill and-clip"] = "Größe anpassen - Ausfüllen und abschne
$a->strings["Resize to fill and retain aspect ratio."] = "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten";
$a->strings["Resize best fit"] = "Größe anpassen - Optimale Größe";
$a->strings["Resize to best fit and retain aspect ratio."] = "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten";
$a->strings["Remote"] = "Entferne";
$a->strings["Visitor"] = "Besucher";
$a->strings["Default"] = "Standard";
$a->strings["Note: "] = "Hinweis:";
$a->strings["Check image permissions if all users are allowed to visit the image"] = "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen";
@ -1970,6 +1973,8 @@ $a->strings["Link color"] = "Linkfarbe";
$a->strings["Set the background color"] = "Hintergrundfarbe festlegen";
$a->strings["Content background transparency"] = "Transparanz des Hintergrunds von Beiträgem";
$a->strings["Set the background image"] = "Hintergrundbild festlegen";
$a->strings["Guest"] = "Gast";
$a->strings["Visitor"] = "Besucher";
$a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)";
$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen";
$a->strings["Set theme width"] = "Theme Breite festlegen";

16404
view/fr/messages.po
View file

@ -5,7 +5,7 @@
# Translators:
# Anthronaut <mail@anthronaut.net>, 2015
# Cyboulette <cyboulette58@hotmail.fr>, 2014
# Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
# Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015-2016
# Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
# Domovoy <domovoy@errlock.org>, 2012
# Jak <jacques@riseup.net>, 2014
@ -21,9 +21,9 @@ msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-27 08:40+0100\n"
"PO-Revision-Date: 2015-12-30 06:02+0000\n"
"Last-Translator: Perig Gouanvic <pierre.alain.gouanvic@gmail.com>\n"
"POT-Creation-Date: 2016-08-09 18:10+0200\n"
"PO-Revision-Date: 2016-09-12 15:50+0000\n"
"Last-Translator: Damien Goutte-Gattat <damien+transifex@incenp.org>\n"
"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -31,6258 +31,103 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: mod/contacts.php:50 include/identity.php:389
msgid "Network:"
msgstr "Réseau"
#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:698
msgid "Miscellaneous"
msgstr "Divers"
#: mod/contacts.php:51 mod/contacts.php:986 mod/videos.php:37
#: mod/viewcontacts.php:105 mod/dirfind.php:208 mod/network.php:596
#: mod/allfriends.php:77 mod/match.php:82 mod/directory.php:172
#: mod/common.php:123 mod/suggest.php:95 mod/photos.php:41
#: include/identity.php:295
msgid "Forum"
msgstr "Forum"
#: include/datetime.php:183 include/identity.php:627
msgid "Birthday:"
msgstr "Anniversaire:"
#: mod/contacts.php:128
#, php-format
msgid "%d contact edited."
msgid_plural "%d contacts edited"
msgstr[0] "%d contact édité"
msgstr[1] "%d contacts édités."
#: mod/contacts.php:159 mod/contacts.php:382
msgid "Could not access contact record."
msgstr "Impossible d'accéder à l'enregistrement du contact."
#: mod/contacts.php:173
msgid "Could not locate selected profile."
msgstr "Impossible de localiser le profil séléctionné."
#: mod/contacts.php:206
msgid "Contact updated."
msgstr "Contact mis à jour."
#: mod/contacts.php:208 mod/dfrn_request.php:578
msgid "Failed to update contact record."
msgstr "Échec de mise à jour du contact."
#: mod/contacts.php:364 mod/manage.php:96 mod/display.php:493
#: mod/profile_photo.php:19 mod/profile_photo.php:175
#: mod/profile_photo.php:186 mod/profile_photo.php:199
#: mod/ostatus_subscribe.php:9 mod/follow.php:10 mod/follow.php:72
#: mod/follow.php:137 mod/item.php:169 mod/item.php:181 mod/group.php:19
#: mod/dfrn_confirm.php:55 mod/fsuggest.php:78 mod/wall_upload.php:77
#: mod/wall_upload.php:80 mod/viewcontacts.php:40 mod/notifications.php:69
#: mod/message.php:45 mod/message.php:181 mod/crepair.php:117
#: mod/dirfind.php:11 mod/nogroup.php:25 mod/network.php:4
#: mod/allfriends.php:12 mod/events.php:165 mod/wallmessage.php:9
#: mod/wallmessage.php:33 mod/wallmessage.php:79 mod/wallmessage.php:103
#: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/settings.php:20
#: mod/settings.php:116 mod/settings.php:637 mod/register.php:42
#: mod/delegate.php:12 mod/common.php:18 mod/mood.php:114 mod/suggest.php:58
#: mod/profiles.php:165 mod/profiles.php:615 mod/editpost.php:10
#: mod/api.php:26 mod/api.php:31 mod/notes.php:22 mod/poke.php:149
#: mod/repair_ostatus.php:9 mod/invite.php:15 mod/invite.php:101
#: mod/photos.php:171 mod/photos.php:1105 mod/regmod.php:110
#: mod/uimport.php:23 mod/attach.php:33 include/items.php:5070 index.php:383
msgid "Permission denied."
msgstr "Permission refusée."
#: mod/contacts.php:403
msgid "Contact has been blocked"
msgstr "Le contact a été bloqué"
#: mod/contacts.php:403
msgid "Contact has been unblocked"
msgstr "Le contact n'est plus bloqué"
#: mod/contacts.php:414
msgid "Contact has been ignored"
msgstr "Le contact a été ignoré"
#: mod/contacts.php:414
msgid "Contact has been unignored"
msgstr "Le contact n'est plus ignoré"
#: mod/contacts.php:426
msgid "Contact has been archived"
msgstr "Contact archivé"
#: mod/contacts.php:426
msgid "Contact has been unarchived"
msgstr "Contact désarchivé"
#: mod/contacts.php:453 mod/contacts.php:801
msgid "Do you really want to delete this contact?"
msgstr "Voulez-vous vraiment supprimer ce contact?"
#: mod/contacts.php:455 mod/follow.php:105 mod/message.php:216
#: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1108
#: mod/settings.php:1112 mod/settings.php:1117 mod/settings.php:1123
#: mod/settings.php:1129 mod/settings.php:1135 mod/settings.php:1161
#: mod/settings.php:1162 mod/settings.php:1163 mod/settings.php:1164
#: mod/settings.php:1165 mod/dfrn_request.php:850 mod/register.php:238
#: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661
#: mod/profiles.php:687 mod/api.php:105 include/items.php:4902
msgid "Yes"
msgstr "Oui"
#: mod/contacts.php:458 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:116
#: mod/videos.php:131 mod/message.php:219 mod/fbrowser.php:93
#: mod/fbrowser.php:128 mod/settings.php:651 mod/settings.php:677
#: mod/dfrn_request.php:864 mod/suggest.php:32 mod/editpost.php:148
#: mod/photos.php:247 mod/photos.php:336 include/conversation.php:1221
#: include/items.php:4905
msgid "Cancel"
msgstr "Annuler"
#: mod/contacts.php:470
msgid "Contact has been removed."
msgstr "Ce contact a été retiré."
#: mod/contacts.php:511
#, php-format
msgid "You are mutual friends with %s"
msgstr "Vous êtes ami (et réciproquement) avec %s"
#: mod/contacts.php:515
#, php-format
msgid "You are sharing with %s"
msgstr "Vous partagez avec %s"
#: mod/contacts.php:520
#, php-format
msgid "%s is sharing with you"
msgstr "%s partage avec vous"
#: mod/contacts.php:540
msgid "Private communications are not available for this contact."
msgstr "Les communications privées ne sont pas disponibles pour ce contact."
#: mod/contacts.php:543 mod/admin.php:647
msgid "Never"
msgstr "Jamais"
#: mod/contacts.php:547
msgid "(Update was successful)"
msgstr "(Mise à jour effectuée avec succès)"
#: mod/contacts.php:547
msgid "(Update was not successful)"
msgstr "(Échec de la mise à jour)"
#: mod/contacts.php:549
msgid "Suggest friends"
msgstr "Suggérer amitié/contact"
#: mod/contacts.php:553
#, php-format
msgid "Network type: %s"
msgstr "Type de réseau %s"
#: mod/contacts.php:566
msgid "Communications lost with this contact!"
msgstr "Communications perdues avec ce contact !"
#: mod/contacts.php:569
msgid "Fetch further information for feeds"
msgstr "Chercher plus d'informations pour les flux"
#: mod/contacts.php:570 mod/admin.php:656
msgid "Disabled"
msgstr "Désactivé"
#: mod/contacts.php:570
msgid "Fetch information"
msgstr "Récupérer informations"
#: mod/contacts.php:570
msgid "Fetch information and keywords"
msgstr "Récupérer informations"
#: mod/contacts.php:586 mod/manage.php:143 mod/fsuggest.php:107
#: mod/message.php:342 mod/message.php:525 mod/crepair.php:196
#: mod/events.php:574 mod/content.php:712 mod/install.php:261
#: mod/install.php:299 mod/mood.php:137 mod/profiles.php:696
#: mod/localtime.php:45 mod/poke.php:198 mod/invite.php:140
#: mod/photos.php:1137 mod/photos.php:1261 mod/photos.php:1579
#: mod/photos.php:1630 mod/photos.php:1678 mod/photos.php:1766
#: object/Item.php:710 view/theme/cleanzero/config.php:80
#: view/theme/dispy/config.php:70 view/theme/quattro/config.php:64
#: view/theme/diabook/config.php:148 view/theme/diabook/theme.php:633
#: view/theme/clean/config.php:83 view/theme/vier/config.php:107
#: view/theme/duepuntozero/config.php:59
msgid "Submit"
msgstr "Envoyer"
#: mod/contacts.php:587
msgid "Profile Visibility"
msgstr "Visibilité du profil"
#: mod/contacts.php:588
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr "Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous rend visite de manière sécurisée."
#: mod/contacts.php:589
msgid "Contact Information / Notes"
msgstr "Informations de contact / Notes"
#: mod/contacts.php:590
msgid "Edit contact notes"
msgstr "Éditer les notes des contacts"
#: mod/contacts.php:595 mod/contacts.php:977 mod/viewcontacts.php:97
#: mod/nogroup.php:41
#, php-format
msgid "Visit %s's profile [%s]"
msgstr "Visiter le profil de %s [%s]"
#: mod/contacts.php:596
msgid "Block/Unblock contact"
msgstr "Bloquer/débloquer ce contact"
#: mod/contacts.php:597
msgid "Ignore contact"
msgstr "Ignorer ce contact"
#: mod/contacts.php:598
msgid "Repair URL settings"
msgstr "Réglages de réparation des URL"
#: mod/contacts.php:599
msgid "View conversations"
msgstr "Voir les conversations"
#: mod/contacts.php:601
msgid "Delete contact"
msgstr "Effacer ce contact"
#: mod/contacts.php:605
msgid "Last update:"
msgstr "Dernière mise-à-jour :"
#: mod/contacts.php:607
msgid "Update public posts"
msgstr "Mettre à jour les publications publiques:"
#: mod/contacts.php:609 mod/admin.php:1656
msgid "Update now"
msgstr "Mettre à jour"
#: mod/contacts.php:611 mod/dirfind.php:190 mod/allfriends.php:65
#: mod/match.php:71 mod/suggest.php:82 include/contact_widgets.php:32
#: include/Contact.php:310 include/conversation.php:924
msgid "Connect/Follow"
msgstr "Connecter/Suivre"
#: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864
#: mod/admin.php:1120
msgid "Unblock"
msgstr "Débloquer"
#: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864
#: mod/admin.php:1119
msgid "Block"
msgstr "Bloquer"
#: mod/contacts.php:615 mod/contacts.php:806 mod/contacts.php:871
msgid "Unignore"
msgstr "Ne plus ignorer"
#: mod/contacts.php:615 mod/contacts.php:806 mod/contacts.php:871
#: mod/notifications.php:54 mod/notifications.php:179
#: mod/notifications.php:259
msgid "Ignore"
msgstr "Ignorer"
#: mod/contacts.php:618
msgid "Currently blocked"
msgstr "Actuellement bloqué"
#: mod/contacts.php:619
msgid "Currently ignored"
msgstr "Actuellement ignoré"
#: mod/contacts.php:620
msgid "Currently archived"
msgstr "Actuellement archivé"
#: mod/contacts.php:621 mod/notifications.php:172 mod/notifications.php:251
msgid "Hide this contact from others"
msgstr "Cacher ce contact aux autres"
#: mod/contacts.php:621
msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr "Les réponses et \"j'aime\" à vos publications publiques <strong>peuvent</strong> être toujours visibles"
#: mod/contacts.php:622
msgid "Notification for new posts"
msgstr "Notification des nouvelles publications"
#: mod/contacts.php:622
msgid "Send a notification of every new post of this contact"
msgstr "Envoyer une notification de chaque nouveau message en provenance de ce contact"
#: mod/contacts.php:625
msgid "Blacklisted keywords"
msgstr "Mots-clés sur la liste noire"
#: mod/contacts.php:625
msgid ""
"Comma separated list of keywords that should not be converted to hashtags, "
"when \"Fetch information and keywords\" is selected"
msgstr "Liste de mots-clés separés par des virgules qui ne doivent pas être converti en mots-dièse quand « Récupérer informations et mots-clés » est sélectionné."
#: mod/contacts.php:632 mod/follow.php:121 mod/notifications.php:255
msgid "Profile URL"
msgstr "URL du Profil"
#: mod/contacts.php:635 mod/follow.php:125 mod/notifications.php:244
#: mod/events.php:566 mod/directory.php:145 include/identity.php:304
#: include/bb2diaspora.php:170 include/event.php:36 include/event.php:60
msgid "Location:"
msgstr "Localisation:"
#: mod/contacts.php:637 mod/follow.php:127 mod/notifications.php:246
#: mod/directory.php:153 include/identity.php:313 include/identity.php:630
msgid "About:"
msgstr "À propos:"
#: mod/contacts.php:639 mod/follow.php:129 mod/notifications.php:248
#: include/identity.php:624
msgid "Tags:"
msgstr "Étiquette:"
#: mod/contacts.php:684
msgid "Suggestions"
msgstr "Suggestions"
#: mod/contacts.php:687
msgid "Suggest potential friends"
msgstr "Suggérer des amis potentiels"
#: mod/contacts.php:692 mod/group.php:192
msgid "All Contacts"
msgstr "Tous les contacts"
#: mod/contacts.php:695
msgid "Show all contacts"
msgstr "Montrer tous les contacts"
#: mod/contacts.php:700
msgid "Unblocked"
msgstr "Non-bloqués"
#: mod/contacts.php:703
msgid "Only show unblocked contacts"
msgstr "Ne montrer que les contacts non-bloqués"
#: mod/contacts.php:709
msgid "Blocked"
msgstr "Bloqués"
#: mod/contacts.php:712
msgid "Only show blocked contacts"
msgstr "Ne montrer que les contacts bloqués"
#: mod/contacts.php:718
msgid "Ignored"
msgstr "Ignorés"
#: mod/contacts.php:721
msgid "Only show ignored contacts"
msgstr "Ne montrer que les contacts ignorés"
#: mod/contacts.php:727
msgid "Archived"
msgstr "Archivés"
#: mod/contacts.php:730
msgid "Only show archived contacts"
msgstr "Ne montrer que les contacts archivés"
#: mod/contacts.php:736
msgid "Hidden"
msgstr "Cachés"
#: mod/contacts.php:739
msgid "Only show hidden contacts"
msgstr "Ne montrer que les contacts masqués"
#: mod/contacts.php:792 mod/contacts.php:840 mod/viewcontacts.php:116
#: include/identity.php:741 include/identity.php:744 include/text.php:1012
#: include/nav.php:123 include/nav.php:187 view/theme/diabook/theme.php:125
msgid "Contacts"
msgstr "Contacts"
#: mod/contacts.php:796
msgid "Search your contacts"
msgstr "Rechercher dans vos contacts"
#: mod/contacts.php:797
msgid "Finding: "
msgstr "Trouvé: "
#: mod/contacts.php:798 mod/directory.php:210 include/contact_widgets.php:34
msgid "Find"
msgstr "Trouver"
#: mod/contacts.php:804 mod/settings.php:146 mod/settings.php:676
msgid "Update"
msgstr "Mises-à-jour"
#: mod/contacts.php:807 mod/contacts.php:878
msgid "Archive"
msgstr "Archiver"
#: mod/contacts.php:807 mod/contacts.php:878
msgid "Unarchive"
msgstr "Désarchiver"
#: mod/contacts.php:808 mod/group.php:171 mod/admin.php:1118
#: mod/content.php:440 mod/content.php:743 mod/settings.php:713
#: mod/photos.php:1723 object/Item.php:134 include/conversation.php:635
msgid "Delete"
msgstr "Supprimer"
#: mod/contacts.php:821 include/identity.php:686 include/nav.php:75
msgid "Status"
msgstr "Statut"
#: mod/contacts.php:824 include/identity.php:689
msgid "Status Messages and Posts"
msgstr "Messages d'état et publications"
#: mod/contacts.php:829 mod/profperm.php:104 mod/newmember.php:32
#: include/identity.php:578 include/identity.php:664 include/identity.php:694
#: include/nav.php:76 view/theme/diabook/theme.php:124
msgid "Profile"
msgstr "Profil"
#: mod/contacts.php:832 include/identity.php:697
msgid "Profile Details"
msgstr "Détails du profil"
#: mod/contacts.php:843
msgid "View all contacts"
msgstr "Voir tous les contacts"
#: mod/contacts.php:849 mod/common.php:134
msgid "Common Friends"
msgstr "Amis communs"
#: mod/contacts.php:852
msgid "View all common friends"
msgstr "Voir tous les amis communs"
#: mod/contacts.php:856
msgid "Repair"
msgstr "Réparer"
#: mod/contacts.php:859
msgid "Advanced Contact Settings"
msgstr "Réglages avancés du contact"
#: mod/contacts.php:867
msgid "Toggle Blocked status"
msgstr "(dés)activer l'état \"bloqué\""
#: mod/contacts.php:874
msgid "Toggle Ignored status"
msgstr "(dés)activer l'état \"ignoré\""
#: mod/contacts.php:881
msgid "Toggle Archive status"
msgstr "(dés)activer l'état \"archivé\""
#: mod/contacts.php:949
msgid "Mutual Friendship"
msgstr "Relation réciproque"
#: mod/contacts.php:953
msgid "is a fan of yours"
msgstr "Vous suit"
#: mod/contacts.php:957
msgid "you are a fan of"
msgstr "Vous le/la suivez"
#: mod/contacts.php:978 mod/nogroup.php:42
msgid "Edit contact"
msgstr "Éditer le contact"
#: mod/hcard.php:10
msgid "No profile"
msgstr "Aucun profil"
#: mod/manage.php:139
msgid "Manage Identities and/or Pages"
msgstr "Gérer les identités et/ou les pages"
#: mod/manage.php:140
msgid ""
"Toggle between different identities or community/group pages which share "
"your account details or which you have been granted \"manage\" permissions"
msgstr "Basculez entre les différentes identités ou pages (groupes/communautés) qui se partagent votre compte ou que vous avez été autorisé à gérer."
#: mod/manage.php:141
msgid "Select an identity to manage: "
msgstr "Choisir une identité à gérer: "
#: mod/oexchange.php:25
msgid "Post successful."
msgstr "Publication réussie."
#: mod/profperm.php:19 mod/group.php:72 index.php:382
msgid "Permission denied"
msgstr "Permission refusée"
#: mod/profperm.php:25 mod/profperm.php:56
msgid "Invalid profile identifier."
msgstr "Identifiant de profil invalide."
#: mod/profperm.php:102
msgid "Profile Visibility Editor"
msgstr "Éditer la visibilité du profil"
#: mod/profperm.php:106 mod/group.php:223
msgid "Click on a contact to add or remove."
msgstr "Cliquez sur un contact pour l'ajouter ou le supprimer."
#: mod/profperm.php:115
msgid "Visible To"
msgstr "Visible par"
#: mod/profperm.php:131
msgid "All Contacts (with secure profile access)"
msgstr "Tous les contacts (ayant un accès sécurisé)"
#: mod/display.php:82 mod/display.php:280 mod/display.php:497
#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1163 mod/admin.php:1384
#: mod/notice.php:15 include/items.php:4861
msgid "Item not found."
msgstr "Élément introuvable."
#: mod/display.php:209 mod/videos.php:197 mod/viewcontacts.php:35
#: mod/community.php:18 mod/dfrn_request.php:779 mod/search.php:93
#: mod/search.php:99 mod/directory.php:37 mod/photos.php:976
msgid "Public access denied."
msgstr "Accès public refusé."
#: mod/display.php:328 mod/profile.php:155
msgid "Access to this profile has been restricted."
msgstr "L'accès au profil a été restreint."
#: mod/display.php:490
msgid "Item has been removed."
msgstr "Cet élément a été enlevé."
#: mod/newmember.php:6
msgid "Welcome to Friendica"
msgstr "Bienvenue sur Friendica"
#: mod/newmember.php:8
msgid "New Member Checklist"
msgstr "Checklist du nouvel utilisateur"
#: mod/newmember.php:12
msgid ""
"We would like to offer some tips and links to help make your experience "
"enjoyable. Click any item to visit the relevant page. A link to this page "
"will be visible from your home page for two weeks after your initial "
"registration and then will quietly disappear."
msgstr "Nous souhaiterions vous donner quelques astuces et ressources pour rendre votre expérience la plus agréable possible. Cliquez sur n'importe lequel de ces éléments pour visiter la page correspondante. Un lien vers cette page restera visible sur votre page d'accueil pendant les deux semaines qui suivent votre inscription initiale, puis disparaîtra silencieusement."
#: mod/newmember.php:14
msgid "Getting Started"
msgstr "Bien démarrer"
#: mod/newmember.php:18
msgid "Friendica Walk-Through"
msgstr "Friendica pas-à-pas"
#: mod/newmember.php:18
msgid ""
"On your <em>Quick Start</em> page - find a brief introduction to your "
"profile and network tabs, make some new connections, and find some groups to"
" join."
msgstr "Sur votre page d'accueil, dans <em>Conseils aux nouveaux venus</em> - vous trouverez une rapide introduction aux onglets Profil et Réseau, pourrez vous connecter à Facebook, établir de nouvelles relations, et choisir des groupes à rejoindre."
#: mod/newmember.php:22 mod/admin.php:1215 mod/admin.php:1460
#: mod/settings.php:99 include/nav.php:182 view/theme/diabook/theme.php:544
#: view/theme/diabook/theme.php:648
msgid "Settings"
msgstr "Réglages"
#: mod/newmember.php:26
msgid "Go to Your Settings"
msgstr "Éditer vos Réglages"
#: mod/newmember.php:26
msgid ""
"On your <em>Settings</em> page - change your initial password. Also make a "
"note of your Identity Address. This looks just like an email address - and "
"will be useful in making friends on the free social web."
msgstr "Sur la page des <em>Réglages</em> - changez votre mot de passe initial. Notez bien votre Identité. Elle ressemble à une adresse de courriel - et vous sera utile pour vous faire des amis dans le web social libre."
#: mod/newmember.php:28
msgid ""
"Review the other settings, particularly the privacy settings. An unpublished"
" directory listing is like having an unlisted phone number. In general, you "
"should probably publish your listing - unless all of your friends and "
"potential friends know exactly how to find you."
msgstr "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver."
#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:709
msgid "Upload Profile Photo"
msgstr "Téléverser une photo de profil"
#: mod/newmember.php:36
msgid ""
"Upload a profile photo if you have not done so already. Studies have shown "
"that people with real photos of themselves are ten times more likely to make"
" friends than people who do not."
msgstr "Téléversez (envoyez) une photo de profil si vous n'en avez pas déjà une. Les études montrent que les gens qui affichent de vraies photos d'eux sont dix fois plus susceptibles de se faire des amis."
#: mod/newmember.php:38
msgid "Edit Your Profile"
msgstr "Éditer votre Profil"
#: mod/newmember.php:38
msgid ""
"Edit your <strong>default</strong> profile to your liking. Review the "
"settings for hiding your list of friends and hiding the profile from unknown"
" visitors."
msgstr "Éditez votre profil <strong>par défaut</strong> à votre convenance. Vérifiez les réglages concernant la visibilité de votre liste d'amis par les visiteurs inconnus."
#: mod/newmember.php:40
msgid "Profile Keywords"
msgstr "Mots-clés du profil"
#: mod/newmember.php:40
msgid ""
"Set some public keywords for your default profile which describe your "
"interests. We may be able to find other people with similar interests and "
"suggest friendships."
msgstr "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils pourront ainsi décrire vos centres d'intérêt, et nous pourrons vous proposer des contacts qui les partagent."
#: mod/newmember.php:44
msgid "Connecting"
msgstr "Connexions"
#: mod/newmember.php:49 mod/newmember.php:51 include/contact_selectors.php:81
msgid "Facebook"
msgstr "Facebook"
#: mod/newmember.php:49
msgid ""
"Authorise the Facebook Connector if you currently have a Facebook account "
"and we will (optionally) import all your Facebook friends and conversations."
msgstr "Activez et paramétrez le connecteur Facebook si vous avez un compte Facebook et nous pourrons (de manière facultative) importer tous vos amis et conversations Facebook."
#: mod/newmember.php:51
msgid ""
"<em>If</em> this is your own personal server, installing the Facebook addon "
"may ease your transition to the free social web."
msgstr "<em>Si</em> ceci est votre propre serveur, installer le connecteur Facebook peut adoucir votre transition vers le web social libre."
#: mod/newmember.php:56
msgid "Importing Emails"
msgstr "Importer courriels"
#: mod/newmember.php:56
msgid ""
"Enter your email access information on your Connector Settings page if you "
"wish to import and interact with friends or mailing lists from your email "
"INBOX"
msgstr "Entrez vos paramètres de courriel dans les Réglages des connecteurs si vous souhaitez importer et interagir avec des amis ou des listes venant de votre Boîte de Réception."
#: mod/newmember.php:58
msgid "Go to Your Contacts Page"
msgstr "Consulter vos Contacts"
#: mod/newmember.php:58
msgid ""
"Your Contacts page is your gateway to managing friendships and connecting "
"with friends on other networks. Typically you enter their address or site "
"URL in the <em>Add New Contact</em> dialog."
msgstr "Votre page Contacts est le point d'entrée vers la gestion de vos amitiés/relations et la connexion à des amis venant d'autres réseaux. Typiquement, vous pourrez y rentrer leur adresse d'Identité ou l'URL de leur site dans le formulaire <em>Ajouter un nouveau contact</em>."
#: mod/newmember.php:60
msgid "Go to Your Site's Directory"
msgstr "Consulter l'Annuaire de votre Site"
#: mod/newmember.php:60
msgid ""
"The Directory page lets you find other people in this network or other "
"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
"their profile page. Provide your own Identity Address if requested."
msgstr "La page Annuaire vous permet de trouver d'autres personnes au sein de ce réseaux ou parmi d'autres sites fédérés. Cherchez un lien <em>Relier</em> ou <em>Suivre</em> sur leur profil. Vous pourrez avoir besoin d'indiquer votre adresse d'identité."
#: mod/newmember.php:62
msgid "Finding New People"
msgstr "Trouver de nouvelles personnes"
#: mod/newmember.php:62
msgid ""
"On the side panel of the Contacts page are several tools to find new "
"friends. We can match people by interest, look up people by name or "
"interest, and provide suggestions based on network relationships. On a brand"
" new site, friend suggestions will usually begin to be populated within 24 "
"hours."
msgstr "Sur le panneau latéral de la page Contacts, il y a plusieurs moyens de trouver de nouveaux amis. Nous pouvons mettre les gens en relation selon leurs intérêts, rechercher des amis par nom ou intérêt, et fournir des suggestions en fonction de la topologie du réseau. Sur un site tout neuf, les suggestions d'amitié devraient commencer à apparaître au bout de 24 heures."
#: mod/newmember.php:66 include/group.php:283
msgid "Groups"
msgstr "Groupes"
#: mod/newmember.php:70
msgid "Group Your Contacts"
msgstr "Grouper vos contacts"
#: mod/newmember.php:70
msgid ""
"Once you have made some friends, organize them into private conversation "
"groups from the sidebar of your Contacts page and then you can interact with"
" each group privately on your Network page."
msgstr "Une fois que vous avez trouvé quelques amis, organisez-les en groupes de conversation privés depuis le panneau latéral de la page Contacts. Vous pourrez ensuite interagir avec chaque groupe de manière privée depuis la page Réseau."
#: mod/newmember.php:73
msgid "Why Aren't My Posts Public?"
msgstr "Pourquoi mes éléments ne sont pas publics ?"
#: mod/newmember.php:73
msgid ""
"Friendica respects your privacy. By default, your posts will only show up to"
" people you've added as friends. For more information, see the help section "
"from the link above."
msgstr "Friendica respecte votre vie privée. Par défaut, toutes vos publications seront seulement montrés à vos amis. Pour plus d'information, consultez la section \"aide\" du lien ci-dessus."
#: mod/newmember.php:78
msgid "Getting Help"
msgstr "Obtenir de l'aide"
#: mod/newmember.php:82
msgid "Go to the Help Section"
msgstr "Aller à la section Aide"
#: mod/newmember.php:82
msgid ""
"Our <strong>help</strong> pages may be consulted for detail on other program"
" features and resources."
msgstr "Nos pages d'<strong>aide</strong> peuvent être consultées pour davantage de détails sur les fonctionnalités ou les ressources."
#: mod/openid.php:24
msgid "OpenID protocol error. No ID returned."
msgstr "Erreur de protocole OpenID. Pas d'ID en retour."
#: mod/openid.php:53
msgid ""
"Account not found and OpenID registration is not permitted on this site."
msgstr "Compte introuvable, et l'inscription OpenID n'est pas autorisée sur ce site."
#: mod/openid.php:93 include/auth.php:112 include/auth.php:175
msgid "Login failed."
msgstr "Échec de connexion."
#: mod/profile_photo.php:44
msgid "Image uploaded but image cropping failed."
msgstr "Image envoyée, mais impossible de la retailler."
#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
#: mod/profile_photo.php:210 mod/profile_photo.php:302
#: mod/profile_photo.php:311 mod/photos.php:78 mod/photos.php:192
#: mod/photos.php:775 mod/photos.php:1245 mod/photos.php:1268
#: mod/photos.php:1862 include/user.php:345 include/user.php:352
#: include/user.php:359 view/theme/diabook/theme.php:500
msgid "Profile Photos"
msgstr "Photos du profil"
#: mod/profile_photo.php:77 mod/profile_photo.php:84 mod/profile_photo.php:91
#: mod/profile_photo.php:314
#, php-format
msgid "Image size reduction [%s] failed."
msgstr "Réduction de la taille de l'image [%s] échouée."
#: mod/profile_photo.php:124
msgid ""
"Shift-reload the page or clear browser cache if the new photo does not "
"display immediately."
msgstr "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache du navigateur, si d'aventure la nouvelle photo n'apparaissait pas immédiatement."
#: mod/profile_photo.php:134
msgid "Unable to process image"
msgstr "Impossible de traiter l'image"
#: mod/profile_photo.php:150 mod/wall_upload.php:151 mod/photos.php:811
#, php-format
msgid "Image exceeds size limit of %s"
msgstr "L'image dépasse la taille limite de %s"
#: mod/profile_photo.php:159 mod/wall_upload.php:183 mod/photos.php:851
msgid "Unable to process image."
msgstr "Impossible de traiter l'image."
#: mod/profile_photo.php:248
msgid "Upload File:"
msgstr "Fichier à téléverser:"
#: mod/profile_photo.php:249
msgid "Select a profile:"
msgstr "Choisir un profil:"
#: mod/profile_photo.php:251
msgid "Upload"
msgstr "Téléverser"
#: mod/profile_photo.php:254
msgid "or"
msgstr "ou"
#: mod/profile_photo.php:254
msgid "skip this step"
msgstr "ignorer cette étape"
#: mod/profile_photo.php:254
msgid "select a photo from your photo albums"
msgstr "choisissez une photo depuis vos albums"
#: mod/profile_photo.php:268
msgid "Crop Image"
msgstr "(Re)cadrer l'image"
#: mod/profile_photo.php:269
msgid "Please adjust the image cropping for optimum viewing."
msgstr "Ajustez le cadre de l'image pour une visualisation optimale."
#: mod/profile_photo.php:271
msgid "Done Editing"
msgstr "Édition terminée"
#: mod/profile_photo.php:305
msgid "Image uploaded successfully."
msgstr "Image téléversée avec succès."
#: mod/profile_photo.php:307 mod/wall_upload.php:216 mod/photos.php:878
msgid "Image upload failed."
msgstr "Le téléversement de l'image a échoué."
#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168
#: include/conversation.php:130 include/conversation.php:266
#: include/text.php:1993 include/diaspora.php:2147
#: view/theme/diabook/theme.php:471
msgid "photo"
msgstr "photo"
#: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168 mod/like.php:346
#: include/conversation.php:125 include/conversation.php:134
#: include/conversation.php:261 include/conversation.php:270
#: include/diaspora.php:2147 view/theme/diabook/theme.php:466
#: view/theme/diabook/theme.php:475
msgid "status"
msgstr "le statut"
#: mod/subthread.php:103
#, php-format
msgid "%1$s is following %2$s's %3$s"
msgstr "%1$s suit les %3$s de %2$s"
#: mod/tagrm.php:41
msgid "Tag removed"
msgstr "Étiquette supprimée"
#: mod/tagrm.php:79
msgid "Remove Item Tag"
msgstr "Enlever l'étiquette de l'élément"
#: mod/tagrm.php:81
msgid "Select a tag to remove: "
msgstr "Sélectionner une étiquette à supprimer: "
#: mod/tagrm.php:93 mod/delegate.php:139
msgid "Remove"
msgstr "Utiliser comme photo de profil"
#: mod/ostatus_subscribe.php:14
msgid "Subscribing to OStatus contacts"
msgstr ""
#: mod/ostatus_subscribe.php:25
msgid "No contact provided."
msgstr "Pas de contact fourni."
#: mod/ostatus_subscribe.php:30
msgid "Couldn't fetch information for contact."
msgstr "Impossible de récupérer les informations pour ce contact."
#: mod/ostatus_subscribe.php:38
msgid "Couldn't fetch friends for contact."
msgstr "Impossible de récupérer les amis de ce contact."
#: mod/ostatus_subscribe.php:51 mod/repair_ostatus.php:44
msgid "Done"
msgstr "Terminé"
#: mod/ostatus_subscribe.php:65
msgid "success"
msgstr "réussite"
#: mod/ostatus_subscribe.php:67
msgid "failed"
msgstr "échec"
#: mod/ostatus_subscribe.php:69 object/Item.php:235
msgid "ignored"
msgstr "ignoré"
#: mod/ostatus_subscribe.php:73 mod/repair_ostatus.php:50
msgid "Keep this window open until done."
msgstr "Veuillez garder cette fenêtre ouverte jusqu'à la fin."
#: mod/filer.php:30 include/conversation.php:1133
#: include/conversation.php:1151
msgid "Save to Folder:"
msgstr "Sauver dans le Dossier:"
#: mod/filer.php:30
msgid "- select -"
msgstr "- choisir -"
#: mod/filer.php:31 mod/editpost.php:109 mod/notes.php:61
#: include/text.php:1004
msgid "Save"
msgstr "Sauver"
#: mod/follow.php:18 mod/dfrn_request.php:863
msgid "Submit Request"
msgstr "Envoyer la requête"
#: mod/follow.php:29
msgid "You already added this contact."
msgstr "Vous avez déjà ajouté ce contact."
#: mod/follow.php:38
msgid "Diaspora support isn't enabled. Contact can't be added."
msgstr "Le support de Diaspora est désactivé. Le contact ne peut pas être ajouté."
#: mod/follow.php:45
msgid "OStatus support is disabled. Contact can't be added."
msgstr "Le support d'OStatus est désactivé. Le contact ne peut pas être ajouté."
#: mod/follow.php:52
msgid "The network type couldn't be detected. Contact can't be added."
msgstr "Impossible de détecter le type de réseau. Le contact ne peut pas être ajouté."
#: mod/follow.php:104 mod/dfrn_request.php:849
msgid "Please answer the following:"
msgstr "Merci de répondre à ce qui suit:"
#: mod/follow.php:105 mod/dfrn_request.php:850
#, php-format
msgid "Does %s know you?"
msgstr "Est-ce que %s vous connaît?"
#: mod/follow.php:105 mod/settings.php:1094 mod/settings.php:1100
#: mod/settings.php:1108 mod/settings.php:1112 mod/settings.php:1117
#: mod/settings.php:1123 mod/settings.php:1129 mod/settings.php:1135
#: mod/settings.php:1161 mod/settings.php:1162 mod/settings.php:1163
#: mod/settings.php:1164 mod/settings.php:1165 mod/dfrn_request.php:850
#: mod/register.php:239 mod/profiles.php:658 mod/profiles.php:662
#: mod/profiles.php:687 mod/api.php:106
msgid "No"
msgstr "Non"
#: mod/follow.php:106 mod/dfrn_request.php:854
msgid "Add a personal note:"
msgstr "Ajouter une note personnelle:"
#: mod/follow.php:112 mod/dfrn_request.php:860
msgid "Your Identity Address:"
msgstr "Votre adresse d'identité:"
#: mod/follow.php:162
msgid "Contact added"
msgstr "Contact ajouté"
#: mod/item.php:114
msgid "Unable to locate original post."
msgstr "Impossible de localiser la publication originale."
#: mod/item.php:318
msgid "Empty post discarded."
msgstr "Publication vide rejetée."
#: mod/item.php:456 mod/wall_upload.php:213 mod/wall_upload.php:227
#: mod/wall_upload.php:234 include/Photo.php:954 include/Photo.php:969
#: include/Photo.php:976 include/Photo.php:998 include/message.php:145
msgid "Wall Photos"
msgstr "Photos du mur"
#: mod/item.php:830
msgid "System error. Post not saved."
msgstr "Erreur système. Publication non sauvée."
#: mod/item.php:959
#, php-format
msgid ""
"This message was sent to you by %s, a member of the Friendica social "
"network."
msgstr "Ce message vous a été envoyé par %s, membre du réseau social Friendica."
#: mod/item.php:961
#, php-format
msgid "You may visit them online at %s"
msgstr "Vous pouvez leur rendre visite sur %s"
#: mod/item.php:962
msgid ""
"Please contact the sender by replying to this post if you do not wish to "
"receive these messages."
msgstr "Merci de contacter l’émetteur en répondant à cette publication si vous ne souhaitez pas recevoir ces messages."
#: mod/item.php:966
#, php-format
msgid "%s posted an update."
msgstr "%s a publié une mise à jour."
#: mod/group.php:29
msgid "Group created."
msgstr "Groupe créé."
#: mod/group.php:35
msgid "Could not create group."
msgstr "Impossible de créer le groupe."
#: mod/group.php:47 mod/group.php:140
msgid "Group not found."
msgstr "Groupe introuvable."
#: mod/group.php:60
msgid "Group name changed."
msgstr "Groupe renommé."
#: mod/group.php:87
msgid "Save Group"
msgstr "Sauvegarder le groupe"
#: mod/group.php:93
msgid "Create a group of contacts/friends."
msgstr "Créez un groupe de contacts/amis."
#: mod/group.php:94 mod/group.php:178 include/group.php:289
msgid "Group Name: "
msgstr "Nom du groupe: "
#: mod/group.php:113
msgid "Group removed."
msgstr "Groupe enlevé."
#: mod/group.php:115
msgid "Unable to remove group."
msgstr "Impossible d'enlever le groupe."
#: mod/group.php:177
msgid "Group Editor"
msgstr "Éditeur de groupe"
#: mod/group.php:190
msgid "Members"
msgstr "Membres"
#: mod/group.php:193 mod/network.php:563 mod/content.php:130
msgid "Group is empty"
msgstr "Groupe vide"
#: mod/apps.php:7 index.php:226
msgid "You must be logged in to use addons. "
msgstr "Vous devez être connecté pour utiliser les greffons."
#: mod/apps.php:11
msgid "Applications"
msgstr "Applications"
#: mod/apps.php:14
msgid "No installed applications."
msgstr "Pas d'application installée."
#: mod/dfrn_confirm.php:64 mod/profiles.php:18 mod/profiles.php:133
#: mod/profiles.php:179 mod/profiles.php:627
msgid "Profile not found."
msgstr "Profil introuvable."
#: mod/dfrn_confirm.php:120 mod/fsuggest.php:20 mod/fsuggest.php:92
#: mod/crepair.php:131
msgid "Contact not found."
msgstr "Contact introuvable."
#: mod/dfrn_confirm.php:121
msgid ""
"This may occasionally happen if contact was requested by both persons and it"
" has already been approved."
msgstr "Ceci peut se produire lorsque le contact a été requis par les deux personnes et a déjà été approuvé."
#: mod/dfrn_confirm.php:240
msgid "Response from remote site was not understood."
msgstr "Réponse du site distant incomprise."
#: mod/dfrn_confirm.php:249 mod/dfrn_confirm.php:254
msgid "Unexpected response from remote site: "
msgstr "Réponse inattendue du site distant : "
#: mod/dfrn_confirm.php:263
msgid "Confirmation completed successfully."
msgstr "Confirmation achevée avec succès."
#: mod/dfrn_confirm.php:265 mod/dfrn_confirm.php:279 mod/dfrn_confirm.php:286
msgid "Remote site reported: "
msgstr "Alerte du site distant : "
#: mod/dfrn_confirm.php:277
msgid "Temporary failure. Please wait and try again."
msgstr "Échec temporaire. Merci de recommencer ultérieurement."
#: mod/dfrn_confirm.php:284
msgid "Introduction failed or was revoked."
msgstr "Introduction échouée ou annulée."
#: mod/dfrn_confirm.php:430
msgid "Unable to set contact photo."
msgstr "Impossible de définir la photo du contact."
#: mod/dfrn_confirm.php:487 include/conversation.php:185
#: include/diaspora.php:637
#, php-format
msgid "%1$s is now friends with %2$s"
msgstr "%1$s est désormais lié à %2$s"
#: mod/dfrn_confirm.php:572
#, php-format
msgid "No user record found for '%s' "
msgstr "Pas d'utilisateur trouvé pour '%s' "
#: mod/dfrn_confirm.php:582
msgid "Our site encryption key is apparently messed up."
msgstr "Notre clé de chiffrement de site est apparemment corrompue."
#: mod/dfrn_confirm.php:593
msgid "Empty site URL was provided or URL could not be decrypted by us."
msgstr "URL de site absente ou indéchiffrable."
#: mod/dfrn_confirm.php:614
msgid "Contact record was not found for you on our site."
msgstr "Pas d'entrée pour ce contact sur notre site."
#: mod/dfrn_confirm.php:628
#, php-format
msgid "Site public key not available in contact record for URL %s."
msgstr "La clé publique du site ne se trouve pas dans l'enregistrement du contact pour l'URL %s."
#: mod/dfrn_confirm.php:648
msgid ""
"The ID provided by your system is a duplicate on our system. It should work "
"if you try again."
msgstr "L'identifiant fourni par votre système fait doublon sur le notre. Cela peut fonctionner si vous réessayez."
#: mod/dfrn_confirm.php:659
msgid "Unable to set your contact credentials on our system."
msgstr "Impossible de vous définir des permissions sur notre système."
#: mod/dfrn_confirm.php:726
msgid "Unable to update your contact profile details on our system"
msgstr "Impossible de mettre les détails de votre profil à jour sur notre système"
#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:734 include/items.php:4273
msgid "[Name Withheld]"
msgstr "[Nom non-publié]"
#: mod/dfrn_confirm.php:798
#, php-format
msgid "%1$s has joined %2$s"
msgstr "%1$s a rejoint %2$s"
#: mod/profile.php:21 include/identity.php:53
msgid "Requested profile is not available."
msgstr "Le profil demandé n'est pas disponible."
#: mod/profile.php:179
msgid "Tips for New Members"
msgstr "Conseils aux nouveaux venus"
#: mod/videos.php:123
msgid "Do you really want to delete this video?"
msgstr "Voulez-vous vraiment supprimer cette vidéo?"
#: mod/videos.php:128
msgid "Delete Video"
msgstr "Supprimer la vidéo"
#: mod/videos.php:207
msgid "No videos selected"
msgstr "Pas de vidéo sélectionné"
#: mod/videos.php:308 mod/photos.php:1087
msgid "Access to this item is restricted."
msgstr "Accès restreint à cet élément."
#: mod/videos.php:383 include/text.php:1465
msgid "View Video"
msgstr "Regarder la vidéo"
#: mod/videos.php:390 mod/photos.php:1890
msgid "View Album"
msgstr "Voir l'album"
#: mod/videos.php:399
msgid "Recent Videos"
msgstr "Vidéos récente"
#: mod/videos.php:401
msgid "Upload New Videos"
msgstr "Téléversé une nouvelle vidéo"
#: mod/tagger.php:95 include/conversation.php:278
#, php-format
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr "%1$s a étiqueté %3$s de %2$s avec %4$s"
#: mod/fsuggest.php:63
msgid "Friend suggestion sent."
msgstr "Suggestion d'amitié/contact envoyée."
#: mod/fsuggest.php:97
msgid "Suggest Friends"
msgstr "Suggérer des amis/contacts"
#: mod/fsuggest.php:99
#, php-format
msgid "Suggest a friend for %s"
msgstr "Suggérer un ami/contact pour %s"
#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
#: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17
#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1735
msgid "Invalid request."
msgstr "Requête invalide."
#: mod/lostpass.php:19
msgid "No valid account found."
msgstr "Impossible de trouver un compte valide."
#: mod/lostpass.php:35
msgid "Password reset request issued. Check your email."
msgstr "Réinitialisation du mot de passe en cours. Vérifiez votre courriel."
#: mod/lostpass.php:42
#, php-format
msgid ""
"\n"
"\t\tDear %1$s,\n"
"\t\t\tA request was recently received at \"%2$s\" to reset your account\n"
"\t\tpassword. In order to confirm this request, please select the verification link\n"
"\t\tbelow or paste it into your web browser address bar.\n"
"\n"
"\t\tIf you did NOT request this change, please DO NOT follow the link\n"
"\t\tprovided and ignore and/or delete this email.\n"
"\n"
"\t\tYour password will not be changed unless we can verify that you\n"
"\t\tissued this request."
msgstr "\n\t\tChère/Cher %1$s,\n\t\t\tNous avons reçu une demande de ré-initialisation du mot de passe de votre compte sur \"%2$s\". Pour confirmer cette demande, veuillez cliquer sur le lien de vérification ci-dessous ou le coller dans la barre d’adresse de votre navigateur.\n\n\t\tSi vous n’êtes PAS à l’origine de cette demande, NE suivez PAS le lien—ignorez et/ou supprimez ce message.\n\n\t\tVotre mot de passe ne sera pas modifié si nous n’avons pas de confirmation que la demande émane de vous."
#: mod/lostpass.php:53
#, php-format
msgid ""
"\n"
"\t\tFollow this link to verify your identity:\n"
"\n"
"\t\t%1$s\n"
"\n"
"\t\tYou will then receive a follow-up message containing the new password.\n"
"\t\tYou may change that password from your account settings page after logging in.\n"
"\n"
"\t\tThe login details are as follows:\n"
"\n"
"\t\tSite Location:\t%2$s\n"
"\t\tLogin Name:\t%3$s"
msgstr "\n\t\tSuivez ce lien pour confirmer votre identité :\n\n\t\t%1$s\n\n\t\tVous recevrez alors a message contenant votre nouveau mot de passe.\n\t\tVous pourrez changer ce mot de passe depuis les paramètres de votre compte une fois connecté.\n\n\t\tInformations de connexion :\n\n\t\tAdresse :\t%2$s\n\t\tIdentifiant :\t%3$s"
#: mod/lostpass.php:72
#, php-format
msgid "Password reset requested at %s"
msgstr "Requête de réinitialisation de mot de passe à %s"
#: mod/lostpass.php:92
msgid ""
"Request could not be verified. (You may have previously submitted it.) "
"Password reset failed."
msgstr "Impossible d'honorer cette demande. (Vous l'avez peut-être déjà utilisée par le passé.) La réinitialisation a échoué."
#: mod/lostpass.php:109 boot.php:1310
msgid "Password Reset"
msgstr "Réinitialiser le mot de passe"
#: mod/lostpass.php:110
msgid "Your password has been reset as requested."
msgstr "Votre mot de passe a bien été réinitialisé."
#: mod/lostpass.php:111
msgid "Your new password is"
msgstr "Votre nouveau mot de passe est "
#: mod/lostpass.php:112
msgid "Save or copy your new password - and then"
msgstr "Sauvez ou copiez ce nouveau mot de passe - puis"
#: mod/lostpass.php:113
msgid "click here to login"
msgstr "cliquez ici pour vous connecter"
#: mod/lostpass.php:114
msgid ""
"Your password may be changed from the <em>Settings</em> page after "
"successful login."
msgstr "Votre mot de passe peut être changé depuis la page &lt;em&gt;Réglages&lt;/em&gt;, une fois que vous serez connecté."
#: mod/lostpass.php:125
#, php-format
msgid ""
"\n"
"\t\t\t\tDear %1$s,\n"
"\t\t\t\t\tYour password has been changed as requested. Please retain this\n"
"\t\t\t\tinformation for your records (or change your password immediately to\n"
"\t\t\t\tsomething that you will remember).\n"
"\t\t\t"
msgstr "\n\t\t\t\tChère/Cher %1$s,\n\t\t\t\t\tVotre mot de passe a été changé ainsi que vous l’avez demandé. Veuillez conserver cette informations dans vos archives (ou changer immédiatement votre mot de passe pour un autre dont vous vous souviendrez).\n\t\t\t"
#: mod/lostpass.php:131
#, php-format
msgid ""
"\n"
"\t\t\t\tYour login details are as follows:\n"
"\n"
"\t\t\t\tSite Location:\t%1$s\n"
"\t\t\t\tLogin Name:\t%2$s\n"
"\t\t\t\tPassword:\t%3$s\n"
"\n"
"\t\t\t\tYou may change that password from your account settings page after logging in.\n"
"\t\t\t"
msgstr "\n\t\t\t\tVoici vos informations de connexion :\n\n\t\t\t\tAdresse :\t%1$s\n\t\t\t\tIdentifiant :\t%2$s\n\t\t\t\tMot de passe :\t%3$s\n\n\t\t\t\tVous pourrez changer votre mot de passe dans les paramètres de votre compte une fois connecté.\n\t\t\t"
#: mod/lostpass.php:147
#, php-format
msgid "Your password has been changed at %s"
msgstr "Votre mot de passe a été modifié à %s"
#: mod/lostpass.php:159
msgid "Forgot your Password?"
msgstr "Mot de passe oublié ?"
#: mod/lostpass.php:160
msgid ""
"Enter your email address and submit to have your password reset. Then check "
"your email for further instructions."
msgstr "Entrez votre adresse de courriel et validez pour réinitialiser votre mot de passe. Vous recevrez la suite des instructions par courriel."
#: mod/lostpass.php:161
msgid "Nickname or Email: "
msgstr "Pseudo ou eMail : "
#: mod/lostpass.php:162
msgid "Reset"
msgstr "Réinitialiser"
#: mod/like.php:170 include/conversation.php:122 include/conversation.php:258
#: include/text.php:1991 view/theme/diabook/theme.php:463
msgid "event"
msgstr "évènement"
#: mod/like.php:187 include/conversation.php:141 include/diaspora.php:2163
#: view/theme/diabook/theme.php:480
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr "%1$s aime %3$s de %2$s"
#: mod/like.php:189 include/conversation.php:144
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr "%1$s n'aime pas %3$s de %2$s"
#: mod/like.php:191
#, php-format
msgid "%1$s is attending %2$s's %3$s"
msgstr "%1$s participe à %3$s de %2$s"
#: mod/like.php:193
#, php-format
msgid "%1$s is not attending %2$s's %3$s"
msgstr "%1$s ne participe pas à %3$s de %2$s"
#: mod/like.php:195
#, php-format
msgid "%1$s may attend %2$s's %3$s"
msgstr "%1$s participera peut-être à %3$s de %2$s"
#: mod/ping.php:265
msgid "{0} wants to be your friend"
msgstr "{0} souhaite être votre ami(e)"
#: mod/ping.php:280
msgid "{0} sent you a message"
msgstr "{0} vous a envoyé un message"
#: mod/ping.php:295
msgid "{0} requested registration"
msgstr "{0} a demandé à s'inscrire"
#: mod/viewcontacts.php:72
msgid "No contacts."
msgstr "Aucun contact."
#: mod/notifications.php:29
msgid "Invalid request identifier."
msgstr "Identifiant de demande invalide."
#: mod/notifications.php:38 mod/notifications.php:180
#: mod/notifications.php:260
msgid "Discard"
msgstr "Rejeter"
#: mod/notifications.php:81
msgid "System"
msgstr "Système"
#: mod/notifications.php:87 mod/admin.php:228 include/nav.php:154
msgid "Network"
msgstr "Réseau"
#: mod/notifications.php:93 mod/network.php:381
msgid "Personal"
msgstr "Personnel"
#: mod/notifications.php:99 include/nav.php:104 include/nav.php:157
#: view/theme/diabook/theme.php:123
msgid "Home"
msgstr "Profil"
#: mod/notifications.php:105 include/nav.php:162
msgid "Introductions"
msgstr "Introductions"
#: mod/notifications.php:130
msgid "Show Ignored Requests"
msgstr "Voir les demandes ignorées"
#: mod/notifications.php:130
msgid "Hide Ignored Requests"
msgstr "Cacher les demandes ignorées"
#: mod/notifications.php:164 mod/notifications.php:234
msgid "Notification type: "
msgstr "Type de notification: "
#: mod/notifications.php:165
msgid "Friend Suggestion"
msgstr "Suggestion d'amitié/contact"
#: mod/notifications.php:167
#, php-format
msgid "suggested by %s"
msgstr "suggéré(e) par %s"
#: mod/notifications.php:173 mod/notifications.php:252
msgid "Post a new friend activity"
msgstr "Poster une nouvelle avtivité d'ami"
#: mod/notifications.php:173 mod/notifications.php:252
msgid "if applicable"
msgstr "si possible"
#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1116
msgid "Approve"
msgstr "Approuver"
#: mod/notifications.php:196
msgid "Claims to be known to you: "
msgstr "Prétend que vous le connaissez: "
#: mod/notifications.php:196
msgid "yes"
msgstr "oui"
#: mod/notifications.php:196
msgid "no"
msgstr "non"
#: mod/notifications.php:197
msgid ""
"Shall your connection be bidirectional or not? \"Friend\" implies that you "
"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that "
"you allow to read but you do not want to read theirs. Approve as: "
msgstr "Doit être votre connexion bidirectionnelle ou non? \"Ami\" implique que vous autorisiez à lire et vous vous abonnez à leurs postes. \"Fan / Admirateur\" signifie que vous permettez de lire, mais vous ne voulez pas lire les leurs. Approuver en:"
#: mod/notifications.php:200
msgid ""
"Shall your connection be bidirectional or not? \"Friend\" implies that you "
"allow to read and you subscribe to their posts. \"Sharer\" means that you "
"allow to read but you do not want to read theirs. Approve as: "
msgstr "Doit être votre connexion bidirectionnelle ou non? \"Ami\" implique que vous autorisiez à lire et vous vous abonnez à leurs postes. \"Fan / Admirateur\" signifie que vous permettez de lire, mais vous ne voulez pas lire les leurs. Approuver en:"
#: mod/notifications.php:208
msgid "Friend"
msgstr "Ami"
#: mod/notifications.php:209
msgid "Sharer"
msgstr "Initiateur du partage"
#: mod/notifications.php:209
msgid "Fan/Admirer"
msgstr "Fan/Admirateur"
#: mod/notifications.php:235
msgid "Friend/Connect Request"
msgstr "Demande de connexion/relation"
#: mod/notifications.php:235
msgid "New Follower"
msgstr "Nouvel abonné"
#: mod/notifications.php:250 mod/directory.php:147 include/identity.php:306
#: include/identity.php:589
msgid "Gender:"
msgstr "Genre:"