diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-07 18:35:29 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-07 18:35:29 +0200 |
| commit | cb05801a9031254f5882038de07a3ee4d5f89dd0 (patch) | |
| tree | 186d9d1a4c591ec23e0e5bbebd08301143b5c157 | |
| parent | 7308dbae282194356c2e95936aecc15ea059f356 (diff) | |
| parent | 0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee (diff) | |
| download | volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.gz volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.bz2 volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.zip | |
Merge commit 'upstream/master'
1393 files changed, 3554 insertions, 1443 deletions
diff --git a/.gitignore b/.gitignore index 2531fe4cd..2531fe4cd 100755..100644 --- a/.gitignore +++ b/.gitignore diff --git a/.htaccess b/.htaccess index 6cb3a0749..6cb3a0749 100755..100644 --- a/.htaccess +++ b/.htaccess diff --git a/INSTALL.txt b/INSTALL.txt index 574e90975..574e90975 100755..100644 --- a/INSTALL.txt +++ b/INSTALL.txt diff --git a/boot.php b/boot.php index c0aa9ba82..576cad6b6 100755..100644 --- a/boot.php +++ b/boot.php @@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1302' ); +define ( 'FRIENDICA_VERSION', '2.3.1304' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1134 ); +define ( 'DB_UPDATE_VERSION', 1137 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index a271e5491..010c63bb2 100755..100644 --- a/database.sql +++ b/database.sql @@ -34,10 +34,11 @@ CREATE TABLE IF NOT EXISTS `challenge` ( CREATE TABLE IF NOT EXISTS `config` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `cat` char(255) NOT NULL, - `k` char(255) NOT NULL, + `cat` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL, + `k` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL, `v` text NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + UNIQUE KEY `access`(`cat`,`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -542,9 +543,10 @@ INDEX ( `batch` ) CREATE TABLE IF NOT EXISTS `pconfig` ( `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , `uid` INT NOT NULL DEFAULT '0', -`cat` CHAR( 255 ) NOT NULL , -`k` CHAR( 255 ) NOT NULL , -`v` MEDIUMTEXT NOT NULL +`cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , +`k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , +`v` MEDIUMTEXT NOT NULL, +UNIQUE KEY `access`(`cat`, `k`) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index 164a6be46..164a6be46 100755..100644 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md index 46abea9a3..46abea9a3 100755..100644 --- a/doc/Bugs-and-Issues.md +++ b/doc/Bugs-and-Issues.md diff --git a/doc/Connectors.md b/doc/Connectors.md index 08b4c135e..08b4c135e 100755..100644 --- a/doc/Connectors.md +++ b/doc/Connectors.md diff --git a/doc/Developers.md b/doc/Developers.md index 17aff3869..17aff3869 100755..100644 --- a/doc/Developers.md +++ b/doc/Developers.md diff --git a/doc/Home.md b/doc/Home.md index 30efc93f7..30efc93f7 100755..100644 --- a/doc/Home.md +++ b/doc/Home.md diff --git a/doc/Install.md b/doc/Install.md index 9455c62ba..9455c62ba 100755..100644 --- a/doc/Install.md +++ b/doc/Install.md diff --git a/doc/Installing-Connectors.md b/doc/Installing-Connectors.md index 328e3b6c4..328e3b6c4 100755..100644 --- a/doc/Installing-Connectors.md +++ b/doc/Installing-Connectors.md diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md index 3f1a24c8d..3f1a24c8d 100755..100644 --- a/doc/Making-Friends.md +++ b/doc/Making-Friends.md diff --git a/doc/Message-Flow.md b/doc/Message-Flow.md index bb1c063d3..bb1c063d3 100755..100644 --- a/doc/Message-Flow.md +++ b/doc/Message-Flow.md diff --git a/doc/Pages.md b/doc/Pages.md index d0e6776a4..d0e6776a4 100755..100644 --- a/doc/Pages.md +++ b/doc/Pages.md diff --git a/doc/Plugins.md b/doc/Plugins.md index 29dff3187..29dff3187 100755..100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md diff --git a/doc/Profiles.md b/doc/Profiles.md index 716db908e..716db908e 100755..100644 --- a/doc/Profiles.md +++ b/doc/Profiles.md diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md index ae5de2cb6..ae5de2cb6 100755..100644 --- a/doc/Remove-Account.md +++ b/doc/Remove-Account.md diff --git a/doc/Settings.md b/doc/Settings.md index 9808ecc5d..9808ecc5d 100755..100644 --- a/doc/Settings.md +++ b/doc/Settings.md diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md index ce4e45f42..ce4e45f42 100755..100644 --- a/doc/Tags-and-Mentions.md +++ b/doc/Tags-and-Mentions.md diff --git a/htconfig.php b/htconfig.php index 63a40c809..63a40c809 100755..100644 --- a/htconfig.php +++ b/htconfig.php diff --git a/images/article.gif b/images/article.gif Binary files differindex 91aeef000..91aeef000 100755..100644 --- a/images/article.gif +++ b/images/article.gif diff --git a/images/audio.gif b/images/audio.gif Binary files differindex 4be977116..4be977116 100755..100644 --- a/images/audio.gif +++ b/images/audio.gif diff --git a/images/b_block.gif b/images/b_block.gif Binary files differindex 3bc7c056b..3bc7c056b 100755..100644 --- a/images/b_block.gif +++ b/images/b_block.gif diff --git a/images/b_drop.gif b/images/b_drop.gif Binary files differindex b08c68b62..b08c68b62 100755..100644 --- a/images/b_drop.gif +++ b/images/b_drop.gif diff --git a/images/b_drop.png b/images/b_drop.png Binary files differindex 6fc4d3b20..6fc4d3b20 100755..100644 --- a/images/b_drop.png +++ b/images/b_drop.png diff --git a/images/b_drophide.gif b/images/b_drophide.gif Binary files differindex 1207a935b..1207a935b 100755..100644 --- a/images/b_drophide.gif +++ b/images/b_drophide.gif diff --git a/images/b_dropshow.gif b/images/b_dropshow.gif Binary files differindex b08c68b62..b08c68b62 100755..100644 --- a/images/b_dropshow.gif +++ b/images/b_dropshow.gif diff --git a/images/b_edit.gif b/images/b_edit.gif Binary files differindex 79cb3c144..79cb3c144 100755..100644 --- a/images/b_edit.gif +++ b/images/b_edit.gif diff --git a/images/b_edit.png b/images/b_edit.png Binary files differindex 05711a094..05711a094 100755..100644 --- a/images/b_edit.png +++ b/images/b_edit.png diff --git a/images/calendar.png b/images/calendar.png Binary files differindex fbf52933d..fbf52933d 100755..100644 --- a/images/calendar.png +++ b/images/calendar.png diff --git a/images/camera-icon.gif b/images/camera-icon.gif Binary files differindex a4adf9adf..a4adf9adf 100755..100644 --- a/images/camera-icon.gif +++ b/images/camera-icon.gif diff --git a/images/connect-bg.png b/images/connect-bg.png Binary files differindex 0611c73e5..0611c73e5 100755..100644 --- a/images/connect-bg.png +++ b/images/connect-bg.png diff --git a/images/content-types.png b/images/content-types.png Binary files differindex e46eba610..e46eba610 100755..100644 --- a/images/content-types.png +++ b/images/content-types.png diff --git a/images/default-group-mm.png b/images/default-group-mm.png Binary files differindex bfc8b335a..bfc8b335a 100755..100644 --- a/images/default-group-mm.png +++ b/images/default-group-mm.png diff --git a/images/default-profile-mm.jpg b/images/default-profile-mm.jpg Binary files differindex 79c1a8530..79c1a8530 100755..100644 --- a/images/default-profile-mm.jpg +++ b/images/default-profile-mm.jpg diff --git a/images/default-profile-sm.jpg b/images/default-profile-sm.jpg Binary files differindex 348957fb4..348957fb4 100755..100644 --- a/images/default-profile-sm.jpg +++ b/images/default-profile-sm.jpg diff --git a/images/default-profile.jpg b/images/default-profile.jpg Binary files differindex 85fbca8cd..85fbca8cd 100755..100644 --- a/images/default-profile.jpg +++ b/images/default-profile.jpg diff --git a/images/diaspora.png b/images/diaspora.png Binary files differindex 725fae718..725fae718 100755..100644 --- a/images/diaspora.png +++ b/images/diaspora.png diff --git a/images/dislike.gif b/images/dislike.gif Binary files differindex 77779423c..77779423c 100755..100644 --- a/images/dislike.gif +++ b/images/dislike.gif diff --git a/images/document.gif b/images/document.gif Binary files differindex 02d940968..02d940968 100755..100644 --- a/images/document.gif +++ b/images/document.gif diff --git a/images/ff-128.jpg b/images/ff-128.jpg Binary files differindex eaa0a7e67..eaa0a7e67 100755..100644 --- a/images/ff-128.jpg +++ b/images/ff-128.jpg diff --git a/images/ff-16.jpg b/images/ff-16.jpg Binary files differindex 3621f5914..3621f5914 100755..100644 --- a/images/ff-16.jpg +++ b/images/ff-16.jpg diff --git a/images/ff-256.jpg b/images/ff-256.jpg Binary files differindex f80ba07f8..f80ba07f8 100755..100644 --- a/images/ff-256.jpg +++ b/images/ff-256.jpg diff --git a/images/ff-32.jpg b/images/ff-32.jpg Binary files differindex 7f3099916..7f3099916 100755..100644 --- a/images/ff-32.jpg +++ b/images/ff-32.jpg diff --git a/images/ff-64.jpg b/images/ff-64.jpg Binary files differindex b9cecf7c5..b9cecf7c5 100755..100644 --- a/images/ff-64.jpg +++ b/images/ff-64.jpg diff --git a/images/ff.xcf b/images/ff.xcf Binary files differindex a15425669..a15425669 100755..100644 --- a/images/ff.xcf +++ b/images/ff.xcf diff --git a/images/friendica-128.jpg b/images/friendica-128.jpg Binary files differindex f7d86ae50..f7d86ae50 100755..100644 --- a/images/friendica-128.jpg +++ b/images/friendica-128.jpg diff --git a/images/friendica-128.png b/images/friendica-128.png Binary files differindex d2792ab54..d2792ab54 100755..100644 --- a/images/friendica-128.png +++ b/images/friendica-128.png diff --git a/images/friendica-16.jpg b/images/friendica-16.jpg Binary files differindex ce59a70a0..ce59a70a0 100755..100644 --- a/images/friendica-16.jpg +++ b/images/friendica-16.jpg diff --git a/images/friendica-16.png b/images/friendica-16.png Binary files differindex 745b7ac6c..745b7ac6c 100755..100644 --- a/images/friendica-16.png +++ b/images/friendica-16.png diff --git a/images/friendica-1600.png b/images/friendica-1600.png Binary files differindex 615a81dd9..615a81dd9 100755..100644 --- a/images/friendica-1600.png +++ b/images/friendica-1600.png diff --git a/images/friendica-256.jpg b/images/friendica-256.jpg Binary files differindex 182810d62..182810d62 100755..100644 --- a/images/friendica-256.jpg +++ b/images/friendica-256.jpg diff --git a/images/friendica-256.png b/images/friendica-256.png Binary files differindex e965fbaba..e965fbaba 100755..100644 --- a/images/friendica-256.png +++ b/images/friendica-256.png diff --git a/images/friendica-32.jpg b/images/friendica-32.jpg Binary files differindex 4e697411d..4e697411d 100755..100644 --- a/images/friendica-32.jpg +++ b/images/friendica-32.jpg diff --git a/images/friendica-32.png b/images/friendica-32.png Binary files differindex 61764bf20..61764bf20 100755..100644 --- a/images/friendica-32.png +++ b/images/friendica-32.png diff --git a/images/friendica-48.png b/images/friendica-48.png Binary files differindex f858d9a81..f858d9a81 100755..100644 --- a/images/friendica-48.png +++ b/images/friendica-48.png diff --git a/images/friendica-64.jpg b/images/friendica-64.jpg Binary files differindex 050830fff..050830fff 100755..100644 --- a/images/friendica-64.jpg +++ b/images/friendica-64.jpg diff --git a/images/friendica-64.png b/images/friendica-64.png Binary files differindex 88cb8b016..88cb8b016 100755..100644 --- a/images/friendica-64.png +++ b/images/friendica-64.png diff --git a/images/friendica-96.png b/images/friendica-96.png Binary files differindex 76a102ef2..76a102ef2 100755..100644 --- a/images/friendica-96.png +++ b/images/friendica-96.png diff --git a/images/friendica.svg b/images/friendica.svg index 2105ef317..2105ef317 100755..100644 --- a/images/friendica.svg +++ b/images/friendica.svg diff --git a/images/friendika-128.jpg b/images/friendika-128.jpg Binary files differindex f7d86ae50..f7d86ae50 100755..100644 --- a/images/friendika-128.jpg +++ b/images/friendika-128.jpg diff --git a/images/friendika-128.png b/images/friendika-128.png Binary files differindex d2792ab54..d2792ab54 100755..100644 --- a/images/friendika-128.png +++ b/images/friendika-128.png diff --git a/images/friendika-16.jpg b/images/friendika-16.jpg Binary files differindex ce59a70a0..ce59a70a0 100755..100644 --- a/images/friendika-16.jpg +++ b/images/friendika-16.jpg diff --git a/images/friendika-16.png b/images/friendika-16.png Binary files differindex 745b7ac6c..745b7ac6c 100755..100644 --- a/images/friendika-16.png +++ b/images/friendika-16.png diff --git a/images/friendika-1600.png b/images/friendika-1600.png Binary files differindex 615a81dd9..615a81dd9 100755..100644 --- a/images/friendika-1600.png +++ b/images/friendika-1600.png diff --git a/images/friendika-256.jpg b/images/friendika-256.jpg Binary files differindex 182810d62..182810d62 100755..100644 --- a/images/friendika-256.jpg +++ b/images/friendika-256.jpg diff --git a/images/friendika-256.png b/images/friendika-256.png Binary files differindex e965fbaba..e965fbaba 100755..100644 --- a/images/friendika-256.png +++ b/images/friendika-256.png diff --git a/images/friendika-32.jpg b/images/friendika-32.jpg Binary files differindex 4e697411d..4e697411d 100755..100644 --- a/images/friendika-32.jpg +++ b/images/friendika-32.jpg diff --git a/images/friendika-32.png b/images/friendika-32.png Binary files differindex 61764bf20..61764bf20 100755..100644 --- a/images/friendika-32.png +++ b/images/friendika-32.png diff --git a/images/friendika-48.png b/images/friendika-48.png Binary files differindex f858d9a81..f858d9a81 100755..100644 --- a/images/friendika-48.png +++ b/images/friendika-48.png diff --git a/images/friendika-64.jpg b/images/friendika-64.jpg Binary files differindex 050830fff..050830fff 100755..100644 --- a/images/friendika-64.jpg +++ b/images/friendika-64.jpg diff --git a/images/friendika-64.png b/images/friendika-64.png Binary files differindex 88cb8b016..88cb8b016 100755..100644 --- a/images/friendika-64.png +++ b/images/friendika-64.png diff --git a/images/friendika-96.png b/images/friendika-96.png Binary files differindex 76a102ef2..76a102ef2 100755..100644 --- a/images/friendika-96.png +++ b/images/friendika-96.png diff --git a/images/friendika.svg b/images/friendika.svg index 2155d0b00..2155d0b00 100755..100644 --- a/images/friendika.svg +++ b/images/friendika.svg diff --git a/images/globe.gif b/images/globe.gif Binary files differindex 3f17c5d32..3f17c5d32 100755..100644 --- a/images/globe.gif +++ b/images/globe.gif diff --git a/images/hide_off.png b/images/hide_off.png Binary files differindex d504ca2e2..d504ca2e2 100755..100644 --- a/images/hide_off.png +++ b/images/hide_off.png diff --git a/images/hide_on.png b/images/hide_on.png Binary files differindex 960744c06..960744c06 100755..100644 --- a/images/hide_on.png +++ b/images/hide_on.png diff --git a/images/icons.png b/images/icons.png Binary files differindex dd3af3aee..dd3af3aee 100755..100644 --- a/images/icons.png +++ b/images/icons.png diff --git a/images/icons/10/add.png b/images/icons/10/add.png Binary files differindex 296e8e500..296e8e500 100755..100644 --- a/images/icons/10/add.png +++ b/images/icons/10/add.png diff --git a/images/icons/10/delete.png b/images/icons/10/delete.png Binary files differindex e4bd85933..e4bd85933 100755..100644 --- a/images/icons/10/delete.png +++ b/images/icons/10/delete.png diff --git a/images/icons/10/edit.png b/images/icons/10/edit.png Binary files differindex d939342a1..d939342a1 100755..100644 --- a/images/icons/10/edit.png +++ b/images/icons/10/edit.png diff --git a/images/icons/10/feed.png b/images/icons/10/feed.png Binary files differindex 22aa5fd4b..22aa5fd4b 100755..100644 --- a/images/icons/10/feed.png +++ b/images/icons/10/feed.png diff --git a/images/icons/10/gear.png b/images/icons/10/gear.png Binary files differindex b1f2a8f52..b1f2a8f52 100755..100644 --- a/images/icons/10/gear.png +++ b/images/icons/10/gear.png diff --git a/images/icons/10/group.png b/images/icons/10/group.png Binary files differindex a58d51910..a58d51910 100755..100644 --- a/images/icons/10/group.png +++ b/images/icons/10/group.png diff --git a/images/icons/10/info.png b/images/icons/10/info.png Binary files differindex 667c127c6..667c127c6 100755..100644 --- a/images/icons/10/info.png +++ b/images/icons/10/info.png diff --git a/images/icons/10/link.png b/images/icons/10/link.png Binary files differindex 0619f4511..0619f4511 100755..100644 --- a/images/icons/10/link.png +++ b/images/icons/10/link.png diff --git a/images/icons/10/lock.png b/images/icons/10/lock.png Binary files differindex 2ddf98d08..2ddf98d08 100755..100644 --- a/images/icons/10/lock.png +++ b/images/icons/10/lock.png diff --git a/images/icons/10/menu.png b/images/icons/10/menu.png Binary files differindex 7dbb779d0..7dbb779d0 100755..100644 --- a/images/icons/10/menu.png +++ b/images/icons/10/menu.png diff --git a/images/icons/10/notice.png b/images/icons/10/notice.png Binary files differindex 88ea4ac76..88ea4ac76 100755..100644 --- a/images/icons/10/notice.png +++ b/images/icons/10/notice.png diff --git a/images/icons/10/notify_off.png b/images/icons/10/notify_off.png Binary files differindex 8ba240e1d..8ba240e1d 100755..100644 --- a/images/icons/10/notify_off.png +++ b/images/icons/10/notify_off.png diff --git a/images/icons/10/notify_on.png b/images/icons/10/notify_on.png Binary files differindex d4ef71558..d4ef71558 100755..100644 --- a/images/icons/10/notify_on.png +++ b/images/icons/10/notify_on.png diff --git a/images/icons/10/play.png b/images/icons/10/play.png Binary files differindex a9f99e4d1..a9f99e4d1 100755..100644 --- a/images/icons/10/play.png +++ b/images/icons/10/play.png diff --git a/images/icons/10/plugin.png b/images/icons/10/plugin.png Binary files differindex 6cfc40786..6cfc40786 100755..100644 --- a/images/icons/10/plugin.png +++ b/images/icons/10/plugin.png diff --git a/images/icons/10/star.png b/images/icons/10/star.png Binary files differindex cd8518a18..cd8518a18 100755..100644 --- a/images/icons/10/star.png +++ b/images/icons/10/star.png diff --git a/images/icons/10/unlock.png b/images/icons/10/unlock.png Binary files differindex d18088416..d18088416 100755..100644 --- a/images/icons/10/unlock.png +++ b/images/icons/10/unlock.png diff --git a/images/icons/10/user.png b/images/icons/10/user.png Binary files differindex 6c2d161e8..6c2d161e8 100755..100644 --- a/images/icons/10/user.png +++ b/images/icons/10/user.png diff --git a/images/icons/16/add.png b/images/icons/16/add.png Binary files differindex 1ff064bb3..1ff064bb3 100755..100644 --- a/images/icons/16/add.png +++ b/images/icons/16/add.png diff --git a/images/icons/16/delete.png b/images/icons/16/delete.png Binary files differindex 532346860..532346860 100755..100644 --- a/images/icons/16/delete.png +++ b/images/icons/16/delete.png diff --git a/images/icons/16/edit.png b/images/icons/16/edit.png Binary files differindex bd845a767..bd845a767 100755..100644 --- a/images/icons/16/edit.png +++ b/images/icons/16/edit.png diff --git a/images/icons/16/feed.png b/images/icons/16/feed.png Binary files differindex 082e1bc73..082e1bc73 100755..100644 --- a/images/icons/16/feed.png +++ b/images/icons/16/feed.png diff --git a/images/icons/16/gear.png b/images/icons/16/gear.png Binary files differindex 86cbe1eb8..86cbe1eb8 100755..100644 --- a/images/icons/16/gear.png +++ b/images/icons/16/gear.png diff --git a/images/icons/16/group.png b/images/icons/16/group.png Binary files differindex 29ef69672..29ef69672 100755..100644 --- a/images/icons/16/group.png +++ b/images/icons/16/group.png diff --git a/images/icons/16/info.png b/images/icons/16/info.png Binary files differindex e8e7b35ba..e8e7b35ba 100755..100644 --- a/images/icons/16/info.png +++ b/images/icons/16/info.png diff --git a/images/icons/16/link.png b/images/icons/16/link.png Binary files differindex afec9cc30..afec9cc30 100755..100644 --- a/images/icons/16/link.png +++ b/images/icons/16/link.png diff --git a/images/icons/16/lock.png b/images/icons/16/lock.png Binary files differindex 189bfd29e..189bfd29e 100755..100644 --- a/images/icons/16/lock.png +++ b/images/icons/16/lock.png diff --git a/images/icons/16/menu.png b/images/icons/16/menu.png Binary files differindex a6b1cac47..a6b1cac47 100755..100644 --- a/images/icons/16/menu.png +++ b/images/icons/16/menu.png diff --git a/images/icons/16/notice.png b/images/icons/16/notice.png Binary files differindex 13c5c6b79..13c5c6b79 100755..100644 --- a/images/icons/16/notice.png +++ b/images/icons/16/notice.png diff --git a/images/icons/16/notify_off.png b/images/icons/16/notify_off.png Binary files differindex 3031fc906..3031fc906 100755..100644 --- a/images/icons/16/notify_off.png +++ b/images/icons/16/notify_off.png diff --git a/images/icons/16/notify_on.png b/images/icons/16/notify_on.png Binary files differindex 1da6245a6..1da6245a6 100755..100644 --- a/images/icons/16/notify_on.png +++ b/images/icons/16/notify_on.png diff --git a/images/icons/16/play.png b/images/icons/16/play.png Binary files differindex 19ad05bf2..19ad05bf2 100755..100644 --- a/images/icons/16/play.png +++ b/images/icons/16/play.png diff --git a/images/icons/16/plugin.png b/images/icons/16/plugin.png Binary files differindex b11d92082..b11d92082 100755..100644 --- a/images/icons/16/plugin.png +++ b/images/icons/16/plugin.png diff --git a/images/icons/16/star.png b/images/icons/16/star.png Binary files differindex ac620c43c..ac620c43c 100755..100644 --- a/images/icons/16/star.png +++ b/images/icons/16/star.png diff --git a/images/icons/16/unlock.png b/images/icons/16/unlock.png Binary files differindex c56495d02..c56495d02 100755..100644 --- a/images/icons/16/unlock.png +++ b/images/icons/16/unlock.png diff --git a/images/icons/16/user.png b/images/icons/16/user.png Binary files differindex 95c42c572..95c42c572 100755..100644 --- a/images/icons/16/user.png +++ b/images/icons/16/user.png diff --git a/images/icons/22/add.png b/images/icons/22/add.png Binary files differindex 2079e725d..2079e725d 100755..100644 --- a/images/icons/22/add.png +++ b/images/icons/22/add.png diff --git a/images/icons/22/delete.png b/images/icons/22/delete.png Binary files differindex d0f2acf13..d0f2acf13 100755..100644 --- a/images/icons/22/delete.png +++ b/images/icons/22/delete.png diff --git a/images/icons/22/edit.png b/images/icons/22/edit.png Binary files differindex ad251b8ed..ad251b8ed 100755..100644 --- a/images/icons/22/edit.png +++ b/images/icons/22/edit.png diff --git a/images/icons/22/feed.png b/images/icons/22/feed.png Binary files differindex a0b75f11d..a0b75f11d 100755..100644 --- a/images/icons/22/feed.png +++ b/images/icons/22/feed.png diff --git a/images/icons/22/gear.png b/images/icons/22/gear.png Binary files differindex 9ccf5280b..9ccf5280b 100755..100644 --- a/images/icons/22/gear.png +++ b/images/icons/22/gear.png diff --git a/images/icons/22/group.png b/images/icons/22/group.png Binary files differindex f1360159b..f1360159b 100755..100644 --- a/images/icons/22/group.png +++ b/images/icons/22/group.png diff --git a/images/icons/22/info.png b/images/icons/22/info.png Binary files differindex 18d32664d..18d32664d 100755..100644 --- a/images/icons/22/info.png +++ b/images/icons/22/info.png diff --git a/images/icons/22/link.png b/images/icons/22/link.png Binary files differindex e819ad3ac..e819ad3ac 100755..100644 --- a/images/icons/22/link.png +++ b/images/icons/22/link.png diff --git a/images/icons/22/lock.png b/images/icons/22/lock.png Binary files differindex 13b755810..13b755810 100755..100644 --- a/images/icons/22/lock.png +++ b/images/icons/22/lock.png diff --git a/images/icons/22/menu.png b/images/icons/22/menu.png Binary files differindex e3461da8b..e3461da8b 100755..100644 --- a/images/icons/22/menu.png +++ b/images/icons/22/menu.png diff --git a/images/icons/22/notice.png b/images/icons/22/notice.png Binary files differindex 2b9773892..2b9773892 100755..100644 --- a/images/icons/22/notice.png +++ b/images/icons/22/notice.png diff --git a/images/icons/22/notify_off.png b/images/icons/22/notify_off.png Binary files differindex 513687bc5..513687bc5 100755..100644 --- a/images/icons/22/notify_off.png +++ b/images/icons/22/notify_off.png diff --git a/images/icons/22/notify_on.png b/images/icons/22/notify_on.png Binary files differindex 18002e15c..18002e15c 100755..100644 --- a/images/icons/22/notify_on.png +++ b/images/icons/22/notify_on.png diff --git a/images/icons/22/play.png b/images/icons/22/play.png Binary files differindex a7a8b6124..a7a8b6124 100755..100644 --- a/images/icons/22/play.png +++ b/images/icons/22/play.png diff --git a/images/icons/22/plugin.png b/images/icons/22/plugin.png Binary files differindex cf4421125..cf4421125 100755..100644 --- a/images/icons/22/plugin.png +++ b/images/icons/22/plugin.png diff --git a/images/icons/22/star.png b/images/icons/22/star.png Binary files differindex 484e24794..484e24794 100755..100644 --- a/images/icons/22/star.png +++ b/images/icons/22/star.png diff --git a/images/icons/22/unlock.png b/images/icons/22/unlock.png Binary files differindex 9be196f55..9be196f55 100755..100644 --- a/images/icons/22/unlock.png +++ b/images/icons/22/unlock.png diff --git a/images/icons/22/user.png b/images/icons/22/user.png Binary files differindex 79bb05e4e..79bb05e4e 100755..100644 --- a/images/icons/22/user.png +++ b/images/icons/22/user.png diff --git a/images/icons/48/add.png b/images/icons/48/add.png Binary files differindex 753ac4b68..753ac4b68 100755..100644 --- a/images/icons/48/add.png +++ b/images/icons/48/add.png diff --git a/images/icons/48/delete.png b/images/icons/48/delete.png Binary files differindex 2835638a9..2835638a9 100755..100644 --- a/images/icons/48/delete.png +++ b/images/icons/48/delete.png diff --git a/images/icons/48/edit.png b/images/icons/48/edit.png Binary files differindex 709fbb357..709fbb357 100755..100644 --- a/images/icons/48/edit.png +++ b/images/icons/48/edit.png diff --git a/images/icons/48/feed.png b/images/icons/48/feed.png Binary files differindex 13d88f707..13d88f707 100755..100644 --- a/images/icons/48/feed.png +++ b/images/icons/48/feed.png diff --git a/images/icons/48/gear.png b/images/icons/48/gear.png Binary files differindex 8bb12e96e..8bb12e96e 100755..100644 --- a/images/icons/48/gear.png +++ b/images/icons/48/gear.png diff --git a/images/icons/48/group.png b/images/icons/48/group.png Binary files differindex 26238ac6a..26238ac6a 100755..100644 --- a/images/icons/48/group.png +++ b/images/icons/48/group.png diff --git a/images/icons/48/info.png b/images/icons/48/info.png Binary files differindex 760eca5c3..760eca5c3 100755..100644 --- a/images/icons/48/info.png +++ b/images/icons/48/info.png diff --git a/images/icons/48/link.png b/images/icons/48/link.png Binary files differindex b32eec529..b32eec529 100755..100644 --- a/images/icons/48/link.png +++ b/images/icons/48/link.png diff --git a/images/icons/48/lock.png b/images/icons/48/lock.png Binary files differindex b9db282ac..b9db282ac 100755..100644 --- a/images/icons/48/lock.png +++ b/images/icons/48/lock.png diff --git a/images/icons/48/menu.png b/images/icons/48/menu.png Binary files differindex 376e60cab..376e60cab 100755..100644 --- a/images/icons/48/menu.png +++ b/images/icons/48/menu.png diff --git a/images/icons/48/notice.png b/images/icons/48/notice.png Binary files differindex f6fbc95c6..f6fbc95c6 100755..100644 --- a/images/icons/48/notice.png +++ b/images/icons/48/notice.png diff --git a/images/icons/48/notify_off.png b/images/icons/48/notify_off.png Binary files differindex 7c8cd9788..7c8cd9788 100755..100644 --- a/images/icons/48/notify_off.png +++ b/images/icons/48/notify_off.png diff --git a/images/icons/48/notify_on.png b/images/icons/48/notify_on.png Binary files differindex 3275898c5..3275898c5 100755..100644 --- a/images/icons/48/notify_on.png +++ b/images/icons/48/notify_on.png diff --git a/images/icons/48/play.png b/images/icons/48/play.png Binary files differindex fce589370..fce589370 100755..100644 --- a/images/icons/48/play.png +++ b/images/icons/48/play.png diff --git a/images/icons/48/plugin.png b/images/icons/48/plugin.png Binary files differindex c74c6bf46..c74c6bf46 100755..100644 --- a/images/icons/48/plugin.png +++ b/images/icons/48/plugin.png diff --git a/images/icons/48/star.png b/images/icons/48/star.png Binary files differindex f53914efa..f53914efa 100755..100644 --- a/images/icons/48/star.png +++ b/images/icons/48/star.png diff --git a/images/icons/48/unlock.png b/images/icons/48/unlock.png Binary files differindex 9bf72a4c6..9bf72a4c6 100755..100644 --- a/images/icons/48/unlock.png +++ b/images/icons/48/unlock.png diff --git a/images/icons/48/user.png b/images/icons/48/user.png Binary files differindex c42410cd1..c42410cd1 100755..100644 --- a/images/icons/48/user.png +++ b/images/icons/48/user.png diff --git a/images/icons/Makefile b/images/icons/Makefile index bfb5927df..bfb5927df 100755..100644 --- a/images/icons/Makefile +++ b/images/icons/Makefile diff --git a/images/icons/add.png b/images/icons/add.png Binary files differindex 78497fbc9..78497fbc9 100755..100644 --- a/images/icons/add.png +++ b/images/icons/add.png diff --git a/images/icons/delete.png b/images/icons/delete.png Binary files differindex f0cae5154..f0cae5154 100755..100644 --- a/images/icons/delete.png +++ b/images/icons/delete.png diff --git a/images/icons/edit.png b/images/icons/edit.png Binary files differindex aeaf835fe..aeaf835fe 100755..100644 --- a/images/icons/edit.png +++ b/images/icons/edit.png diff --git a/images/icons/feed.png b/images/icons/feed.png Binary files differindex 6894257e9..6894257e9 100755..100644 --- a/images/icons/feed.png +++ b/images/icons/feed.png diff --git a/images/icons/gear.png b/images/icons/gear.png Binary files differindex 02847ef9d..02847ef9d 100755..100644 --- a/images/icons/gear.png +++ b/images/icons/gear.png diff --git a/images/icons/group.png b/images/icons/group.png Binary files differindex de0dc7901..de0dc7901 100755..100644 --- a/images/icons/group.png +++ b/images/icons/group.png diff --git a/images/icons/info.png b/images/icons/info.png Binary files differindex ea2b0ffa4..ea2b0ffa4 100755..100644 --- a/images/icons/info.png +++ b/images/icons/info.png diff --git a/images/icons/link.png b/images/icons/link.png Binary files differindex 743bdf0f9..743bdf0f9 100755..100644 --- a/images/icons/link.png +++ b/images/icons/link.png diff --git a/images/icons/lock.png b/images/icons/lock.png Binary files differindex 91a8f3ef2..91a8f3ef2 100755..100644 --- a/images/icons/lock.png +++ b/images/icons/lock.png diff --git a/images/icons/menu.png b/images/icons/menu.png Binary files differindex 56afc8541..56afc8541 100755..100644 --- a/images/icons/menu.png +++ b/images/icons/menu.png diff --git a/images/icons/notice.png b/images/icons/notice.png Binary files differindex b6017c8de..b6017c8de 100755..100644 --- a/images/icons/notice.png +++ b/images/icons/notice.png diff --git a/images/icons/notify_off.png b/images/icons/notify_off.png Binary files differindex e6eac16b8..e6eac16b8 100755..100644 --- a/images/icons/notify_off.png +++ b/images/icons/notify_off.png diff --git a/images/icons/notify_on.png b/images/icons/notify_on.png Binary files differindex b9e07d24e..b9e07d24e 100755..100644 --- a/images/icons/notify_on.png +++ b/images/icons/notify_on.png diff --git a/images/icons/play.png b/images/icons/play.png Binary files differindex 7c942072e..7c942072e 100755..100644 --- a/images/icons/play.png +++ b/images/icons/play.png diff --git a/images/icons/plugin.png b/images/icons/plugin.png Binary files differindex 943be0d93..943be0d93 100755..100644 --- a/images/icons/plugin.png +++ b/images/icons/plugin.png diff --git a/images/icons/star.png b/images/icons/star.png Binary files differindex 4a2236c9b..4a2236c9b 100755..100644 --- a/images/icons/star.png +++ b/images/icons/star.png diff --git a/images/icons/unlock.png b/images/icons/unlock.png Binary files differindex 4bf7e7eae..4bf7e7eae 100755..100644 --- a/images/icons/unlock.png +++ b/images/icons/unlock.png diff --git a/images/icons/user.png b/images/icons/user.png Binary files differindex f1132b1ae..f1132b1ae 100755..100644 --- a/images/icons/user.png +++ b/images/icons/user.png diff --git a/images/larrow.gif b/images/larrow.gif Binary files differindex ab08bb57e..ab08bb57e 100755..100644 --- a/images/larrow.gif +++ b/images/larrow.gif diff --git a/images/larrw.gif b/images/larrw.gif Binary files differindex 08902d772..08902d772 100755..100644 --- a/images/larrw.gif +++ b/images/larrw.gif diff --git a/images/like.gif b/images/like.gif Binary files differindex f71d0324d..f71d0324d 100755..100644 --- a/images/like.gif +++ b/images/like.gif diff --git a/images/link-icon.gif b/images/link-icon.gif Binary files differindex c012d716e..c012d716e 100755..100644 --- a/images/link-icon.gif +++ b/images/link-icon.gif diff --git a/images/lock_icon.gif b/images/lock_icon.gif Binary files differindex b6b1b7fed..b6b1b7fed 100755..100644 --- a/images/lock_icon.gif +++ b/images/lock_icon.gif diff --git a/images/logo.png b/images/logo.png Binary files differindex 1b977b697..1b977b697 100755..100644 --- a/images/logo.png +++ b/images/logo.png diff --git a/images/lrarrow.gif b/images/lrarrow.gif Binary files differindex fa2676944..fa2676944 100755..100644 --- a/images/lrarrow.gif +++ b/images/lrarrow.gif diff --git a/images/mapicon.gif b/images/mapicon.gif Binary files differindex dd20c209b..dd20c209b 100755..100644 --- a/images/mapicon.gif +++ b/images/mapicon.gif diff --git a/images/no.gif b/images/no.gif Binary files differindex eb0f2b0e9..eb0f2b0e9 100755..100644 --- a/images/no.gif +++ b/images/no.gif diff --git a/images/noglobe.gif b/images/noglobe.gif Binary files differindex 81e176567..81e176567 100755..100644 --- a/images/noglobe.gif +++ b/images/noglobe.gif diff --git a/images/nosign.jpg b/images/nosign.jpg Binary files differindex b73629332..b73629332 100755..100644 --- a/images/nosign.jpg +++ b/images/nosign.jpg diff --git a/images/onoff.jpg b/images/onoff.jpg Binary files differindex 7884912a7..7884912a7 100755..100644 --- a/images/onoff.jpg +++ b/images/onoff.jpg diff --git a/images/pause.gif b/images/pause.gif Binary files differindex dc57c4c98..dc57c4c98 100755..100644 --- a/images/pause.gif +++ b/images/pause.gif diff --git a/images/pen.png b/images/pen.png Binary files differindex 46b404941..46b404941 100755..100644 --- a/images/pen.png +++ b/images/pen.png diff --git a/images/pencil.gif b/images/pencil.gif Binary files differindex 26bfb0c9a..26bfb0c9a 100755..100644 --- a/images/pencil.gif +++ b/images/pencil.gif diff --git a/images/penhover.png b/images/penhover.png Binary files differindex be48d77b4..be48d77b4 100755..100644 --- a/images/penhover.png +++ b/images/penhover.png diff --git a/images/people.gif b/images/people.gif Binary files differindex cac31db2a..cac31db2a 100755..100644 --- a/images/people.gif +++ b/images/people.gif diff --git a/images/play.gif b/images/play.gif Binary files differindex 4010f056d..4010f056d 100755..100644 --- a/images/play.gif +++ b/images/play.gif diff --git a/images/plugin.png b/images/plugin.png Binary files differindex 08b09e060..08b09e060 100755..100644 --- a/images/plugin.png +++ b/images/plugin.png diff --git a/images/rarrow.gif b/images/rarrow.gif Binary files differindex a2d5df3e9..a2d5df3e9 100755..100644 --- a/images/rarrow.gif +++ b/images/rarrow.gif diff --git a/images/rarrw.gif b/images/rarrw.gif Binary files differindex 849238c2d..849238c2d 100755..100644 --- a/images/rarrw.gif +++ b/images/rarrw.gif diff --git a/images/recycle.gif b/images/recycle.gif Binary files differindex 01b3e13b4..01b3e13b4 100755..100644 --- a/images/recycle.gif +++ b/images/recycle.gif diff --git a/images/remote-link.gif b/images/remote-link.gif Binary files differindex 64de29aee..64de29aee 100755..100644 --- a/images/remote-link.gif +++ b/images/remote-link.gif diff --git a/images/rotator.gif b/images/rotator.gif Binary files differindex 3797ec3e4..3797ec3e4 100755..100644 --- a/images/rotator.gif +++ b/images/rotator.gif diff --git a/images/search_18.png b/images/search_18.png Binary files differindex 539739670..539739670 100755..100644 --- a/images/search_18.png +++ b/images/search_18.png diff --git a/images/selected.png b/images/selected.png Binary files differindex 79a7c77c6..79a7c77c6 100755..100644 --- a/images/selected.png +++ b/images/selected.png diff --git a/images/share.gif b/images/share.gif Binary files differindex 035fa2e38..035fa2e38 100755..100644 --- a/images/share.gif +++ b/images/share.gif diff --git a/images/show_all_off.png b/images/show_all_off.png Binary files differindex cc96d28f0..cc96d28f0 100755..100644 --- a/images/show_all_off.png +++ b/images/show_all_off.png diff --git a/images/show_all_on.png b/images/show_all_on.png Binary files differindex 87a7710b5..87a7710b5 100755..100644 --- a/images/show_all_on.png +++ b/images/show_all_on.png diff --git a/images/show_off.png b/images/show_off.png Binary files differindex 4bcf47123..4bcf47123 100755..100644 --- a/images/show_off.png +++ b/images/show_off.png diff --git a/images/show_on.png b/images/show_on.png Binary files differindex b8d1f5bac..b8d1f5bac 100755..100644 --- a/images/show_on.png +++ b/images/show_on.png diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif Binary files differindex a15d97427..a15d97427 100755..100644 --- a/images/smiley-Oo.gif +++ b/images/smiley-Oo.gif diff --git a/images/smiley-brokenheart.gif b/images/smiley-brokenheart.gif Binary files differindex 971b57fd9..971b57fd9 100755..100644 --- a/images/smiley-brokenheart.gif +++ b/images/smiley-brokenheart.gif diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif Binary files differindex cee1c1aa3..cee1c1aa3 100755..100644 --- a/images/smiley-cool.gif +++ b/images/smiley-cool.gif diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif Binary files differindex 06e6ca2c2..06e6ca2c2 100755..100644 --- a/images/smiley-cry.gif +++ b/images/smiley-cry.gif diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif Binary files differindex adc12e7c5..adc12e7c5 100755..100644 --- a/images/smiley-embarassed.gif +++ b/images/smiley-embarassed.gif diff --git a/images/smiley-foot-in-mouth.gif b/images/smiley-foot-in-mouth.gif Binary files differindex b444e5781..b444e5781 100755..100644 --- a/images/smiley-foot-in-mouth.gif +++ b/images/smiley-foot-in-mouth.gif diff --git a/images/smiley-frown.gif b/images/smiley-frown.gif Binary files differindex 9ff19850d..9ff19850d 100755..100644 --- a/images/smiley-frown.gif +++ b/images/smiley-frown.gif diff --git a/images/smiley-heart.gif b/images/smiley-heart.gif Binary files differindex 6a11e7065..6a11e7065 100755..100644 --- a/images/smiley-heart.gif +++ b/images/smiley-heart.gif diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif Binary files differindex 9d747140e..9d747140e 100755..100644 --- a/images/smiley-innocent.gif +++ b/images/smiley-innocent.gif diff --git a/images/smiley-kiss.gif b/images/smiley-kiss.gif Binary files differindex cc356611e..cc356611e 100755..100644 --- a/images/smiley-kiss.gif +++ b/images/smiley-kiss.gif diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif Binary files differindex 1bf29de79..1bf29de79 100755..100644 --- a/images/smiley-laughing.gif +++ b/images/smiley-laughing.gif diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif Binary files differindex 1e8ccd0f3..1e8ccd0f3 100755..100644 --- a/images/smiley-money-mouth.gif +++ b/images/smiley-money-mouth.gif diff --git a/images/smiley-sealed.gif b/images/smiley-sealed.gif Binary files differindex 98186742d..98186742d 100755..100644 --- a/images/smiley-sealed.gif +++ b/images/smiley-sealed.gif diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif Binary files differindex b9bff40a4..b9bff40a4 100755..100644 --- a/images/smiley-smile.gif +++ b/images/smiley-smile.gif diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif Binary files differindex b07465326..b07465326 100755..100644 --- a/images/smiley-surprised.gif +++ b/images/smiley-surprised.gif diff --git a/images/smiley-thumbsup.gif b/images/smiley-thumbsup.gif Binary files differindex a9533a64d..a9533a64d 100755..100644 --- a/images/smiley-thumbsup.gif +++ b/images/smiley-thumbsup.gif diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif Binary files differindex 48867dc26..48867dc26 100755..100644 --- a/images/smiley-tongue-out.gif +++ b/images/smiley-tongue-out.gif diff --git a/images/smiley-undecided.gif b/images/smiley-undecided.gif Binary files differindex 28029794f..28029794f 100755..100644 --- a/images/smiley-undecided.gif +++ b/images/smiley-undecided.gif diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif Binary files differindex e1cefb05c..e1cefb05c 100755..100644 --- a/images/smiley-wink.gif +++ b/images/smiley-wink.gif diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif Binary files differindex 5296c8836..5296c8836 100755..100644 --- a/images/smiley-yell.gif +++ b/images/smiley-yell.gif diff --git a/images/spencil.gif b/images/spencil.gif Binary files differindex 0a2551ac0..0a2551ac0 100755..100644 --- a/images/spencil.gif +++ b/images/spencil.gif diff --git a/images/star.png b/images/star.png Binary files differindex 0b00cb189..0b00cb189 100755..100644 --- a/images/star.png +++ b/images/star.png diff --git a/images/tag.png b/images/tag.png Binary files differindex 40c5fd44e..40c5fd44e 100755..100644 --- a/images/tag.png +++ b/images/tag.png diff --git a/images/tag_b.png b/images/tag_b.png Binary files differindex 66c03415d..66c03415d 100755..100644 --- a/images/tag_b.png +++ b/images/tag_b.png diff --git a/images/tools.png b/images/tools.png Binary files differindex c17094a81..c17094a81 100755..100644 --- a/images/tools.png +++ b/images/tools.png diff --git a/images/twopeople.png b/images/twopeople.png Binary files differindex 07a4a0882..07a4a0882 100755..100644 --- a/images/twopeople.png +++ b/images/twopeople.png diff --git a/images/unlock_icon.gif b/images/unlock_icon.gif Binary files differindex 254ac8bfd..254ac8bfd 100755..100644 --- a/images/unlock_icon.gif +++ b/images/unlock_icon.gif diff --git a/images/video.gif b/images/video.gif Binary files differindex e4d5e8cdd..e4d5e8cdd 100755..100644 --- a/images/video.gif +++ b/images/video.gif diff --git a/images/youtube_icon.gif b/images/youtube_icon.gif Binary files differindex 987b82bfd..987b82bfd 100755..100644 --- a/images/youtube_icon.gif +++ b/images/youtube_icon.gif diff --git a/include/Contact.php b/include/Contact.php index d9949b1ef..d9949b1ef 100755..100644 --- a/include/Contact.php +++ b/include/Contact.php diff --git a/include/EmailNotification.php b/include/EmailNotification.php index 8861e8f5d..8861e8f5d 100755..100644 --- a/include/EmailNotification.php +++ b/include/EmailNotification.php diff --git a/include/Photo.php b/include/Photo.php index 4d02b5c65..4d02b5c65 100755..100644 --- a/include/Photo.php +++ b/include/Photo.php diff --git a/include/Scrape.php b/include/Scrape.php index 9c237916b..9c237916b 100755..100644 --- a/include/Scrape.php +++ b/include/Scrape.php diff --git a/include/acl_selectors.php b/include/acl_selectors.php index a5f5aff53..a5f5aff53 100755..100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php diff --git a/include/api.php b/include/api.php index 065f14cff..065f14cff 100755..100644 --- a/include/api.php +++ b/include/api.php diff --git a/include/attach.php b/include/attach.php index 6d611cec0..6d611cec0 100755..100644 --- a/include/attach.php +++ b/include/attach.php diff --git a/include/auth.php b/include/auth.php index 1341f3bb8..1341f3bb8 100755..100644 --- a/include/auth.php +++ b/include/auth.php diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 8487f845a..8487f845a 100755..100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php diff --git a/include/cache.php b/include/cache.php index 3c8a3f713..3c8a3f713 100755..100644 --- a/include/cache.php +++ b/include/cache.php diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 4b3ca987a..4b3ca987a 100755..100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php diff --git a/include/contact_widgets.php b/include/contact_widgets.php index e0f37f078..e0f37f078 100755..100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php diff --git a/include/conversation.php b/include/conversation.php index df92a40ed..df92a40ed 100755..100644 --- a/include/conversation.php +++ b/include/conversation.php diff --git a/include/cronhooks.php b/include/cronhooks.php index 37541f013..37541f013 100755..100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php diff --git a/include/crypto.php b/include/crypto.php index 0feb45c24..0feb45c24 100755..100644 --- a/include/crypto.php +++ b/include/crypto.php diff --git a/include/datetime.php b/include/datetime.php index 6d395fe3f..6d395fe3f 100755..100644 --- a/include/datetime.php +++ b/include/datetime.php diff --git a/include/dba.php b/include/dba.php index 76cc0bc7b..76cc0bc7b 100755..100644 --- a/include/dba.php +++ b/include/dba.php diff --git a/include/delivery.php b/include/delivery.php index 794b8f27a..794b8f27a 100755..100644 --- a/include/delivery.php +++ b/include/delivery.php diff --git a/include/diaspora.php b/include/diaspora.php index 06df9c24a..06df9c24a 100755..100644 --- a/include/diaspora.php +++ b/include/diaspora.php diff --git a/include/directory.php b/include/directory.php index cae78adb4..cae78adb4 100755..100644 --- a/include/directory.php +++ b/include/directory.php diff --git a/include/email.php b/include/email.php index b43ae0dc1..b43ae0dc1 100755..100644 --- a/include/email.php +++ b/include/email.php diff --git a/include/enotify.php b/include/enotify.php index 8385bdec5..8385bdec5 100755..100644 --- a/include/enotify.php +++ b/include/enotify.php diff --git a/include/event.php b/include/event.php index 29202badd..29202badd 100755..100644 --- a/include/event.php +++ b/include/event.php diff --git a/include/expire.php b/include/expire.php index 5fa0ec758..5fa0ec758 100755..100644 --- a/include/expire.php +++ b/include/expire.php diff --git a/include/fcontact.php b/include/fcontact.php index 8821a985f..8821a985f 100755..100644 --- a/include/fcontact.php +++ b/include/fcontact.php diff --git a/include/group.php b/include/group.php index 4a35912e5..4a35912e5 100755..100644 --- a/include/group.php +++ b/include/group.php diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 69ccf41b7..69ccf41b7 100755..100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php diff --git a/include/items.php b/include/items.php index ee6960534..ee6960534 100755..100644 --- a/include/items.php +++ b/include/items.php diff --git a/include/message.php b/include/message.php index 377d7c715..377d7c715 100755..100644 --- a/include/message.php +++ b/include/message.php diff --git a/include/nav.php b/include/nav.php index 2c9c643a9..2c9c643a9 100755..100644 --- a/include/nav.php +++ b/include/nav.php diff --git a/include/network.php b/include/network.php index 38d0980d5..38d0980d5 100755..100644 --- a/include/network.php +++ b/include/network.php diff --git a/include/notifier.php b/include/notifier.php index ca7c7b92e..ca7c7b92e 100755..100644 --- a/include/notifier.php +++ b/include/notifier.php diff --git a/include/oauth.php b/include/oauth.php index 2724dcf7c..2724dcf7c 100755..100644 --- a/include/oauth.php +++ b/include/oauth.php diff --git a/include/oembed.php b/include/oembed.php index 1f45d2814..1f45d2814 100755..100644 --- a/include/oembed.php +++ b/include/oembed.php diff --git a/include/pgettext.php b/include/pgettext.php index 83e76ba9d..83e76ba9d 100755..100644 --- a/include/pgettext.php +++ b/include/pgettext.php diff --git a/include/plugin.php b/include/plugin.php index e37ae8435..8196e8756 100755..100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -17,7 +17,12 @@ function uninstall_plugin($plugin){ }} if (! function_exists('install_plugin')){ -function install_plugin($plugin){ +function install_plugin($plugin) { + + // silently fail if plugin was removed + + if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) + return false; logger("Addons: installing " . $plugin); $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); @include_once('addon/' . $plugin . '/' . $plugin . '.php'); @@ -32,9 +37,11 @@ function install_plugin($plugin){ intval($t), $plugin_admin ); + return true; } else { logger("Addons: FAILED installing " . $plugin); + return false; } }} diff --git a/include/poller.php b/include/poller.php index 499483d00..499483d00 100755..100644 --- a/include/poller.php +++ b/include/poller.php diff --git a/include/profile_advanced.php b/include/profile_advanced.php index 004a58524..004a58524 100755..100644 --- a/include/profile_advanced.php +++ b/include/profile_advanced.php diff --git a/include/profile_selectors.php b/include/profile_selectors.php index 92579f64a..92579f64a 100755..100644 --- a/include/profile_selectors.php +++ b/include/profile_selectors.php diff --git a/include/profile_update.php b/include/profile_update.php index 61eaee75d..61eaee75d 100755..100644 --- a/include/profile_update.php +++ b/include/profile_update.php diff --git a/include/queue.php b/include/queue.php index 7e92705be..7e92705be 100755..100644 --- a/include/queue.php +++ b/include/queue.php diff --git a/include/queue_fn.php b/include/queue_fn.php index 3c1087f4e..3c1087f4e 100755..100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php diff --git a/include/remoteupdate.php b/include/remoteupdate.php index 9effc9b6e..9effc9b6e 100755..100644 --- a/include/remoteupdate.php +++ b/include/remoteupdate.php diff --git a/include/salmon.php b/include/salmon.php index 3d525f51a..3d525f51a 100755..100644 --- a/include/salmon.php +++ b/include/salmon.php diff --git a/include/security.php b/include/security.php index 66622fd33..66622fd33 100755..100644 --- a/include/security.php +++ b/include/security.php diff --git a/include/session.php b/include/session.php index 6c32e299f..6c32e299f 100755..100644 --- a/include/session.php +++ b/include/session.php diff --git a/include/socgraph.php b/include/socgraph.php index 3f5194049..3f5194049 100755..100644 --- a/include/socgraph.php +++ b/include/socgraph.php diff --git a/include/system_unavailable.php b/include/system_unavailable.php index bd7196cdf..bd7196cdf 100755..100644 --- a/include/system_unavailable.php +++ b/include/system_unavailable.php diff --git a/include/template_processor.php b/include/template_processor.php index 4c317efe1..46252c355 100755..100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -13,12 +13,14 @@ var $debug=false; private function _preg_error(){ + switch(preg_last_error()){ case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break; case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break; case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break; case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break; - case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; +// This is only valid for php > 5.3, not certain how to code around it for unit tests +// case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break; default: //die("Unknown preg error."); return; diff --git a/include/text.php b/include/text.php index 5456b5ad3..aced9e0a8 100644 --- a/include/text.php +++ b/include/text.php @@ -80,6 +80,9 @@ function escape_tags($string) { if(! function_exists('autoname')) { function autoname($len) { + if($len <= 0) + return ''; + $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); if(mt_rand(0,5) == 4) $vowels[] = 'y'; diff --git a/index.php b/index.php index e7227962f..e7227962f 100755..100644 --- a/index.php +++ b/index.php diff --git a/js/acl.js b/js/acl.js index e383224ca..e383224ca 100755..100644 --- a/js/acl.js +++ b/js/acl.js diff --git a/js/ajaxupload.js b/js/ajaxupload.js index 67c4a56fb..67c4a56fb 100755..100644 --- a/js/ajaxupload.js +++ b/js/ajaxupload.js diff --git a/js/country.js b/js/country.js index 1c7505580..1c7505580 100755..100644 --- a/js/country.js +++ b/js/country.js diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index b1db92c41..b1db92c41 100755..100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js diff --git a/js/jquery.htmlstream.js b/js/jquery.htmlstream.js index c62c538f7..c62c538f7 100755..100644 --- a/js/jquery.htmlstream.js +++ b/js/jquery.htmlstream.js diff --git a/js/jquery.js b/js/jquery.js index 198b3ff07..198b3ff07 100755..100644 --- a/js/jquery.js +++ b/js/jquery.js diff --git a/js/jquery.textinputs.js b/js/jquery.textinputs.js index fd6d14569..fd6d14569 100755..100644 --- a/js/jquery.textinputs.js +++ b/js/jquery.textinputs.js diff --git a/js/main.js b/js/main.js index 744691b6d..7f0428b5b 100755 --- a/js/main.js +++ b/js/main.js @@ -119,9 +119,7 @@ var home = $(data).find('home').text(); if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') } $('#home-update').html(home); - - - + var intro = $(data).find('intro').text(); if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') } $('#intro-update').html(intro); @@ -129,6 +127,14 @@ var mail = $(data).find('mail').text(); if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') } $('#mail-update').html(mail); + + var intro = $(data).find('intro').text(); + if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') } + $('#intro-update-li').html(intro); + + var mail = $(data).find('mail').text(); + if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') } + $('#mail-update-li').html(mail); var eNotif = $(data).find('notif') notif = eNotif.attr('count'); diff --git a/js/webtoolkit.base64.js b/js/webtoolkit.base64.js index 5fa3c1ed7..5fa3c1ed7 100755..100644 --- a/js/webtoolkit.base64.js +++ b/js/webtoolkit.base64.js diff --git a/library/ASNValue.class.php b/library/ASNValue.class.php index 7a3c5d20e..7a3c5d20e 100755..100644 --- a/library/ASNValue.class.php +++ b/library/ASNValue.class.php diff --git a/library/HTML5/Data.php b/library/HTML5/Data.php index fa97e3ee8..fa97e3ee8 100755..100644 --- a/library/HTML5/Data.php +++ b/library/HTML5/Data.php diff --git a/library/HTML5/InputStream.php b/library/HTML5/InputStream.php index f98b42723..f98b42723 100755..100644 --- a/library/HTML5/InputStream.php +++ b/library/HTML5/InputStream.php diff --git a/library/HTML5/Parser.php b/library/HTML5/Parser.php index 5f9ca560e..5f9ca560e 100755..100644 --- a/library/HTML5/Parser.php +++ b/library/HTML5/Parser.php diff --git a/library/HTML5/Tokenizer.php b/library/HTML5/Tokenizer.php index 06c73065f..06c73065f 100755..100644 --- a/library/HTML5/Tokenizer.php +++ b/library/HTML5/Tokenizer.php diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php index 578e73682..578e73682 100755..100644 --- a/library/HTML5/TreeBuilder.php +++ b/library/HTML5/TreeBuilder.php diff --git a/library/HTML5/named-character-references.ser b/library/HTML5/named-character-references.ser index 3004c4b91..3004c4b91 100755..100644 --- a/library/HTML5/named-character-references.ser +++ b/library/HTML5/named-character-references.ser diff --git a/library/HTMLPurifier.auto.php b/library/HTMLPurifier.auto.php index 1960c399f..1960c399f 100755..100644 --- a/library/HTMLPurifier.auto.php +++ b/library/HTMLPurifier.auto.php diff --git a/library/HTMLPurifier.autoload.php b/library/HTMLPurifier.autoload.php index 8d4017640..8d4017640 100755..100644 --- a/library/HTMLPurifier.autoload.php +++ b/library/HTMLPurifier.autoload.php diff --git a/library/HTMLPurifier.func.php b/library/HTMLPurifier.func.php index 56a55b2fe..56a55b2fe 100755..100644 --- a/library/HTMLPurifier.func.php +++ b/library/HTMLPurifier.func.php diff --git a/library/HTMLPurifier.includes.php b/library/HTMLPurifier.includes.php index 2ed0f0c17..2ed0f0c17 100755..100644 --- a/library/HTMLPurifier.includes.php +++ b/library/HTMLPurifier.includes.php diff --git a/library/HTMLPurifier.kses.php b/library/HTMLPurifier.kses.php index 3143feb17..3143feb17 100755..100644 --- a/library/HTMLPurifier.kses.php +++ b/library/HTMLPurifier.kses.php diff --git a/library/HTMLPurifier.path.php b/library/HTMLPurifier.path.php index 39b1b6531..39b1b6531 100755..100644 --- a/library/HTMLPurifier.path.php +++ b/library/HTMLPurifier.path.php diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php index ba2c7b306..ba2c7b306 100755..100644 --- a/library/HTMLPurifier.php +++ b/library/HTMLPurifier.php diff --git a/library/HTMLPurifier.safe-includes.php b/library/HTMLPurifier.safe-includes.php index 6402de045..6402de045 100755..100644 --- a/library/HTMLPurifier.safe-includes.php +++ b/library/HTMLPurifier.safe-includes.php diff --git a/library/HTMLPurifier/AttrCollections.php b/library/HTMLPurifier/AttrCollections.php index 555b86d04..555b86d04 100755..100644 --- a/library/HTMLPurifier/AttrCollections.php +++ b/library/HTMLPurifier/AttrCollections.php diff --git a/library/HTMLPurifier/AttrDef.php b/library/HTMLPurifier/AttrDef.php index b2e4f36c5..b2e4f36c5 100755..100644 --- a/library/HTMLPurifier/AttrDef.php +++ b/library/HTMLPurifier/AttrDef.php diff --git a/library/HTMLPurifier/AttrDef/CSS.php b/library/HTMLPurifier/AttrDef/CSS.php index 953e70675..953e70675 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS.php +++ b/library/HTMLPurifier/AttrDef/CSS.php diff --git a/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php b/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php index 292c040d4..292c040d4 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php +++ b/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Background.php b/library/HTMLPurifier/AttrDef/CSS/Background.php index 3a3d20cd6..3a3d20cd6 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Background.php +++ b/library/HTMLPurifier/AttrDef/CSS/Background.php diff --git a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php index fae82eaec..fae82eaec 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php +++ b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Border.php b/library/HTMLPurifier/AttrDef/CSS/Border.php index 42a1d1b4a..42a1d1b4a 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Border.php +++ b/library/HTMLPurifier/AttrDef/CSS/Border.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Color.php b/library/HTMLPurifier/AttrDef/CSS/Color.php index 07f95a671..07f95a671 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Color.php +++ b/library/HTMLPurifier/AttrDef/CSS/Color.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Composite.php b/library/HTMLPurifier/AttrDef/CSS/Composite.php index de1289cba..de1289cba 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Composite.php +++ b/library/HTMLPurifier/AttrDef/CSS/Composite.php diff --git a/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php b/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php index 6599c5b2d..6599c5b2d 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php +++ b/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Filter.php b/library/HTMLPurifier/AttrDef/CSS/Filter.php index 147894b86..147894b86 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Filter.php +++ b/library/HTMLPurifier/AttrDef/CSS/Filter.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Font.php b/library/HTMLPurifier/AttrDef/CSS/Font.php index 699ee0b70..699ee0b70 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Font.php +++ b/library/HTMLPurifier/AttrDef/CSS/Font.php diff --git a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php index 42c2054c2..42c2054c2 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php +++ b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php diff --git a/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php b/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php index 4e6b35e5a..4e6b35e5a 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php +++ b/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Length.php b/library/HTMLPurifier/AttrDef/CSS/Length.php index a07ec5813..a07ec5813 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Length.php +++ b/library/HTMLPurifier/AttrDef/CSS/Length.php diff --git a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php index 4406868c0..4406868c0 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php +++ b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Multiple.php b/library/HTMLPurifier/AttrDef/CSS/Multiple.php index 4d62a40d7..4d62a40d7 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Multiple.php +++ b/library/HTMLPurifier/AttrDef/CSS/Multiple.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Number.php b/library/HTMLPurifier/AttrDef/CSS/Number.php index 3f99e12ec..3f99e12ec 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Number.php +++ b/library/HTMLPurifier/AttrDef/CSS/Number.php diff --git a/library/HTMLPurifier/AttrDef/CSS/Percentage.php b/library/HTMLPurifier/AttrDef/CSS/Percentage.php index c34b8fc3c..c34b8fc3c 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/Percentage.php +++ b/library/HTMLPurifier/AttrDef/CSS/Percentage.php diff --git a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php index 772c922d8..772c922d8 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php +++ b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php diff --git a/library/HTMLPurifier/AttrDef/CSS/URI.php b/library/HTMLPurifier/AttrDef/CSS/URI.php index 1df17dc25..1df17dc25 100755..100644 --- a/library/HTMLPurifier/AttrDef/CSS/URI.php +++ b/library/HTMLPurifier/AttrDef/CSS/URI.php diff --git a/library/HTMLPurifier/AttrDef/Enum.php b/library/HTMLPurifier/AttrDef/Enum.php index 5d603ebcc..5d603ebcc 100755..100644 --- a/library/HTMLPurifier/AttrDef/Enum.php +++ b/library/HTMLPurifier/AttrDef/Enum.php diff --git a/library/HTMLPurifier/AttrDef/HTML/Bool.php b/library/HTMLPurifier/AttrDef/HTML/Bool.php index e06987eb8..e06987eb8 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/Bool.php +++ b/library/HTMLPurifier/AttrDef/HTML/Bool.php diff --git a/library/HTMLPurifier/AttrDef/HTML/Class.php b/library/HTMLPurifier/AttrDef/HTML/Class.php index 370068d97..370068d97 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/Class.php +++ b/library/HTMLPurifier/AttrDef/HTML/Class.php diff --git a/library/HTMLPurifier/AttrDef/HTML/Color.php b/library/HTMLPurifier/AttrDef/HTML/Color.php index d01e20454..d01e20454 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/Color.php +++ b/library/HTMLPurifier/AttrDef/HTML/Color.php diff --git a/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php b/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php index ae6ea7c01..ae6ea7c01 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php +++ b/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php diff --git a/library/HTMLPurifier/AttrDef/HTML/ID.php b/library/HTMLPurifier/AttrDef/HTML/ID.php index 81d03762d..81d03762d 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/ID.php +++ b/library/HTMLPurifier/AttrDef/HTML/ID.php diff --git a/library/HTMLPurifier/AttrDef/HTML/Length.php b/library/HTMLPurifier/AttrDef/HTML/Length.php index a242f9c23..a242f9c23 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/Length.php +++ b/library/HTMLPurifier/AttrDef/HTML/Length.php diff --git a/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php b/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php index 76d25ed08..76d25ed08 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php +++ b/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php diff --git a/library/HTMLPurifier/AttrDef/HTML/MultiLength.php b/library/HTMLPurifier/AttrDef/HTML/MultiLength.php index c72fc76e4..c72fc76e4 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/MultiLength.php +++ b/library/HTMLPurifier/AttrDef/HTML/MultiLength.php diff --git a/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php b/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php index aa34120bd..aa34120bd 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php +++ b/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php diff --git a/library/HTMLPurifier/AttrDef/HTML/Pixels.php b/library/HTMLPurifier/AttrDef/HTML/Pixels.php index 4cb2c1b85..4cb2c1b85 100755..100644 --- a/library/HTMLPurifier/AttrDef/HTML/Pixels.php +++ b/library/HTMLPurifier/AttrDef/HTML/Pixels.php diff --git a/library/HTMLPurifier/AttrDef/Integer.php b/library/HTMLPurifier/AttrDef/Integer.php index d59738d2a..d59738d2a 100755..100644 --- a/library/HTMLPurifier/AttrDef/Integer.php +++ b/library/HTMLPurifier/AttrDef/Integer.php diff --git a/library/HTMLPurifier/AttrDef/Lang.php b/library/HTMLPurifier/AttrDef/Lang.php index 10e6da56d..10e6da56d 100755..100644 --- a/library/HTMLPurifier/AttrDef/Lang.php +++ b/library/HTMLPurifier/AttrDef/Lang.php diff --git a/library/HTMLPurifier/AttrDef/Switch.php b/library/HTMLPurifier/AttrDef/Switch.php index c9e3ed193..c9e3ed193 100755..100644 --- a/library/HTMLPurifier/AttrDef/Switch.php +++ b/library/HTMLPurifier/AttrDef/Switch.php diff --git a/library/HTMLPurifier/AttrDef/Text.php b/library/HTMLPurifier/AttrDef/Text.php index c6216cc53..c6216cc53 100755..100644 --- a/library/HTMLPurifier/AttrDef/Text.php +++ b/library/HTMLPurifier/AttrDef/Text.php diff --git a/library/HTMLPurifier/AttrDef/URI.php b/library/HTMLPurifier/AttrDef/URI.php index 01a6d83e9..01a6d83e9 100755..100644 --- a/library/HTMLPurifier/AttrDef/URI.php +++ b/library/HTMLPurifier/AttrDef/URI.php diff --git a/library/HTMLPurifier/AttrDef/URI/Email.php b/library/HTMLPurifier/AttrDef/URI/Email.php index bfee9d166..bfee9d166 100755..100644 --- a/library/HTMLPurifier/AttrDef/URI/Email.php +++ b/library/HTMLPurifier/AttrDef/URI/Email.php diff --git a/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php index 94c715ab4..94c715ab4 100755..100644 --- a/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php +++ b/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php diff --git a/library/HTMLPurifier/AttrDef/URI/Host.php b/library/HTMLPurifier/AttrDef/URI/Host.php index 2156c10c6..2156c10c6 100755..100644 --- a/library/HTMLPurifier/AttrDef/URI/Host.php +++ b/library/HTMLPurifier/AttrDef/URI/Host.php diff --git a/library/HTMLPurifier/AttrDef/URI/IPv4.php b/library/HTMLPurifier/AttrDef/URI/IPv4.php index ec4cf591b..ec4cf591b 100755..100644 --- a/library/HTMLPurifier/AttrDef/URI/IPv4.php +++ b/library/HTMLPurifier/AttrDef/URI/IPv4.php diff --git a/library/HTMLPurifier/AttrDef/URI/IPv6.php b/library/HTMLPurifier/AttrDef/URI/IPv6.php index 9454e9be5..9454e9be5 100755..100644 --- a/library/HTMLPurifier/AttrDef/URI/IPv6.php +++ b/library/HTMLPurifier/AttrDef/URI/IPv6.php diff --git a/library/HTMLPurifier/AttrTransform.php b/library/HTMLPurifier/AttrTransform.php index e61d3e01b..e61d3e01b 100755..100644 --- a/library/HTMLPurifier/AttrTransform.php +++ b/library/HTMLPurifier/AttrTransform.php diff --git a/library/HTMLPurifier/AttrTransform/Background.php b/library/HTMLPurifier/AttrTransform/Background.php index 0e1ff24a3..0e1ff24a3 100755..100644 --- a/library/HTMLPurifier/AttrTransform/Background.php +++ b/library/HTMLPurifier/AttrTransform/Background.php diff --git a/library/HTMLPurifier/AttrTransform/BdoDir.php b/library/HTMLPurifier/AttrTransform/BdoDir.php index 4d1a05665..4d1a05665 100755..100644 --- a/library/HTMLPurifier/AttrTransform/BdoDir.php +++ b/library/HTMLPurifier/AttrTransform/BdoDir.php diff --git a/library/HTMLPurifier/AttrTransform/BgColor.php b/library/HTMLPurifier/AttrTransform/BgColor.php index ad3916bb9..ad3916bb9 100755..100644 --- a/library/HTMLPurifier/AttrTransform/BgColor.php +++ b/library/HTMLPurifier/AttrTransform/BgColor.php diff --git a/library/HTMLPurifier/AttrTransform/BoolToCSS.php b/library/HTMLPurifier/AttrTransform/BoolToCSS.php index 51159b671..51159b671 100755..100644 --- a/library/HTMLPurifier/AttrTransform/BoolToCSS.php +++ b/library/HTMLPurifier/AttrTransform/BoolToCSS.php diff --git a/library/HTMLPurifier/AttrTransform/Border.php b/library/HTMLPurifier/AttrTransform/Border.php index 476b0b079..476b0b079 100755..100644 --- a/library/HTMLPurifier/AttrTransform/Border.php +++ b/library/HTMLPurifier/AttrTransform/Border.php diff --git a/library/HTMLPurifier/AttrTransform/EnumToCSS.php b/library/HTMLPurifier/AttrTransform/EnumToCSS.php index 2a5b4514a..2a5b4514a 100755..100644 --- a/library/HTMLPurifier/AttrTransform/EnumToCSS.php +++ b/library/HTMLPurifier/AttrTransform/EnumToCSS.php diff --git a/library/HTMLPurifier/AttrTransform/ImgRequired.php b/library/HTMLPurifier/AttrTransform/ImgRequired.php index 7f0e4b7a5..7f0e4b7a5 100755..100644 --- a/library/HTMLPurifier/AttrTransform/ImgRequired.php +++ b/library/HTMLPurifier/AttrTransform/ImgRequired.php diff --git a/library/HTMLPurifier/AttrTransform/ImgSpace.php b/library/HTMLPurifier/AttrTransform/ImgSpace.php index fd84c10c3..fd84c10c3 100755..100644 --- a/library/HTMLPurifier/AttrTransform/ImgSpace.php +++ b/library/HTMLPurifier/AttrTransform/ImgSpace.php diff --git a/library/HTMLPurifier/AttrTransform/Input.php b/library/HTMLPurifier/AttrTransform/Input.php index 16829552d..16829552d 100755..100644 --- a/library/HTMLPurifier/AttrTransform/Input.php +++ b/library/HTMLPurifier/AttrTransform/Input.php diff --git a/library/HTMLPurifier/AttrTransform/Lang.php b/library/HTMLPurifier/AttrTransform/Lang.php index 5869e7f82..5869e7f82 100755..100644 --- a/library/HTMLPurifier/AttrTransform/Lang.php +++ b/library/HTMLPurifier/AttrTransform/Lang.php diff --git a/library/HTMLPurifier/AttrTransform/Length.php b/library/HTMLPurifier/AttrTransform/Length.php index ea2f30473..ea2f30473 100755..100644 --- a/library/HTMLPurifier/AttrTransform/Length.php +++ b/library/HTMLPurifier/AttrTransform/Length.php diff --git a/library/HTMLPurifier/AttrTransform/Name.php b/library/HTMLPurifier/AttrTransform/Name.php index 15315bc73..15315bc73 100755..100644 --- a/library/HTMLPurifier/AttrTransform/Name.php +++ b/library/HTMLPurifier/AttrTransform/Name.php diff --git a/library/HTMLPurifier/AttrTransform/NameSync.php b/library/HTMLPurifier/AttrTransform/NameSync.php index a95638c14..a95638c14 100755..100644 --- a/library/HTMLPurifier/AttrTransform/NameSync.php +++ b/library/HTMLPurifier/AttrTransform/NameSync.php diff --git a/library/HTMLPurifier/AttrTransform/SafeEmbed.php b/library/HTMLPurifier/AttrTransform/SafeEmbed.php index 4da449981..4da449981 100755..100644 --- a/library/HTMLPurifier/AttrTransform/SafeEmbed.php +++ b/library/HTMLPurifier/AttrTransform/SafeEmbed.php diff --git a/library/HTMLPurifier/AttrTransform/SafeObject.php b/library/HTMLPurifier/AttrTransform/SafeObject.php index 1ed74898b..1ed74898b 100755..100644 --- a/library/HTMLPurifier/AttrTransform/SafeObject.php +++ b/library/HTMLPurifier/AttrTransform/SafeObject.php diff --git a/library/HTMLPurifier/AttrTransform/SafeParam.php b/library/HTMLPurifier/AttrTransform/SafeParam.php index 3f992ec31..3f992ec31 100755..100644 --- a/library/HTMLPurifier/AttrTransform/SafeParam.php +++ b/library/HTMLPurifier/AttrTransform/SafeParam.php diff --git a/library/HTMLPurifier/AttrTransform/ScriptRequired.php b/library/HTMLPurifier/AttrTransform/ScriptRequired.php index 4499050a2..4499050a2 100755..100644 --- a/library/HTMLPurifier/AttrTransform/ScriptRequired.php +++ b/library/HTMLPurifier/AttrTransform/ScriptRequired.php diff --git a/library/HTMLPurifier/AttrTransform/Textarea.php b/library/HTMLPurifier/AttrTransform/Textarea.php index 81ac3488b..81ac3488b 100755..100644 --- a/library/HTMLPurifier/AttrTransform/Textarea.php +++ b/library/HTMLPurifier/AttrTransform/Textarea.php diff --git a/library/HTMLPurifier/AttrTypes.php b/library/HTMLPurifier/AttrTypes.php index fc2ea4e58..fc2ea4e58 100755..100644 --- a/library/HTMLPurifier/AttrTypes.php +++ b/library/HTMLPurifier/AttrTypes.php diff --git a/library/HTMLPurifier/AttrValidator.php b/library/HTMLPurifier/AttrValidator.php index 829a0f8f2..829a0f8f2 100755..100644 --- a/library/HTMLPurifier/AttrValidator.php +++ b/library/HTMLPurifier/AttrValidator.php diff --git a/library/HTMLPurifier/Bootstrap.php b/library/HTMLPurifier/Bootstrap.php index 559f61a23..559f61a23 100755..100644 --- a/library/HTMLPurifier/Bootstrap.php +++ b/library/HTMLPurifier/Bootstrap.php diff --git a/library/HTMLPurifier/CSSDefinition.php b/library/HTMLPurifier/CSSDefinition.php index 6a2e6f56d..6a2e6f56d 100755..100644 --- a/library/HTMLPurifier/CSSDefinition.php +++ b/library/HTMLPurifier/CSSDefinition.php diff --git a/library/HTMLPurifier/ChildDef.php b/library/HTMLPurifier/ChildDef.php index c5d5216da..c5d5216da 100755..100644 --- a/library/HTMLPurifier/ChildDef.php +++ b/library/HTMLPurifier/ChildDef.php diff --git a/library/HTMLPurifier/ChildDef/Chameleon.php b/library/HTMLPurifier/ChildDef/Chameleon.php index 15c364ee3..15c364ee3 100755..100644 --- a/library/HTMLPurifier/ChildDef/Chameleon.php +++ b/library/HTMLPurifier/ChildDef/Chameleon.php diff --git a/library/HTMLPurifier/ChildDef/Custom.php b/library/HTMLPurifier/ChildDef/Custom.php index b68047b4b..b68047b4b 100755..100644 --- a/library/HTMLPurifier/ChildDef/Custom.php +++ b/library/HTMLPurifier/ChildDef/Custom.php diff --git a/library/HTMLPurifier/ChildDef/Empty.php b/library/HTMLPurifier/ChildDef/Empty.php index 13171f665..13171f665 100755..100644 --- a/library/HTMLPurifier/ChildDef/Empty.php +++ b/library/HTMLPurifier/ChildDef/Empty.php diff --git a/library/HTMLPurifier/ChildDef/Optional.php b/library/HTMLPurifier/ChildDef/Optional.php index 32bcb9898..32bcb9898 100755..100644 --- a/library/HTMLPurifier/ChildDef/Optional.php +++ b/library/HTMLPurifier/ChildDef/Optional.php diff --git a/library/HTMLPurifier/ChildDef/Required.php b/library/HTMLPurifier/ChildDef/Required.php index 4889f249b..4889f249b 100755..100644 --- a/library/HTMLPurifier/ChildDef/Required.php +++ b/library/HTMLPurifier/ChildDef/Required.php diff --git a/library/HTMLPurifier/ChildDef/StrictBlockquote.php b/library/HTMLPurifier/ChildDef/StrictBlockquote.php index dfae8a6e5..dfae8a6e5 100755..100644 --- a/library/HTMLPurifier/ChildDef/StrictBlockquote.php +++ b/library/HTMLPurifier/ChildDef/StrictBlockquote.php diff --git a/library/HTMLPurifier/ChildDef/Table.php b/library/HTMLPurifier/ChildDef/Table.php index 34f0227dd..34f0227dd 100755..100644 --- a/library/HTMLPurifier/ChildDef/Table.php +++ b/library/HTMLPurifier/ChildDef/Table.php diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php index 2a334b0d8..2a334b0d8 100755..100644 --- a/library/HTMLPurifier/Config.php +++ b/library/HTMLPurifier/Config.php diff --git a/library/HTMLPurifier/ConfigSchema.php b/library/HTMLPurifier/ConfigSchema.php index 67be5c71f..67be5c71f 100755..100644 --- a/library/HTMLPurifier/ConfigSchema.php +++ b/library/HTMLPurifier/ConfigSchema.php diff --git a/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php b/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php index c05668a70..c05668a70 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php +++ b/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php diff --git a/library/HTMLPurifier/ConfigSchema/Builder/Xml.php b/library/HTMLPurifier/ConfigSchema/Builder/Xml.php index 244561a37..244561a37 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/Builder/Xml.php +++ b/library/HTMLPurifier/ConfigSchema/Builder/Xml.php diff --git a/library/HTMLPurifier/ConfigSchema/Exception.php b/library/HTMLPurifier/ConfigSchema/Exception.php index 2671516c5..2671516c5 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/Exception.php +++ b/library/HTMLPurifier/ConfigSchema/Exception.php diff --git a/library/HTMLPurifier/ConfigSchema/Interchange.php b/library/HTMLPurifier/ConfigSchema/Interchange.php index 91a5aa730..91a5aa730 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/Interchange.php +++ b/library/HTMLPurifier/ConfigSchema/Interchange.php diff --git a/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php b/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php index ac8be0d97..ac8be0d97 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php +++ b/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php diff --git a/library/HTMLPurifier/ConfigSchema/Interchange/Id.php b/library/HTMLPurifier/ConfigSchema/Interchange/Id.php index b9b3c6f5c..b9b3c6f5c 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/Interchange/Id.php +++ b/library/HTMLPurifier/ConfigSchema/Interchange/Id.php diff --git a/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php index 785b72ce8..785b72ce8 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php +++ b/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php diff --git a/library/HTMLPurifier/ConfigSchema/Validator.php b/library/HTMLPurifier/ConfigSchema/Validator.php index f374f6a02..f374f6a02 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/Validator.php +++ b/library/HTMLPurifier/ConfigSchema/Validator.php diff --git a/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php b/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php index b95aea18c..b95aea18c 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php +++ b/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php diff --git a/library/HTMLPurifier/ConfigSchema/schema.ser b/library/HTMLPurifier/ConfigSchema/schema.ser Binary files differindex 22b8d54a5..22b8d54a5 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema.ser +++ b/library/HTMLPurifier/ConfigSchema/schema.ser diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt index 0517fed0a..0517fed0a 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt index 249edd647..249edd647 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt index 9a8fa6a2e..9a8fa6a2e 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt index b01788348..b01788348 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt index e774b823b..e774b823b 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt index 533165e17..533165e17 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt index 9eb7e3846..9eb7e3846 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt index 2f17bf477..2f17bf477 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt index 52654b53a..52654b53a 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt index 6440d2103..6440d2103 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt index f31d226f5..f31d226f5 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt index 5f2b5e3d2..5f2b5e3d2 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt index 6f5824586..6f5824586 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt index cc49d43fd..cc49d43fd 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt index 2c5924a7a..2c5924a7a 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt index d5caa1bb9..d5caa1bb9 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt index 2a476481a..2a476481a 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt index 663064a34..663064a34 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt index 3a48ba960..3a48ba960 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt index db58b1346..db58b1346 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt index 7996488be..7996488be 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt index 35c393b4e..35c393b4e 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt index ca17eb1dc..ca17eb1dc 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt index 34657ba47..34657ba47 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt index dde990ab2..dde990ab2 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt index b324608f7..b324608f7 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt index 748be0eec..748be0eec 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt index 460112ebe..460112ebe 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt index 5cb7dda3b..5cb7dda3b 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt index 7a3291470..7a3291470 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt index 148eedb8b..148eedb8b 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt b/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt index c486724c8..c486724c8 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt b/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt index 54036507d..54036507d 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt index 568cbf3b3..568cbf3b3 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt index d7317911f..d7317911f 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt index 08b381d34..08b381d34 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt index 64b114fce..64b114fce 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt index 36f16e07e..36f16e07e 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt index 8bfb47c3a..8bfb47c3a 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt index 4d5b5055c..4d5b5055c 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt index a7a5b249b..a7a5b249b 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt index abb499948..abb499948 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt index 915391edb..915391edb 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt index 233fca14f..233fca14f 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt index 8983e2cca..8983e2cca 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt index eb841a759..eb841a759 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt index 4070c2a0d..4070c2a0d 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt index a4cd966df..a4cd966df 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt index 3db50ef20..3db50ef20 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt index 16829bcda..16829bcda 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt index 7f95f54d1..7f95f54d1 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt index 6c231b2d7..6c231b2d7 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt index 078d08741..078d08741 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt index 7fa6536b2..7fa6536b2 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt index 3e231d2d1..3e231d2d1 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt index fcf093f17..fcf093f17 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt index 888d55819..888d55819 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt index 5a59a55c0..5a59a55c0 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt index 151fb7b82..151fb7b82 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt index 45ae469ec..45ae469ec 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt index 524618879..524618879 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt index a64e3d7c3..a64e3d7c3 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt index 103db754a..103db754a 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt index 229ae0267..229ae0267 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt index 9dab497f2..9dab497f2 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt index 57358f9ba..57358f9ba 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt index 93a53e14f..93a53e14f 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt index e424c386e..e424c386e 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt index 62e8e160c..62e8e160c 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt index dfb720496..dfb720496 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt index cdda09a4c..cdda09a4c 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt index ceb342e22..ceb342e22 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt index a8b1de56b..a8b1de56b 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt index b4c271b7f..b4c271b7f 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt index 4186ccd0d..4186ccd0d 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt index 996762bd1..996762bd1 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt index 89133b1a3..89133b1a3 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt index 2a47e384f..2a47e384f 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt index 08921fde7..08921fde7 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt index 93398e859..93398e859 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt index 79f8ad82c..79f8ad82c 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt index 232b02362..232b02362 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt index 06bab00a0..06bab00a0 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt b/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt index 071bc0295..071bc0295 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt index ae3a913f2..ae3a913f2 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt index 876f0680c..876f0680c 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt index 728e378cb..728e378cb 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt index f05312ba8..f05312ba8 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt index 80cfea93f..80cfea93f 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt index 71ce025a2..71ce025a2 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt index 13c122c8c..13c122c8c 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt index abcc1efd6..abcc1efd6 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt index 51e6ea91f..51e6ea91f 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt index ee83b121d..ee83b121d 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt index 0b6df7625..0b6df7625 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt index 4214900a5..4214900a5 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt index 58c81dcc4..58c81dcc4 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt index 6fce0fdc3..6fce0fdc3 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt index 0d00f62ea..0d00f62ea 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt index 23331a4e7..23331a4e7 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt +++ b/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt diff --git a/library/HTMLPurifier/ConfigSchema/schema/info.ini b/library/HTMLPurifier/ConfigSchema/schema/info.ini index 5de4505e1..5de4505e1 100755..100644 --- a/library/HTMLPurifier/ConfigSchema/schema/info.ini +++ b/library/HTMLPurifier/ConfigSchema/schema/info.ini diff --git a/library/HTMLPurifier/ContentSets.php b/library/HTMLPurifier/ContentSets.php index 3b6e96f5f..3b6e96f5f 100755..100644 --- a/library/HTMLPurifier/ContentSets.php +++ b/library/HTMLPurifier/ContentSets.php diff --git a/library/HTMLPurifier/Context.php b/library/HTMLPurifier/Context.php index 9ddf0c547..9ddf0c547 100755..100644 --- a/library/HTMLPurifier/Context.php +++ b/library/HTMLPurifier/Context.php diff --git a/library/HTMLPurifier/Definition.php b/library/HTMLPurifier/Definition.php index a7408c974..a7408c974 100755..100644 --- a/library/HTMLPurifier/Definition.php +++ b/library/HTMLPurifier/Definition.php diff --git a/library/HTMLPurifier/DefinitionCache.php b/library/HTMLPurifier/DefinitionCache.php index c6e1e388c..c6e1e388c 100755..100644 --- a/library/HTMLPurifier/DefinitionCache.php +++ b/library/HTMLPurifier/DefinitionCache.php diff --git a/library/HTMLPurifier/DefinitionCache/Decorator.php b/library/HTMLPurifier/DefinitionCache/Decorator.php index b0fb6d0cd..b0fb6d0cd 100755..100644 --- a/library/HTMLPurifier/DefinitionCache/Decorator.php +++ b/library/HTMLPurifier/DefinitionCache/Decorator.php diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php b/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php index d4cc35c4b..d4cc35c4b 100755..100644 --- a/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php +++ b/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php b/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php index 18f16d32b..18f16d32b 100755..100644 --- a/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php +++ b/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php diff --git a/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in b/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in index 21a8fcfda..21a8fcfda 100755..100644 --- a/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in +++ b/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in diff --git a/library/HTMLPurifier/DefinitionCache/Null.php b/library/HTMLPurifier/DefinitionCache/Null.php index 41d97e734..41d97e734 100755..100644 --- a/library/HTMLPurifier/DefinitionCache/Null.php +++ b/library/HTMLPurifier/DefinitionCache/Null.php diff --git a/library/HTMLPurifier/DefinitionCache/Serializer.php b/library/HTMLPurifier/DefinitionCache/Serializer.php index 7a6aa93f0..7a6aa93f0 100755..100644 --- a/library/HTMLPurifier/DefinitionCache/Serializer.php +++ b/library/HTMLPurifier/DefinitionCache/Serializer.php diff --git a/library/HTMLPurifier/DefinitionCache/Serializer/README b/library/HTMLPurifier/DefinitionCache/Serializer/README index 2e35c1c3d..2e35c1c3d 100755..100644 --- a/library/HTMLPurifier/DefinitionCache/Serializer/README +++ b/library/HTMLPurifier/DefinitionCache/Serializer/README diff --git a/library/HTMLPurifier/DefinitionCacheFactory.php b/library/HTMLPurifier/DefinitionCacheFactory.php index a6ead6281..a6ead6281 100755..100644 --- a/library/HTMLPurifier/DefinitionCacheFactory.php +++ b/library/HTMLPurifier/DefinitionCacheFactory.php diff --git a/library/HTMLPurifier/Doctype.php b/library/HTMLPurifier/Doctype.php index 1e3c574c0..1e3c574c0 100755..100644 --- a/library/HTMLPurifier/Doctype.php +++ b/library/HTMLPurifier/Doctype.php diff --git a/library/HTMLPurifier/DoctypeRegistry.php b/library/HTMLPurifier/DoctypeRegistry.php index 86049e939..86049e939 100755..100644 --- a/library/HTMLPurifier/DoctypeRegistry.php +++ b/library/HTMLPurifier/DoctypeRegistry.php diff --git a/library/HTMLPurifier/ElementDef.php b/library/HTMLPurifier/ElementDef.php index 5498d9567..5498d9567 100755..100644 --- a/library/HTMLPurifier/ElementDef.php +++ b/library/HTMLPurifier/ElementDef.php diff --git a/library/HTMLPurifier/Encoder.php b/library/HTMLPurifier/Encoder.php index 2b3140caa..2b3140caa 100755..100644 --- a/library/HTMLPurifier/Encoder.php +++ b/library/HTMLPurifier/Encoder.php diff --git a/library/HTMLPurifier/EntityLookup.php b/library/HTMLPurifier/EntityLookup.php index b4dfce94c..b4dfce94c 100755..100644 --- a/library/HTMLPurifier/EntityLookup.php +++ b/library/HTMLPurifier/EntityLookup.php diff --git a/library/HTMLPurifier/EntityLookup/entities.ser b/library/HTMLPurifier/EntityLookup/entities.ser index f2b8b8f2d..f2b8b8f2d 100755..100644 --- a/library/HTMLPurifier/EntityLookup/entities.ser +++ b/library/HTMLPurifier/EntityLookup/entities.ser diff --git a/library/HTMLPurifier/EntityParser.php b/library/HTMLPurifier/EntityParser.php index 8c384472d..8c384472d 100755..100644 --- a/library/HTMLPurifier/EntityParser.php +++ b/library/HTMLPurifier/EntityParser.php diff --git a/library/HTMLPurifier/ErrorCollector.php b/library/HTMLPurifier/ErrorCollector.php index 6713eaf77..6713eaf77 100755..100644 --- a/library/HTMLPurifier/ErrorCollector.php +++ b/library/HTMLPurifier/ErrorCollector.php diff --git a/library/HTMLPurifier/ErrorStruct.php b/library/HTMLPurifier/ErrorStruct.php index 9bc8996ec..9bc8996ec 100755..100644 --- a/library/HTMLPurifier/ErrorStruct.php +++ b/library/HTMLPurifier/ErrorStruct.php diff --git a/library/HTMLPurifier/Exception.php b/library/HTMLPurifier/Exception.php index be85b4c56..be85b4c56 100755..100644 --- a/library/HTMLPurifier/Exception.php +++ b/library/HTMLPurifier/Exception.php diff --git a/library/HTMLPurifier/Filter.php b/library/HTMLPurifier/Filter.php index 9a0e7b09f..9a0e7b09f 100755..100644 --- a/library/HTMLPurifier/Filter.php +++ b/library/HTMLPurifier/Filter.php diff --git a/library/HTMLPurifier/Filter/ExtractStyleBlocks.php b/library/HTMLPurifier/Filter/ExtractStyleBlocks.php index bbf78a663..bbf78a663 100755..100644 --- a/library/HTMLPurifier/Filter/ExtractStyleBlocks.php +++ b/library/HTMLPurifier/Filter/ExtractStyleBlocks.php diff --git a/library/HTMLPurifier/Filter/YouTube.php b/library/HTMLPurifier/Filter/YouTube.php index 23df221ea..23df221ea 100755..100644 --- a/library/HTMLPurifier/Filter/YouTube.php +++ b/library/HTMLPurifier/Filter/YouTube.php diff --git a/library/HTMLPurifier/Generator.php b/library/HTMLPurifier/Generator.php index 4a6241727..4a6241727 100755..100644 --- a/library/HTMLPurifier/Generator.php +++ b/library/HTMLPurifier/Generator.php diff --git a/library/HTMLPurifier/HTMLDefinition.php b/library/HTMLPurifier/HTMLDefinition.php index c99ac11eb..c99ac11eb 100755..100644 --- a/library/HTMLPurifier/HTMLDefinition.php +++ b/library/HTMLPurifier/HTMLDefinition.php diff --git a/library/HTMLPurifier/HTMLModule.php b/library/HTMLPurifier/HTMLModule.php index 072cf6808..072cf6808 100755..100644 --- a/library/HTMLPurifier/HTMLModule.php +++ b/library/HTMLPurifier/HTMLModule.php diff --git a/library/HTMLPurifier/HTMLModule/Bdo.php b/library/HTMLPurifier/HTMLModule/Bdo.php index 3d66f1b4e..3d66f1b4e 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Bdo.php +++ b/library/HTMLPurifier/HTMLModule/Bdo.php diff --git a/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/library/HTMLPurifier/HTMLModule/CommonAttributes.php index 7c15da84f..7c15da84f 100755..100644 --- a/library/HTMLPurifier/HTMLModule/CommonAttributes.php +++ b/library/HTMLPurifier/HTMLModule/CommonAttributes.php diff --git a/library/HTMLPurifier/HTMLModule/Edit.php b/library/HTMLPurifier/HTMLModule/Edit.php index ff9369055..ff9369055 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Edit.php +++ b/library/HTMLPurifier/HTMLModule/Edit.php diff --git a/library/HTMLPurifier/HTMLModule/Forms.php b/library/HTMLPurifier/HTMLModule/Forms.php index 44c22f6f8..44c22f6f8 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Forms.php +++ b/library/HTMLPurifier/HTMLModule/Forms.php diff --git a/library/HTMLPurifier/HTMLModule/Hypertext.php b/library/HTMLPurifier/HTMLModule/Hypertext.php index d7e9bdd27..d7e9bdd27 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Hypertext.php +++ b/library/HTMLPurifier/HTMLModule/Hypertext.php diff --git a/library/HTMLPurifier/HTMLModule/Image.php b/library/HTMLPurifier/HTMLModule/Image.php index 948d435bc..948d435bc 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Image.php +++ b/library/HTMLPurifier/HTMLModule/Image.php diff --git a/library/HTMLPurifier/HTMLModule/Legacy.php b/library/HTMLPurifier/HTMLModule/Legacy.php index df33927ba..df33927ba 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Legacy.php +++ b/library/HTMLPurifier/HTMLModule/Legacy.php diff --git a/library/HTMLPurifier/HTMLModule/List.php b/library/HTMLPurifier/HTMLModule/List.php index 74d4522f4..74d4522f4 100755..100644 --- a/library/HTMLPurifier/HTMLModule/List.php +++ b/library/HTMLPurifier/HTMLModule/List.php diff --git a/library/HTMLPurifier/HTMLModule/Name.php b/library/HTMLPurifier/HTMLModule/Name.php index 05694b450..05694b450 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Name.php +++ b/library/HTMLPurifier/HTMLModule/Name.php diff --git a/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php b/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php index 5f1b14abb..5f1b14abb 100755..100644 --- a/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php +++ b/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php diff --git a/library/HTMLPurifier/HTMLModule/Object.php b/library/HTMLPurifier/HTMLModule/Object.php index 193c1011f..193c1011f 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Object.php +++ b/library/HTMLPurifier/HTMLModule/Object.php diff --git a/library/HTMLPurifier/HTMLModule/Presentation.php b/library/HTMLPurifier/HTMLModule/Presentation.php index 8ff0b5ed7..8ff0b5ed7 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Presentation.php +++ b/library/HTMLPurifier/HTMLModule/Presentation.php diff --git a/library/HTMLPurifier/HTMLModule/Proprietary.php b/library/HTMLPurifier/HTMLModule/Proprietary.php index dd36a3de0..dd36a3de0 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Proprietary.php +++ b/library/HTMLPurifier/HTMLModule/Proprietary.php diff --git a/library/HTMLPurifier/HTMLModule/Ruby.php b/library/HTMLPurifier/HTMLModule/Ruby.php index b26a0a30a..b26a0a30a 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Ruby.php +++ b/library/HTMLPurifier/HTMLModule/Ruby.php diff --git a/library/HTMLPurifier/HTMLModule/SafeEmbed.php b/library/HTMLPurifier/HTMLModule/SafeEmbed.php index ea256716b..ea256716b 100755..100644 --- a/library/HTMLPurifier/HTMLModule/SafeEmbed.php +++ b/library/HTMLPurifier/HTMLModule/SafeEmbed.php diff --git a/library/HTMLPurifier/HTMLModule/SafeObject.php b/library/HTMLPurifier/HTMLModule/SafeObject.php index 64ab8c070..64ab8c070 100755..100644 --- a/library/HTMLPurifier/HTMLModule/SafeObject.php +++ b/library/HTMLPurifier/HTMLModule/SafeObject.php diff --git a/library/HTMLPurifier/HTMLModule/Scripting.php b/library/HTMLPurifier/HTMLModule/Scripting.php index cecdea6c3..cecdea6c3 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Scripting.php +++ b/library/HTMLPurifier/HTMLModule/Scripting.php diff --git a/library/HTMLPurifier/HTMLModule/StyleAttribute.php b/library/HTMLPurifier/HTMLModule/StyleAttribute.php index eb78464cc..eb78464cc 100755..100644 --- a/library/HTMLPurifier/HTMLModule/StyleAttribute.php +++ b/library/HTMLPurifier/HTMLModule/StyleAttribute.php diff --git a/library/HTMLPurifier/HTMLModule/Tables.php b/library/HTMLPurifier/HTMLModule/Tables.php index f314ced3f..f314ced3f 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Tables.php +++ b/library/HTMLPurifier/HTMLModule/Tables.php diff --git a/library/HTMLPurifier/HTMLModule/Target.php b/library/HTMLPurifier/HTMLModule/Target.php index 2b844ecc4..2b844ecc4 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Target.php +++ b/library/HTMLPurifier/HTMLModule/Target.php diff --git a/library/HTMLPurifier/HTMLModule/Text.php b/library/HTMLPurifier/HTMLModule/Text.php index ae77c7188..ae77c7188 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Text.php +++ b/library/HTMLPurifier/HTMLModule/Text.php diff --git a/library/HTMLPurifier/HTMLModule/Tidy.php b/library/HTMLPurifier/HTMLModule/Tidy.php index 21783f18e..21783f18e 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Tidy.php +++ b/library/HTMLPurifier/HTMLModule/Tidy.php diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Name.php b/library/HTMLPurifier/HTMLModule/Tidy/Name.php index 61ff85ce2..61ff85ce2 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Tidy/Name.php +++ b/library/HTMLPurifier/HTMLModule/Tidy/Name.php diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php b/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php index 14c15c4a0..14c15c4a0 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php +++ b/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Strict.php b/library/HTMLPurifier/HTMLModule/Tidy/Strict.php index c73dc3c4d..c73dc3c4d 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Tidy/Strict.php +++ b/library/HTMLPurifier/HTMLModule/Tidy/Strict.php diff --git a/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php b/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php index 9960b1dd1..9960b1dd1 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php +++ b/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php diff --git a/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php b/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php index db5a378e5..db5a378e5 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php +++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php diff --git a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php index 02e943813..02e943813 100755..100644 --- a/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php +++ b/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php diff --git a/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php b/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php index 9c0e03198..9c0e03198 100755..100644 --- a/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php +++ b/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php diff --git a/library/HTMLPurifier/HTMLModuleManager.php b/library/HTMLPurifier/HTMLModuleManager.php index f5c4a1d2c..f5c4a1d2c 100755..100644 --- a/library/HTMLPurifier/HTMLModuleManager.php +++ b/library/HTMLPurifier/HTMLModuleManager.php diff --git a/library/HTMLPurifier/IDAccumulator.php b/library/HTMLPurifier/IDAccumulator.php index 73215295a..73215295a 100755..100644 --- a/library/HTMLPurifier/IDAccumulator.php +++ b/library/HTMLPurifier/IDAccumulator.php diff --git a/library/HTMLPurifier/Injector.php b/library/HTMLPurifier/Injector.php index 5922f8130..5922f8130 100755..100644 --- a/library/HTMLPurifier/Injector.php +++ b/library/HTMLPurifier/Injector.php diff --git a/library/HTMLPurifier/Injector/AutoParagraph.php b/library/HTMLPurifier/Injector/AutoParagraph.php index afa760892..afa760892 100755..100644 --- a/library/HTMLPurifier/Injector/AutoParagraph.php +++ b/library/HTMLPurifier/Injector/AutoParagraph.php diff --git a/library/HTMLPurifier/Injector/DisplayLinkURI.php b/library/HTMLPurifier/Injector/DisplayLinkURI.php index 9dce9bd08..9dce9bd08 100755..100644 --- a/library/HTMLPurifier/Injector/DisplayLinkURI.php +++ b/library/HTMLPurifier/Injector/DisplayLinkURI.php diff --git a/library/HTMLPurifier/Injector/Linkify.php b/library/HTMLPurifier/Injector/Linkify.php index 296dac282..296dac282 100755..100644 --- a/library/HTMLPurifier/Injector/Linkify.php +++ b/library/HTMLPurifier/Injector/Linkify.php diff --git a/library/HTMLPurifier/Injector/PurifierLinkify.php b/library/HTMLPurifier/Injector/PurifierLinkify.php index ad2455a91..ad2455a91 100755..100644 --- a/library/HTMLPurifier/Injector/PurifierLinkify.php +++ b/library/HTMLPurifier/Injector/PurifierLinkify.php diff --git a/library/HTMLPurifier/Injector/RemoveEmpty.php b/library/HTMLPurifier/Injector/RemoveEmpty.php index 638bfca03..638bfca03 100755..100644 --- a/library/HTMLPurifier/Injector/RemoveEmpty.php +++ b/library/HTMLPurifier/Injector/RemoveEmpty.php diff --git a/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php index b21313470..b21313470 100755..100644 --- a/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php +++ b/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php diff --git a/library/HTMLPurifier/Injector/SafeObject.php b/library/HTMLPurifier/Injector/SafeObject.php index 9e178ce01..9e178ce01 100755..100644 --- a/library/HTMLPurifier/Injector/SafeObject.php +++ b/library/HTMLPurifier/Injector/SafeObject.php diff --git a/library/HTMLPurifier/Language.php b/library/HTMLPurifier/Language.php index 3e2be03b5..3e2be03b5 100755..100644 --- a/library/HTMLPurifier/Language.php +++ b/library/HTMLPurifier/Language.php diff --git a/library/HTMLPurifier/Language/classes/en-x-test.php b/library/HTMLPurifier/Language/classes/en-x-test.php index d52fcb7ac..d52fcb7ac 100755..100644 --- a/library/HTMLPurifier/Language/classes/en-x-test.php +++ b/library/HTMLPurifier/Language/classes/en-x-test.php diff --git a/library/HTMLPurifier/Language/messages/en-x-test.php b/library/HTMLPurifier/Language/messages/en-x-test.php index 1c046f379..1c046f379 100755..100644 --- a/library/HTMLPurifier/Language/messages/en-x-test.php +++ b/library/HTMLPurifier/Language/messages/en-x-test.php diff --git a/library/HTMLPurifier/Language/messages/en-x-testmini.php b/library/HTMLPurifier/Language/messages/en-x-testmini.php index 806c83fbf..806c83fbf 100755..100644 --- a/library/HTMLPurifier/Language/messages/en-x-testmini.php +++ b/library/HTMLPurifier/Language/messages/en-x-testmini.php diff --git a/library/HTMLPurifier/Language/messages/en.php b/library/HTMLPurifier/Language/messages/en.php index 8d7b5736b..8d7b5736b 100755..100644 --- a/library/HTMLPurifier/Language/messages/en.php +++ b/library/HTMLPurifier/Language/messages/en.php diff --git a/library/HTMLPurifier/LanguageFactory.php b/library/HTMLPurifier/LanguageFactory.php index 134ef8c74..134ef8c74 100755..100644 --- a/library/HTMLPurifier/LanguageFactory.php +++ b/library/HTMLPurifier/LanguageFactory.php diff --git a/library/HTMLPurifier/Length.php b/library/HTMLPurifier/Length.php index 8d2a46b7d..8d2a46b7d 100755..100644 --- a/library/HTMLPurifier/Length.php +++ b/library/HTMLPurifier/Length.php diff --git a/library/HTMLPurifier/Lexer.php b/library/HTMLPurifier/Lexer.php index b05e11546..b05e11546 100755..100644 --- a/library/HTMLPurifier/Lexer.php +++ b/library/HTMLPurifier/Lexer.php diff --git a/library/HTMLPurifier/Lexer/DOMLex.php b/library/HTMLPurifier/Lexer/DOMLex.php index 20dc2ed48..20dc2ed48 100755..100644 --- a/library/HTMLPurifier/Lexer/DOMLex.php +++ b/library/HTMLPurifier/Lexer/DOMLex.php diff --git a/library/HTMLPurifier/Lexer/DirectLex.php b/library/HTMLPurifier/Lexer/DirectLex.php index 456e6e190..456e6e190 100755..100644 --- a/library/HTMLPurifier/Lexer/DirectLex.php +++ b/library/HTMLPurifier/Lexer/DirectLex.php diff --git a/library/HTMLPurifier/Lexer/PEARSax3.php b/library/HTMLPurifier/Lexer/PEARSax3.php index 1d358c7b6..1d358c7b6 100755..100644 --- a/library/HTMLPurifier/Lexer/PEARSax3.php +++ b/library/HTMLPurifier/Lexer/PEARSax3.php diff --git a/library/HTMLPurifier/Lexer/PH5P.php b/library/HTMLPurifier/Lexer/PH5P.php index fa1bf973e..fa1bf973e 100755..100644 --- a/library/HTMLPurifier/Lexer/PH5P.php +++ b/library/HTMLPurifier/Lexer/PH5P.php diff --git a/library/HTMLPurifier/PercentEncoder.php b/library/HTMLPurifier/PercentEncoder.php index a43c44f4c..a43c44f4c 100755..100644 --- a/library/HTMLPurifier/PercentEncoder.php +++ b/library/HTMLPurifier/PercentEncoder.php diff --git a/library/HTMLPurifier/Printer.php b/library/HTMLPurifier/Printer.php index e7eb82e83..e7eb82e83 100755..100644 --- a/library/HTMLPurifier/Printer.php +++ b/library/HTMLPurifier/Printer.php diff --git a/library/HTMLPurifier/Printer/CSSDefinition.php b/library/HTMLPurifier/Printer/CSSDefinition.php index 81f986590..81f986590 100755..100644 --- a/library/HTMLPurifier/Printer/CSSDefinition.php +++ b/library/HTMLPurifier/Printer/CSSDefinition.php diff --git a/library/HTMLPurifier/Printer/ConfigForm.css b/library/HTMLPurifier/Printer/ConfigForm.css index 3ff1a88aa..3ff1a88aa 100755..100644 --- a/library/HTMLPurifier/Printer/ConfigForm.css +++ b/library/HTMLPurifier/Printer/ConfigForm.css diff --git a/library/HTMLPurifier/Printer/ConfigForm.js b/library/HTMLPurifier/Printer/ConfigForm.js index cba00c9b8..cba00c9b8 100755..100644 --- a/library/HTMLPurifier/Printer/ConfigForm.js +++ b/library/HTMLPurifier/Printer/ConfigForm.js diff --git a/library/HTMLPurifier/Printer/ConfigForm.php b/library/HTMLPurifier/Printer/ConfigForm.php index 02aa65689..02aa65689 100755..100644 --- a/library/HTMLPurifier/Printer/ConfigForm.php +++ b/library/HTMLPurifier/Printer/ConfigForm.php diff --git a/library/HTMLPurifier/Printer/HTMLDefinition.php b/library/HTMLPurifier/Printer/HTMLDefinition.php index 8a8f126b8..8a8f126b8 100755..100644 --- a/library/HTMLPurifier/Printer/HTMLDefinition.php +++ b/library/HTMLPurifier/Printer/HTMLDefinition.php diff --git a/library/HTMLPurifier/PropertyList.php b/library/HTMLPurifier/PropertyList.php index 2b99fb7bc..2b99fb7bc 100755..100644 --- a/library/HTMLPurifier/PropertyList.php +++ b/library/HTMLPurifier/PropertyList.php diff --git a/library/HTMLPurifier/PropertyListIterator.php b/library/HTMLPurifier/PropertyListIterator.php index 8f250443e..8f250443e 100755..100644 --- a/library/HTMLPurifier/PropertyListIterator.php +++ b/library/HTMLPurifier/PropertyListIterator.php diff --git a/library/HTMLPurifier/Strategy.php b/library/HTMLPurifier/Strategy.php index 246286521..246286521 100755..100644 --- a/library/HTMLPurifier/Strategy.php +++ b/library/HTMLPurifier/Strategy.php diff --git a/library/HTMLPurifier/Strategy/Composite.php b/library/HTMLPurifier/Strategy/Composite.php index 816490b79..816490b79 100755..100644 --- a/library/HTMLPurifier/Strategy/Composite.php +++ b/library/HTMLPurifier/Strategy/Composite.php diff --git a/library/HTMLPurifier/Strategy/Core.php b/library/HTMLPurifier/Strategy/Core.php index d90e15860..d90e15860 100755..100644 --- a/library/HTMLPurifier/Strategy/Core.php +++ b/library/HTMLPurifier/Strategy/Core.php diff --git a/library/HTMLPurifier/Strategy/FixNesting.php b/library/HTMLPurifier/Strategy/FixNesting.php index f81802391..f81802391 100755..100644 --- a/library/HTMLPurifier/Strategy/FixNesting.php +++ b/library/HTMLPurifier/Strategy/FixNesting.php diff --git a/library/HTMLPurifier/Strategy/MakeWellFormed.php b/library/HTMLPurifier/Strategy/MakeWellFormed.php index c73658400..c73658400 100755..100644 --- a/library/HTMLPurifier/Strategy/MakeWellFormed.php +++ b/library/HTMLPurifier/Strategy/MakeWellFormed.php diff --git a/library/HTMLPurifier/Strategy/RemoveForeignElements.php b/library/HTMLPurifier/Strategy/RemoveForeignElements.php index cf3a33e40..cf3a33e40 100755..100644 --- a/library/HTMLPurifier/Strategy/RemoveForeignElements.php +++ b/library/HTMLPurifier/Strategy/RemoveForeignElements.php diff --git a/library/HTMLPurifier/Strategy/ValidateAttributes.php b/library/HTMLPurifier/Strategy/ValidateAttributes.php index c3328a9d4..c3328a9d4 100755..100644 --- a/library/HTMLPurifier/Strategy/ValidateAttributes.php +++ b/library/HTMLPurifier/Strategy/ValidateAttributes.php diff --git a/library/HTMLPurifier/StringHash.php b/library/HTMLPurifier/StringHash.php index 62085c5c2..62085c5c2 100755..100644 --- a/library/HTMLPurifier/StringHash.php +++ b/library/HTMLPurifier/StringHash.php diff --git a/library/HTMLPurifier/StringHashParser.php b/library/HTMLPurifier/StringHashParser.php index f3e70c712..f3e70c712 100755..100644 --- a/library/HTMLPurifier/StringHashParser.php +++ b/library/HTMLPurifier/StringHashParser.php diff --git a/library/HTMLPurifier/TagTransform.php b/library/HTMLPurifier/TagTransform.php index 210a44721..210a44721 100755..100644 --- a/library/HTMLPurifier/TagTransform.php +++ b/library/HTMLPurifier/TagTransform.php diff --git a/library/HTMLPurifier/TagTransform/Font.php b/library/HTMLPurifier/TagTransform/Font.php index ed2463786..ed2463786 100755..100644 --- a/library/HTMLPurifier/TagTransform/Font.php +++ b/library/HTMLPurifier/TagTransform/Font.php diff --git a/library/HTMLPurifier/TagTransform/Simple.php b/library/HTMLPurifier/TagTransform/Simple.php index 0e36130f2..0e36130f2 100755..100644 --- a/library/HTMLPurifier/TagTransform/Simple.php +++ b/library/HTMLPurifier/TagTransform/Simple.php diff --git a/library/HTMLPurifier/Token.php b/library/HTMLPurifier/Token.php index 7900e6cb1..7900e6cb1 100755..100644 --- a/library/HTMLPurifier/Token.php +++ b/library/HTMLPurifier/Token.php diff --git a/library/HTMLPurifier/Token/Comment.php b/library/HTMLPurifier/Token/Comment.php index dc6bdcabb..dc6bdcabb 100755..100644 --- a/library/HTMLPurifier/Token/Comment.php +++ b/library/HTMLPurifier/Token/Comment.php diff --git a/library/HTMLPurifier/Token/Empty.php b/library/HTMLPurifier/Token/Empty.php index 2a82b47ad..2a82b47ad 100755..100644 --- a/library/HTMLPurifier/Token/Empty.php +++ b/library/HTMLPurifier/Token/Empty.php diff --git a/library/HTMLPurifier/Token/End.php b/library/HTMLPurifier/Token/End.php index 353e79daf..353e79daf 100755..100644 --- a/library/HTMLPurifier/Token/End.php +++ b/library/HTMLPurifier/Token/End.php diff --git a/library/HTMLPurifier/Token/Start.php b/library/HTMLPurifier/Token/Start.php index e0e14fc62..e0e14fc62 100755..100644 --- a/library/HTMLPurifier/Token/Start.php +++ b/library/HTMLPurifier/Token/Start.php diff --git a/library/HTMLPurifier/Token/Tag.php b/library/HTMLPurifier/Token/Tag.php index 798be028e..798be028e 100755..100644 --- a/library/HTMLPurifier/Token/Tag.php +++ b/library/HTMLPurifier/Token/Tag.php diff --git a/library/HTMLPurifier/Token/Text.php b/library/HTMLPurifier/Token/Text.php index 82efd823d..82efd823d 100755..100644 --- a/library/HTMLPurifier/Token/Text.php +++ b/library/HTMLPurifier/Token/Text.php diff --git a/library/HTMLPurifier/TokenFactory.php b/library/HTMLPurifier/TokenFactory.php index 7cf48fb41..7cf48fb41 100755..100644 --- a/library/HTMLPurifier/TokenFactory.php +++ b/library/HTMLPurifier/TokenFactory.php diff --git a/library/HTMLPurifier/URI.php b/library/HTMLPurifier/URI.php index 8b50d0d18..8b50d0d18 100755..100644 --- a/library/HTMLPurifier/URI.php +++ b/library/HTMLPurifier/URI.php diff --git a/library/HTMLPurifier/URIDefinition.php b/library/HTMLPurifier/URIDefinition.php index ea2b8fe24..ea2b8fe24 100755..100644 --- a/library/HTMLPurifier/URIDefinition.php +++ b/library/HTMLPurifier/URIDefinition.php diff --git a/library/HTMLPurifier/URIFilter.php b/library/HTMLPurifier/URIFilter.php index c116f93df..c116f93df 100755..100644 --- a/library/HTMLPurifier/URIFilter.php +++ b/library/HTMLPurifier/URIFilter.php diff --git a/library/HTMLPurifier/URIFilter/DisableExternal.php b/library/HTMLPurifier/URIFilter/DisableExternal.php index d8a39a501..d8a39a501 100755..100644 --- a/library/HTMLPurifier/URIFilter/DisableExternal.php +++ b/library/HTMLPurifier/URIFilter/DisableExternal.php diff --git a/library/HTMLPurifier/URIFilter/DisableExternalResources.php b/library/HTMLPurifier/URIFilter/DisableExternalResources.php index 881abc43c..881abc43c 100755..100644 --- a/library/HTMLPurifier/URIFilter/DisableExternalResources.php +++ b/library/HTMLPurifier/URIFilter/DisableExternalResources.php diff --git a/library/HTMLPurifier/URIFilter/HostBlacklist.php b/library/HTMLPurifier/URIFilter/HostBlacklist.php index 045aa0992..045aa0992 100755..100644 --- a/library/HTMLPurifier/URIFilter/HostBlacklist.php +++ b/library/HTMLPurifier/URIFilter/HostBlacklist.php diff --git a/library/HTMLPurifier/URIFilter/MakeAbsolute.php b/library/HTMLPurifier/URIFilter/MakeAbsolute.php index f46ab2630..f46ab2630 100755..100644 --- a/library/HTMLPurifier/URIFilter/MakeAbsolute.php +++ b/library/HTMLPurifier/URIFilter/MakeAbsolute.php diff --git a/library/HTMLPurifier/URIFilter/Munge.php b/library/HTMLPurifier/URIFilter/Munge.php index efa10a645..efa10a645 100755..100644 --- a/library/HTMLPurifier/URIFilter/Munge.php +++ b/library/HTMLPurifier/URIFilter/Munge.php diff --git a/library/HTMLPurifier/URIParser.php b/library/HTMLPurifier/URIParser.php index 7179e4ab8..7179e4ab8 100755..100644 --- a/library/HTMLPurifier/URIParser.php +++ b/library/HTMLPurifier/URIParser.php diff --git a/library/HTMLPurifier/URIScheme.php b/library/HTMLPurifier/URIScheme.php index 039710fd1..039710fd1 100755..100644 --- a/library/HTMLPurifier/URIScheme.php +++ b/library/HTMLPurifier/URIScheme.php diff --git a/library/HTMLPurifier/URIScheme/data.php b/library/HTMLPurifier/URIScheme/data.php index b7f1989cb..b7f1989cb 100755..100644 --- a/library/HTMLPurifier/URIScheme/data.php +++ b/library/HTMLPurifier/URIScheme/data.php diff --git a/library/HTMLPurifier/URIScheme/ftp.php b/library/HTMLPurifier/URIScheme/ftp.php index 5849bf7ff..5849bf7ff 100755..100644 --- a/library/HTMLPurifier/URIScheme/ftp.php +++ b/library/HTMLPurifier/URIScheme/ftp.php diff --git a/library/HTMLPurifier/URIScheme/http.php b/library/HTMLPurifier/URIScheme/http.php index b097a31d6..b097a31d6 100755..100644 --- a/library/HTMLPurifier/URIScheme/http.php +++ b/library/HTMLPurifier/URIScheme/http.php diff --git a/library/HTMLPurifier/URIScheme/https.php b/library/HTMLPurifier/URIScheme/https.php index 29e380919..29e380919 100755..100644 --- a/library/HTMLPurifier/URIScheme/https.php +++ b/library/HTMLPurifier/URIScheme/https.php diff --git a/library/HTMLPurifier/URIScheme/mailto.php b/library/HTMLPurifier/URIScheme/mailto.php index c1e2cd5aa..c1e2cd5aa 100755..100644 --- a/library/HTMLPurifier/URIScheme/mailto.php +++ b/library/HTMLPurifier/URIScheme/mailto.php diff --git a/library/HTMLPurifier/URIScheme/news.php b/library/HTMLPurifier/URIScheme/news.php index f5f54f4f5..f5f54f4f5 100755..100644 --- a/library/HTMLPurifier/URIScheme/news.php +++ b/library/HTMLPurifier/URIScheme/news.php diff --git a/library/HTMLPurifier/URIScheme/nntp.php b/library/HTMLPurifier/URIScheme/nntp.php index 5bf93ea78..5bf93ea78 100755..100644 --- a/library/HTMLPurifier/URIScheme/nntp.php +++ b/library/HTMLPurifier/URIScheme/nntp.php diff --git a/library/HTMLPurifier/URISchemeRegistry.php b/library/HTMLPurifier/URISchemeRegistry.php index 576bf7b6d..576bf7b6d 100755..100644 --- a/library/HTMLPurifier/URISchemeRegistry.php +++ b/library/HTMLPurifier/URISchemeRegistry.php diff --git a/library/HTMLPurifier/UnitConverter.php b/library/HTMLPurifier/UnitConverter.php index 545d42622..545d42622 100755..100644 --- a/library/HTMLPurifier/UnitConverter.php +++ b/library/HTMLPurifier/UnitConverter.php diff --git a/library/HTMLPurifier/VarParser.php b/library/HTMLPurifier/VarParser.php index 68e72ae86..68e72ae86 100755..100644 --- a/library/HTMLPurifier/VarParser.php +++ b/library/HTMLPurifier/VarParser.php diff --git a/library/HTMLPurifier/VarParser/Flexible.php b/library/HTMLPurifier/VarParser/Flexible.php index c954250e9..c954250e9 100755..100644 --- a/library/HTMLPurifier/VarParser/Flexible.php +++ b/library/HTMLPurifier/VarParser/Flexible.php diff --git a/library/HTMLPurifier/VarParser/Native.php b/library/HTMLPurifier/VarParser/Native.php index b02a6de54..b02a6de54 100755..100644 --- a/library/HTMLPurifier/VarParser/Native.php +++ b/library/HTMLPurifier/VarParser/Native.php diff --git a/library/HTMLPurifier/VarParserException.php b/library/HTMLPurifier/VarParserException.php index 5df341495..5df341495 100755..100644 --- a/library/HTMLPurifier/VarParserException.php +++ b/library/HTMLPurifier/VarParserException.php diff --git a/library/OAuth1.php b/library/OAuth1.php index 0db6fabcb..0db6fabcb 100755..100644 --- a/library/OAuth1.php +++ b/library/OAuth1.php diff --git a/library/asn1.php b/library/asn1.php index e84398bf6..e84398bf6 100755..100644 --- a/library/asn1.php +++ b/library/asn1.php diff --git a/library/cropper/cropper.css b/library/cropper/cropper.css index c2e759818..c2e759818 100755..100644 --- a/library/cropper/cropper.css +++ b/library/cropper/cropper.css diff --git a/library/cropper/cropper.html b/library/cropper/cropper.html index 236235247..236235247 100755..100644 --- a/library/cropper/cropper.html +++ b/library/cropper/cropper.html diff --git a/library/cropper/cropper.js b/library/cropper/cropper.js index 486a92ad9..486a92ad9 100755..100644 --- a/library/cropper/cropper.js +++ b/library/cropper/cropper.js diff --git a/library/cropper/cropper.uncompressed.js b/library/cropper/cropper.uncompressed.js index 66185546e..66185546e 100755..100644 --- a/library/cropper/cropper.uncompressed.js +++ b/library/cropper/cropper.uncompressed.js diff --git a/library/cropper/lib/builder.js b/library/cropper/lib/builder.js index 5b15ba939..5b15ba939 100755..100644 --- a/library/cropper/lib/builder.js +++ b/library/cropper/lib/builder.js diff --git a/library/cropper/lib/controls.js b/library/cropper/lib/controls.js index de0261ed5..de0261ed5 100755..100644 --- a/library/cropper/lib/controls.js +++ b/library/cropper/lib/controls.js diff --git a/library/cropper/lib/dragdrop.js b/library/cropper/lib/dragdrop.js index be2a30f53..be2a30f53 100755..100644 --- a/library/cropper/lib/dragdrop.js +++ b/library/cropper/lib/dragdrop.js diff --git a/library/cropper/lib/effects.js b/library/cropper/lib/effects.js index 0864323ec..0864323ec 100755..100644 --- a/library/cropper/lib/effects.js +++ b/library/cropper/lib/effects.js diff --git a/library/cropper/lib/prototype.js b/library/cropper/lib/prototype.js index 0caf9cd7f..0caf9cd7f 100755..100644 --- a/library/cropper/lib/prototype.js +++ b/library/cropper/lib/prototype.js diff --git a/library/cropper/lib/scriptaculous.js b/library/cropper/lib/scriptaculous.js index f61fc57f7..f61fc57f7 100755..100644 --- a/library/cropper/lib/scriptaculous.js +++ b/library/cropper/lib/scriptaculous.js diff --git a/library/cropper/lib/slider.js b/library/cropper/lib/slider.js index c0f1fc01b..c0f1fc01b 100755..100644 --- a/library/cropper/lib/slider.js +++ b/library/cropper/lib/slider.js diff --git a/library/cropper/lib/unittest.js b/library/cropper/lib/unittest.js index d2c2d8171..d2c2d8171 100755..100644 --- a/library/cropper/lib/unittest.js +++ b/library/cropper/lib/unittest.js diff --git a/library/cropper/licence.txt b/library/cropper/licence.txt index b59e02917..b59e02917 100755..100644 --- a/library/cropper/licence.txt +++ b/library/cropper/licence.txt diff --git a/library/cropper/marqueeHoriz.gif b/library/cropper/marqueeHoriz.gif Binary files differindex 25317e573..25317e573 100755..100644 --- a/library/cropper/marqueeHoriz.gif +++ b/library/cropper/marqueeHoriz.gif diff --git a/library/cropper/marqueeVert.gif b/library/cropper/marqueeVert.gif Binary files differindex 354070bb4..354070bb4 100755..100644 --- a/library/cropper/marqueeVert.gif +++ b/library/cropper/marqueeVert.gif diff --git a/library/cropper/tests/castle.jpg b/library/cropper/tests/castle.jpg Binary files differindex e40b7e4cb..e40b7e4cb 100755..100644 --- a/library/cropper/tests/castle.jpg +++ b/library/cropper/tests/castle.jpg diff --git a/library/cropper/tests/castleMed.jpg b/library/cropper/tests/castleMed.jpg Binary files differindex c35a6f554..c35a6f554 100755..100644 --- a/library/cropper/tests/castleMed.jpg +++ b/library/cropper/tests/castleMed.jpg diff --git a/library/cropper/tests/example-Basic.htm b/library/cropper/tests/example-Basic.htm index 391c2ecdb..391c2ecdb 100755..100644 --- a/library/cropper/tests/example-Basic.htm +++ b/library/cropper/tests/example-Basic.htm diff --git a/library/cropper/tests/example-CSS-Absolute.htm b/library/cropper/tests/example-CSS-Absolute.htm index 17e4c489d..17e4c489d 100755..100644 --- a/library/cropper/tests/example-CSS-Absolute.htm +++ b/library/cropper/tests/example-CSS-Absolute.htm diff --git a/library/cropper/tests/example-CSS-Float.htm b/library/cropper/tests/example-CSS-Float.htm index 5066553fe..5066553fe 100755..100644 --- a/library/cropper/tests/example-CSS-Float.htm +++ b/library/cropper/tests/example-CSS-Float.htm diff --git a/library/cropper/tests/example-CSS-Relative.htm b/library/cropper/tests/example-CSS-Relative.htm index 5894fe1f9..5894fe1f9 100755..100644 --- a/library/cropper/tests/example-CSS-Relative.htm +++ b/library/cropper/tests/example-CSS-Relative.htm diff --git a/library/cropper/tests/example-CoordsOnLoad.htm b/library/cropper/tests/example-CoordsOnLoad.htm index 254a23472..254a23472 100755..100644 --- a/library/cropper/tests/example-CoordsOnLoad.htm +++ b/library/cropper/tests/example-CoordsOnLoad.htm diff --git a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm index 3a696360a..3a696360a 100755..100644 --- a/library/cropper/tests/example-CoordsOnLoadWithRatio.htm +++ b/library/cropper/tests/example-CoordsOnLoadWithRatio.htm diff --git a/library/cropper/tests/example-Dimensions.htm b/library/cropper/tests/example-Dimensions.htm index f54f99683..f54f99683 100755..100644 --- a/library/cropper/tests/example-Dimensions.htm +++ b/library/cropper/tests/example-Dimensions.htm diff --git a/library/cropper/tests/example-DynamicImage.htm b/library/cropper/tests/example-DynamicImage.htm index 898363489..898363489 100755..100644 --- a/library/cropper/tests/example-DynamicImage.htm +++ b/library/cropper/tests/example-DynamicImage.htm diff --git a/library/cropper/tests/example-FixedRatio.htm b/library/cropper/tests/example-FixedRatio.htm index 973bedda9..973bedda9 100755..100644 --- a/library/cropper/tests/example-FixedRatio.htm +++ b/library/cropper/tests/example-FixedRatio.htm diff --git a/library/cropper/tests/example-MinimumDimensions.htm b/library/cropper/tests/example-MinimumDimensions.htm index 3ae93c8e1..3ae93c8e1 100755..100644 --- a/library/cropper/tests/example-MinimumDimensions.htm +++ b/library/cropper/tests/example-MinimumDimensions.htm diff --git a/library/cropper/tests/example-MinimumWidth.htm b/library/cropper/tests/example-MinimumWidth.htm index b0576b87f..b0576b87f 100755..100644 --- a/library/cropper/tests/example-MinimumWidth.htm +++ b/library/cropper/tests/example-MinimumWidth.htm diff --git a/library/cropper/tests/example-Preview.htm b/library/cropper/tests/example-Preview.htm index 701670c91..701670c91 100755..100644 --- a/library/cropper/tests/example-Preview.htm +++ b/library/cropper/tests/example-Preview.htm diff --git a/library/cropper/tests/poppy.jpg b/library/cropper/tests/poppy.jpg Binary files differindex 1f6498584..1f6498584 100755..100644 --- a/library/cropper/tests/poppy.jpg +++ b/library/cropper/tests/poppy.jpg diff --git a/library/cropper/tests/staticHTMLStructure.htm b/library/cropper/tests/staticHTMLStructure.htm index ddb99278e..ddb99278e 100755..100644 --- a/library/cropper/tests/staticHTMLStructure.htm +++ b/library/cropper/tests/staticHTMLStructure.htm diff --git a/library/facebook.php b/library/facebook.php index eebe3b464..eebe3b464 100755..100644 --- a/library/facebook.php +++ b/library/facebook.php diff --git a/library/fancybox/blank.gif b/library/fancybox/blank.gif Binary files differindex 35d42e808..35d42e808 100755..100644 --- a/library/fancybox/blank.gif +++ b/library/fancybox/blank.gif diff --git a/library/fancybox/fancy_close.png b/library/fancybox/fancy_close.png Binary files differindex 07035307a..07035307a 100755..100644 --- a/library/fancybox/fancy_close.png +++ b/library/fancybox/fancy_close.png diff --git a/library/fancybox/fancy_loading.png b/library/fancybox/fancy_loading.png Binary files differindex 250301796..250301796 100755..100644 --- a/library/fancybox/fancy_loading.png +++ b/library/fancybox/fancy_loading.png diff --git a/library/fancybox/fancy_nav_left.png b/library/fancybox/fancy_nav_left.png Binary files differindex ebaa6a4fd..ebaa6a4fd 100755..100644 --- a/library/fancybox/fancy_nav_left.png +++ b/library/fancybox/fancy_nav_left.png diff --git a/library/fancybox/fancy_nav_right.png b/library/fancybox/fancy_nav_right.png Binary files differindex 873294e96..873294e96 100755..100644 --- a/library/fancybox/fancy_nav_right.png +++ b/library/fancybox/fancy_nav_right.png diff --git a/library/fancybox/fancy_shadow_e.png b/library/fancybox/fancy_shadow_e.png Binary files differindex 2eda08936..2eda08936 100755..100644 --- a/library/fancybox/fancy_shadow_e.png +++ b/library/fancybox/fancy_shadow_e.png diff --git a/library/fancybox/fancy_shadow_n.png b/library/fancybox/fancy_shadow_n.png Binary files differindex 69aa10e23..69aa10e23 100755..100644 --- a/library/fancybox/fancy_shadow_n.png +++ b/library/fancybox/fancy_shadow_n.png diff --git a/library/fancybox/fancy_shadow_ne.png b/library/fancybox/fancy_shadow_ne.png Binary files differindex 79f6980a3..79f6980a3 100755..100644 --- a/library/fancybox/fancy_shadow_ne.png +++ b/library/fancybox/fancy_shadow_ne.png diff --git a/library/fancybox/fancy_shadow_nw.png b/library/fancybox/fancy_shadow_nw.png Binary files differindex 7182cd938..7182cd938 100755..100644 --- a/library/fancybox/fancy_shadow_nw.png +++ b/library/fancybox/fancy_shadow_nw.png diff --git a/library/fancybox/fancy_shadow_s.png b/library/fancybox/fancy_shadow_s.png Binary files differindex d8858bfb7..d8858bfb7 100755..100644 --- a/library/fancybox/fancy_shadow_s.png +++ b/library/fancybox/fancy_shadow_s.png diff --git a/library/fancybox/fancy_shadow_se.png b/library/fancybox/fancy_shadow_se.png Binary files differindex 541e3ffd3..541e3ffd3 100755..100644 --- a/library/fancybox/fancy_shadow_se.png +++ b/library/fancybox/fancy_shadow_se.png diff --git a/library/fancybox/fancy_shadow_sw.png b/library/fancybox/fancy_shadow_sw.png Binary files differindex b451689fa..b451689fa 100755..100644 --- a/library/fancybox/fancy_shadow_sw.png +++ b/library/fancybox/fancy_shadow_sw.png diff --git a/library/fancybox/fancy_shadow_w.png b/library/fancybox/fancy_shadow_w.png Binary files differindex 8a4e4a887..8a4e4a887 100755..100644 --- a/library/fancybox/fancy_shadow_w.png +++ b/library/fancybox/fancy_shadow_w.png diff --git a/library/fancybox/fancy_title_left.png b/library/fancybox/fancy_title_left.png Binary files differindex 6049223d1..6049223d1 100755..100644 --- a/library/fancybox/fancy_title_left.png +++ b/library/fancybox/fancy_title_left.png diff --git a/library/fancybox/fancy_title_main.png b/library/fancybox/fancy_title_main.png Binary files differindex 8044271f2..8044271f2 100755..100644 --- a/library/fancybox/fancy_title_main.png +++ b/library/fancybox/fancy_title_main.png diff --git a/library/fancybox/fancy_title_over.png b/library/fancybox/fancy_title_over.png Binary files differindex d9f458f4b..d9f458f4b 100755..100644 --- a/library/fancybox/fancy_title_over.png +++ b/library/fancybox/fancy_title_over.png diff --git a/library/fancybox/fancy_title_right.png b/library/fancybox/fancy_title_right.png Binary files differindex e36d9db2a..e36d9db2a 100755..100644 --- a/library/fancybox/fancy_title_right.png +++ b/library/fancybox/fancy_title_right.png diff --git a/library/fancybox/fancybox-x.png b/library/fancybox/fancybox-x.png Binary files differindex c2130f869..c2130f869 100755..100644 --- a/library/fancybox/fancybox-x.png +++ b/library/fancybox/fancybox-x.png diff --git a/library/fancybox/fancybox-y.png b/library/fancybox/fancybox-y.png Binary files differindex 7ef399b99..7ef399b99 100755..100644 --- a/library/fancybox/fancybox-y.png +++ b/library/fancybox/fancybox-y.png diff --git a/library/fancybox/fancybox.png b/library/fancybox/fancybox.png Binary files differindex 65e14f68f..65e14f68f 100755..100644 --- a/library/fancybox/fancybox.png +++ b/library/fancybox/fancybox.png diff --git a/library/fancybox/jquery.easing-1.3.pack.js b/library/fancybox/jquery.easing-1.3.pack.js index 9028179e7..9028179e7 100755..100644 --- a/library/fancybox/jquery.easing-1.3.pack.js +++ b/library/fancybox/jquery.easing-1.3.pack.js diff --git a/library/fancybox/jquery.fancybox-1.3.4.css b/library/fancybox/jquery.fancybox-1.3.4.css index 6f53d8f4a..6f53d8f4a 100755..100644 --- a/library/fancybox/jquery.fancybox-1.3.4.css +++ b/library/fancybox/jquery.fancybox-1.3.4.css diff --git a/library/fancybox/jquery.fancybox-1.3.4.js b/library/fancybox/jquery.fancybox-1.3.4.js index be7727537..be7727537 100755..100644 --- a/library/fancybox/jquery.fancybox-1.3.4.js +++ b/library/fancybox/jquery.fancybox-1.3.4.js diff --git a/library/fancybox/jquery.fancybox-1.3.4.pack.js b/library/fancybox/jquery.fancybox-1.3.4.pack.js index 1373ed083..1373ed083 100755..100644 --- a/library/fancybox/jquery.fancybox-1.3.4.pack.js +++ b/library/fancybox/jquery.fancybox-1.3.4.pack.js diff --git a/library/fancybox/jquery.mousewheel-3.0.4.pack.js b/library/fancybox/jquery.mousewheel-3.0.4.pack.js index cb66588e2..cb66588e2 100755..100644 --- a/library/fancybox/jquery.mousewheel-3.0.4.pack.js +++ b/library/fancybox/jquery.mousewheel-3.0.4.pack.js diff --git a/library/jgrowl/README b/library/jgrowl/README index 3c94f7508..3c94f7508 100755..100644 --- a/library/jgrowl/README +++ b/library/jgrowl/README diff --git a/library/jgrowl/jquery.jgrowl.css b/library/jgrowl/jquery.jgrowl.css index b4deb978c..b4deb978c 100755..100644 --- a/library/jgrowl/jquery.jgrowl.css +++ b/library/jgrowl/jquery.jgrowl.css diff --git a/library/jgrowl/jquery.jgrowl_minimized.js b/library/jgrowl/jquery.jgrowl_minimized.js index 782898098..782898098 100755..100644 --- a/library/jgrowl/jquery.jgrowl_minimized.js +++ b/library/jgrowl/jquery.jgrowl_minimized.js diff --git a/library/mcefixes/plugins.bbcode.editor_plugin_src.js b/library/mcefixes/plugins.bbcode.editor_plugin_src.js index a2829a21c..a2829a21c 100755..100644 --- a/library/mcefixes/plugins.bbcode.editor_plugin_src.js +++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js diff --git a/library/mcefixes/themes.advanced.img.icons.gif b/library/mcefixes/themes.advanced.img.icons.gif Binary files differindex efb356c41..efb356c41 100755..100644 --- a/library/mcefixes/themes.advanced.img.icons.gif +++ b/library/mcefixes/themes.advanced.img.icons.gif diff --git a/library/mcefixes/themes.advanced.skins.default.dialog.css b/library/mcefixes/themes.advanced.skins.default.dialog.css index f01222650..f01222650 100755..100644 --- a/library/mcefixes/themes.advanced.skins.default.dialog.css +++ b/library/mcefixes/themes.advanced.skins.default.dialog.css diff --git a/library/mcefixes/themes.advanced.skins.default.ui.css b/library/mcefixes/themes.advanced.skins.default.ui.css index 5f1f96448..5f1f96448 100755..100644 --- a/library/mcefixes/themes.advanced.skins.default.ui.css +++ b/library/mcefixes/themes.advanced.skins.default.ui.css diff --git a/library/oauth.php b/library/oauth.php index caf1a0839..caf1a0839 100755..100644 --- a/library/oauth.php +++ b/library/oauth.php diff --git a/library/oauth2-php/CHANGELOG.txt b/library/oauth2-php/CHANGELOG.txt index d854598b6..d854598b6 100755..100644 --- a/library/oauth2-php/CHANGELOG.txt +++ b/library/oauth2-php/CHANGELOG.txt diff --git a/library/oauth2-php/LICENSE.txt b/library/oauth2-php/LICENSE.txt index 7979b1c85..7979b1c85 100755..100644 --- a/library/oauth2-php/LICENSE.txt +++ b/library/oauth2-php/LICENSE.txt diff --git a/library/oauth2-php/lib/OAuth2.inc b/library/oauth2-php/lib/OAuth2.inc index e10e0f26d..e10e0f26d 100755..100644 --- a/library/oauth2-php/lib/OAuth2.inc +++ b/library/oauth2-php/lib/OAuth2.inc diff --git a/library/oauth2-php/lib/OAuth2Client.inc b/library/oauth2-php/lib/OAuth2Client.inc index e87d723de..e87d723de 100755..100644 --- a/library/oauth2-php/lib/OAuth2Client.inc +++ b/library/oauth2-php/lib/OAuth2Client.inc diff --git a/library/oauth2-php/lib/OAuth2Exception.inc b/library/oauth2-php/lib/OAuth2Exception.inc index 8dc046974..8dc046974 100755..100644 --- a/library/oauth2-php/lib/OAuth2Exception.inc +++ b/library/oauth2-php/lib/OAuth2Exception.inc diff --git a/library/openid.php b/library/openid.php index 3c58beb8a..3c58beb8a 100755..100644 --- a/library/openid.php +++ b/library/openid.php diff --git a/library/phpsec/Crypt/AES.php b/library/phpsec/Crypt/AES.php index 681800a81..681800a81 100755..100644 --- a/library/phpsec/Crypt/AES.php +++ b/library/phpsec/Crypt/AES.php diff --git a/library/phpsec/Crypt/DES.php b/library/phpsec/Crypt/DES.php index 431ad539b..431ad539b 100755..100644 --- a/library/phpsec/Crypt/DES.php +++ b/library/phpsec/Crypt/DES.php diff --git a/library/phpsec/Crypt/Hash.php b/library/phpsec/Crypt/Hash.php index ef3a85802..ef3a85802 100755..100644 --- a/library/phpsec/Crypt/Hash.php +++ b/library/phpsec/Crypt/Hash.php diff --git a/library/phpsec/Crypt/RC4.php b/library/phpsec/Crypt/RC4.php index 6f82b2413..6f82b2413 100755..100644 --- a/library/phpsec/Crypt/RC4.php +++ b/library/phpsec/Crypt/RC4.php diff --git a/library/phpsec/Crypt/RSA.php b/library/phpsec/Crypt/RSA.php index 1c562082b..1c562082b 100755..100644 --- a/library/phpsec/Crypt/RSA.php +++ b/library/phpsec/Crypt/RSA.php diff --git a/library/phpsec/Crypt/Random.php b/library/phpsec/Crypt/Random.php index a91c4d3c5..a91c4d3c5 100755..100644 --- a/library/phpsec/Crypt/Random.php +++ b/library/phpsec/Crypt/Random.php diff --git a/library/phpsec/Crypt/Rijndael.php b/library/phpsec/Crypt/Rijndael.php index f141f3762..f141f3762 100755..100644 --- a/library/phpsec/Crypt/Rijndael.php +++ b/library/phpsec/Crypt/Rijndael.php diff --git a/library/phpsec/Crypt/TripleDES.php b/library/phpsec/Crypt/TripleDES.php index 4d0dbbca0..4d0dbbca0 100755..100644 --- a/library/phpsec/Crypt/TripleDES.php +++ b/library/phpsec/Crypt/TripleDES.php diff --git a/library/phpsec/Math/BigInteger.php b/library/phpsec/Math/BigInteger.php index 5b3a4fc8b..5b3a4fc8b 100755..100644 --- a/library/phpsec/Math/BigInteger.php +++ b/library/phpsec/Math/BigInteger.php diff --git a/library/phpsec/Net/SFTP.php b/library/phpsec/Net/SFTP.php index 06812ada3..06812ada3 100755..100644 --- a/library/phpsec/Net/SFTP.php +++ b/library/phpsec/Net/SFTP.php diff --git a/library/phpsec/Net/SSH1.php b/library/phpsec/Net/SSH1.php index 7220ee402..7220ee402 100755..100644 --- a/library/phpsec/Net/SSH1.php +++ b/library/phpsec/Net/SSH1.php diff --git a/library/phpsec/Net/SSH2.php b/library/phpsec/Net/SSH2.php index aa9f6dbe5..aa9f6dbe5 100755..100644 --- a/library/phpsec/Net/SSH2.php +++ b/library/phpsec/Net/SSH2.php diff --git a/library/phpsec/PHP/Compat/Function/array_fill.php b/library/phpsec/PHP/Compat/Function/array_fill.php index e02bfa14d..e02bfa14d 100755..100644 --- a/library/phpsec/PHP/Compat/Function/array_fill.php +++ b/library/phpsec/PHP/Compat/Function/array_fill.php diff --git a/library/phpsec/PHP/Compat/Function/bcpowmod.php b/library/phpsec/PHP/Compat/Function/bcpowmod.php index 6ec1b1840..6ec1b1840 100755..100644 --- a/library/phpsec/PHP/Compat/Function/bcpowmod.php +++ b/library/phpsec/PHP/Compat/Function/bcpowmod.php diff --git a/library/phpsec/PHP/Compat/Function/str_split.php b/library/phpsec/PHP/Compat/Function/str_split.php index 8e38bdb89..8e38bdb89 100755..100644 --- a/library/phpsec/PHP/Compat/Function/str_split.php +++ b/library/phpsec/PHP/Compat/Function/str_split.php diff --git a/library/phpsec/crypt.html b/library/phpsec/crypt.html index 6720cf789..6720cf789 100755..100644 --- a/library/phpsec/crypt.html +++ b/library/phpsec/crypt.html diff --git a/library/phpsec/docbook.css b/library/phpsec/docbook.css index 4f67aa4cd..4f67aa4cd 100755..100644 --- a/library/phpsec/docbook.css +++ b/library/phpsec/docbook.css diff --git a/library/phpsec/index.html b/library/phpsec/index.html index 6dda0f369..6dda0f369 100755..100644 --- a/library/phpsec/index.html +++ b/library/phpsec/index.html diff --git a/library/phpsec/intro.html b/library/phpsec/intro.html index 406b22fc5..406b22fc5 100755..100644 --- a/library/phpsec/intro.html +++ b/library/phpsec/intro.html diff --git a/library/phpsec/math.html b/library/phpsec/math.html index 4e5a14a54..4e5a14a54 100755..100644 --- a/library/phpsec/math.html +++ b/library/phpsec/math.html diff --git a/library/phpsec/misc_crypt.html b/library/phpsec/misc_crypt.html index 9751ddac8..9751ddac8 100755..100644 --- a/library/phpsec/misc_crypt.html +++ b/library/phpsec/misc_crypt.html diff --git a/library/phpsec/net.html b/library/phpsec/net.html index 2752b826d..2752b826d 100755..100644 --- a/library/phpsec/net.html +++ b/library/phpsec/net.html diff --git a/library/phpsec/sym_crypt.html b/library/phpsec/sym_crypt.html index 956506290..956506290 100755..100644 --- a/library/phpsec/sym_crypt.html +++ b/library/phpsec/sym_crypt.html diff --git a/library/simplepie/LICENSE.txt b/library/simplepie/LICENSE.txt index a822a4bd9..a822a4bd9 100755..100644 --- a/library/simplepie/LICENSE.txt +++ b/library/simplepie/LICENSE.txt diff --git a/library/simplepie/README.markdown b/library/simplepie/README.markdown index e5ca021ce..e5ca021ce 100755..100644 --- a/library/simplepie/README.markdown +++ b/library/simplepie/README.markdown diff --git a/library/simplepie/compatibility_test/COMPATIBILITY README.txt b/library/simplepie/compatibility_test/COMPATIBILITY README.txt index 5b2498992..5b2498992 100755..100644 --- a/library/simplepie/compatibility_test/COMPATIBILITY README.txt +++ b/library/simplepie/compatibility_test/COMPATIBILITY README.txt diff --git a/library/simplepie/compatibility_test/sp_compatibility_test.php b/library/simplepie/compatibility_test/sp_compatibility_test.php index a7a7f5fde..a7a7f5fde 100755..100644 --- a/library/simplepie/compatibility_test/sp_compatibility_test.php +++ b/library/simplepie/compatibility_test/sp_compatibility_test.php diff --git a/library/simplepie/create.php b/library/simplepie/create.php index 908ed182b..908ed182b 100755..100644 --- a/library/simplepie/create.php +++ b/library/simplepie/create.php diff --git a/library/simplepie/db.sql b/library/simplepie/db.sql index 13f504c21..13f504c21 100755..100644 --- a/library/simplepie/db.sql +++ b/library/simplepie/db.sql diff --git a/library/simplepie/demo/cli_test.php b/library/simplepie/demo/cli_test.php index ec933c5ad..ec933c5ad 100755..100644 --- a/library/simplepie/demo/cli_test.php +++ b/library/simplepie/demo/cli_test.php diff --git a/library/simplepie/demo/for_the_demo/alternate_favicon.png b/library/simplepie/demo/for_the_demo/alternate_favicon.png Binary files differindex 063fb2805..063fb2805 100755..100644 --- a/library/simplepie/demo/for_the_demo/alternate_favicon.png +++ b/library/simplepie/demo/for_the_demo/alternate_favicon.png diff --git a/library/simplepie/demo/for_the_demo/background_blockquote.png b/library/simplepie/demo/for_the_demo/background_blockquote.png Binary files differindex 8267e23a2..8267e23a2 100755..100644 --- a/library/simplepie/demo/for_the_demo/background_blockquote.png +++ b/library/simplepie/demo/for_the_demo/background_blockquote.png diff --git a/library/simplepie/demo/for_the_demo/background_menuitem.gif b/library/simplepie/demo/for_the_demo/background_menuitem.gif Binary files differindex fa765d670..fa765d670 100755..100644 --- a/library/simplepie/demo/for_the_demo/background_menuitem.gif +++ b/library/simplepie/demo/for_the_demo/background_menuitem.gif diff --git a/library/simplepie/demo/for_the_demo/background_menuitem_off.gif b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif Binary files differindex 236cf406d..236cf406d 100755..100644 --- a/library/simplepie/demo/for_the_demo/background_menuitem_off.gif +++ b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif diff --git a/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif Binary files differindex 95cfb820d..95cfb820d 100755..100644 --- a/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif +++ b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif diff --git a/library/simplepie/demo/for_the_demo/favicons/alternate.png b/library/simplepie/demo/for_the_demo/favicons/alternate.png Binary files differindex 063fb2805..063fb2805 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/alternate.png +++ b/library/simplepie/demo/for_the_demo/favicons/alternate.png diff --git a/library/simplepie/demo/for_the_demo/favicons/blinklist.png b/library/simplepie/demo/for_the_demo/favicons/blinklist.png Binary files differindex 53200b3c6..53200b3c6 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/blinklist.png +++ b/library/simplepie/demo/for_the_demo/favicons/blinklist.png diff --git a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png Binary files differindex c5372614a..c5372614a 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png +++ b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png diff --git a/library/simplepie/demo/for_the_demo/favicons/delicious.png b/library/simplepie/demo/for_the_demo/favicons/delicious.png Binary files differindex 2e6021d26..2e6021d26 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/delicious.png +++ b/library/simplepie/demo/for_the_demo/favicons/delicious.png diff --git a/library/simplepie/demo/for_the_demo/favicons/digg.png b/library/simplepie/demo/for_the_demo/favicons/digg.png Binary files differindex 3aa96770e..3aa96770e 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/digg.png +++ b/library/simplepie/demo/for_the_demo/favicons/digg.png diff --git a/library/simplepie/demo/for_the_demo/favicons/magnolia.png b/library/simplepie/demo/for_the_demo/favicons/magnolia.png Binary files differindex da519f5ab..da519f5ab 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/magnolia.png +++ b/library/simplepie/demo/for_the_demo/favicons/magnolia.png diff --git a/library/simplepie/demo/for_the_demo/favicons/myweb2.png b/library/simplepie/demo/for_the_demo/favicons/myweb2.png Binary files differindex 2a12968d5..2a12968d5 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/myweb2.png +++ b/library/simplepie/demo/for_the_demo/favicons/myweb2.png diff --git a/library/simplepie/demo/for_the_demo/favicons/newsvine.png b/library/simplepie/demo/for_the_demo/favicons/newsvine.png Binary files differindex 5cdbb31c6..5cdbb31c6 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/newsvine.png +++ b/library/simplepie/demo/for_the_demo/favicons/newsvine.png diff --git a/library/simplepie/demo/for_the_demo/favicons/reddit.png b/library/simplepie/demo/for_the_demo/favicons/reddit.png Binary files differindex 65c38867c..65c38867c 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/reddit.png +++ b/library/simplepie/demo/for_the_demo/favicons/reddit.png diff --git a/library/simplepie/demo/for_the_demo/favicons/segnalo.png b/library/simplepie/demo/for_the_demo/favicons/segnalo.png Binary files differindex 748149b37..748149b37 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/segnalo.png +++ b/library/simplepie/demo/for_the_demo/favicons/segnalo.png diff --git a/library/simplepie/demo/for_the_demo/favicons/simpy.png b/library/simplepie/demo/for_the_demo/favicons/simpy.png Binary files differindex 30b23c1a5..30b23c1a5 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/simpy.png +++ b/library/simplepie/demo/for_the_demo/favicons/simpy.png diff --git a/library/simplepie/demo/for_the_demo/favicons/spurl.png b/library/simplepie/demo/for_the_demo/favicons/spurl.png Binary files differindex f5be3963d..f5be3963d 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/spurl.png +++ b/library/simplepie/demo/for_the_demo/favicons/spurl.png diff --git a/library/simplepie/demo/for_the_demo/favicons/technorati.png b/library/simplepie/demo/for_the_demo/favicons/technorati.png Binary files differindex 0f19e824e..0f19e824e 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/technorati.png +++ b/library/simplepie/demo/for_the_demo/favicons/technorati.png diff --git a/library/simplepie/demo/for_the_demo/favicons/wists.png b/library/simplepie/demo/for_the_demo/favicons/wists.png Binary files differindex 2e2d294d1..2e2d294d1 100755..100644 --- a/library/simplepie/demo/for_the_demo/favicons/wists.png +++ b/library/simplepie/demo/for_the_demo/favicons/wists.png diff --git a/library/simplepie/demo/for_the_demo/feed.png b/library/simplepie/demo/for_the_demo/feed.png Binary files differindex e23c50c85..e23c50c85 100755..100644 --- a/library/simplepie/demo/for_the_demo/feed.png +++ b/library/simplepie/demo/for_the_demo/feed.png diff --git a/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png Binary files differindex eda2d868b..eda2d868b 100755..100644 --- a/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png +++ b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png diff --git a/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf Binary files differindex 0a41e15eb..0a41e15eb 100755..100644 --- a/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf +++ b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf diff --git a/library/simplepie/demo/for_the_demo/mediaplayer.swf b/library/simplepie/demo/for_the_demo/mediaplayer.swf Binary files differindex bf78fd919..bf78fd919 100755..100644 --- a/library/simplepie/demo/for_the_demo/mediaplayer.swf +++ b/library/simplepie/demo/for_the_demo/mediaplayer.swf diff --git a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm index 56e12c309..56e12c309 100755..100644 --- a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm +++ b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm diff --git a/library/simplepie/demo/for_the_demo/mini_podcast.png b/library/simplepie/demo/for_the_demo/mini_podcast.png Binary files differindex fd6faf2a3..fd6faf2a3 100755..100644 --- a/library/simplepie/demo/for_the_demo/mini_podcast.png +++ b/library/simplepie/demo/for_the_demo/mini_podcast.png diff --git a/library/simplepie/demo/for_the_demo/place_audio.png b/library/simplepie/demo/for_the_demo/place_audio.png Binary files differindex 560ea0039..560ea0039 100755..100644 --- a/library/simplepie/demo/for_the_demo/place_audio.png +++ b/library/simplepie/demo/for_the_demo/place_audio.png diff --git a/library/simplepie/demo/for_the_demo/place_video.png b/library/simplepie/demo/for_the_demo/place_video.png Binary files differindex be5ec8219..be5ec8219 100755..100644 --- a/library/simplepie/demo/for_the_demo/place_video.png +++ b/library/simplepie/demo/for_the_demo/place_video.png diff --git a/library/simplepie/demo/for_the_demo/sIFR-print.css b/library/simplepie/demo/for_the_demo/sIFR-print.css index ec89b1961..ec89b1961 100755..100644 --- a/library/simplepie/demo/for_the_demo/sIFR-print.css +++ b/library/simplepie/demo/for_the_demo/sIFR-print.css diff --git a/library/simplepie/demo/for_the_demo/sIFR-screen.css b/library/simplepie/demo/for_the_demo/sIFR-screen.css index 778e09d2b..778e09d2b 100755..100644 --- a/library/simplepie/demo/for_the_demo/sIFR-screen.css +++ b/library/simplepie/demo/for_the_demo/sIFR-screen.css diff --git a/library/simplepie/demo/for_the_demo/sifr-config.js b/library/simplepie/demo/for_the_demo/sifr-config.js index e7066b361..e7066b361 100755..100644 --- a/library/simplepie/demo/for_the_demo/sifr-config.js +++ b/library/simplepie/demo/for_the_demo/sifr-config.js diff --git a/library/simplepie/demo/for_the_demo/sifr.js b/library/simplepie/demo/for_the_demo/sifr.js index 0a8b1b6dc..0a8b1b6dc 100755..100644 --- a/library/simplepie/demo/for_the_demo/sifr.js +++ b/library/simplepie/demo/for_the_demo/sifr.js diff --git a/library/simplepie/demo/for_the_demo/simplepie.css b/library/simplepie/demo/for_the_demo/simplepie.css index 3753cb96d..3753cb96d 100755..100644 --- a/library/simplepie/demo/for_the_demo/simplepie.css +++ b/library/simplepie/demo/for_the_demo/simplepie.css diff --git a/library/simplepie/demo/for_the_demo/sleight.js b/library/simplepie/demo/for_the_demo/sleight.js index 4b5058e9a..4b5058e9a 100755..100644 --- a/library/simplepie/demo/for_the_demo/sleight.js +++ b/library/simplepie/demo/for_the_demo/sleight.js diff --git a/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png Binary files differindex 2bfd87d0c..2bfd87d0c 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png +++ b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png diff --git a/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png Binary files differindex d0629769c..d0629769c 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png +++ b/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as index 6a98ca552..6a98ca552 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt index 2b9d32d20..2b9d32d20 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as index 4d371954b..4d371954b 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as index 4902e003f..4902e003f 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla Binary files differindex 2aa3f647f..2aa3f647f 100755..100644 --- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla +++ b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla diff --git a/library/simplepie/demo/for_the_demo/top_gradient.gif b/library/simplepie/demo/for_the_demo/top_gradient.gif Binary files differindex f77bd38f9..f77bd38f9 100755..100644 --- a/library/simplepie/demo/for_the_demo/top_gradient.gif +++ b/library/simplepie/demo/for_the_demo/top_gradient.gif diff --git a/library/simplepie/demo/for_the_demo/verdana.swf b/library/simplepie/demo/for_the_demo/verdana.swf Binary files differindex baf035047..baf035047 100755..100644 --- a/library/simplepie/demo/for_the_demo/verdana.swf +++ b/library/simplepie/demo/for_the_demo/verdana.swf diff --git a/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf b/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf Binary files differindex c812a79dc..c812a79dc 100755..100644 --- a/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf +++ b/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf diff --git a/library/simplepie/demo/handler_image.php b/library/simplepie/demo/handler_image.php index 49c3ec89b..49c3ec89b 100755..100644 --- a/library/simplepie/demo/handler_image.php +++ b/library/simplepie/demo/handler_image.php diff --git a/library/simplepie/demo/index.php b/library/simplepie/demo/index.php index 1481ba917..1481ba917 100755..100644 --- a/library/simplepie/demo/index.php +++ b/library/simplepie/demo/index.php diff --git a/library/simplepie/demo/minimalistic.php b/library/simplepie/demo/minimalistic.php index 56509c00c..56509c00c 100755..100644 --- a/library/simplepie/demo/minimalistic.php +++ b/library/simplepie/demo/minimalistic.php diff --git a/library/simplepie/demo/multifeeds.php b/library/simplepie/demo/multifeeds.php index b23d792a2..b23d792a2 100755..100644 --- a/library/simplepie/demo/multifeeds.php +++ b/library/simplepie/demo/multifeeds.php diff --git a/library/simplepie/demo/test.php b/library/simplepie/demo/test.php index 5b9943abb..5b9943abb 100755..100644 --- a/library/simplepie/demo/test.php +++ b/library/simplepie/demo/test.php diff --git a/library/simplepie/idn/LICENCE b/library/simplepie/idn/LICENCE index 25a1d22df..25a1d22df 100755..100644 --- a/library/simplepie/idn/LICENCE +++ b/library/simplepie/idn/LICENCE diff --git a/library/simplepie/idn/ReadMe.txt b/library/simplepie/idn/ReadMe.txt index 7ca8c7e6d..7ca8c7e6d 100755..100644 --- a/library/simplepie/idn/ReadMe.txt +++ b/library/simplepie/idn/ReadMe.txt diff --git a/library/simplepie/idn/idna_convert.class.php b/library/simplepie/idn/idna_convert.class.php index ed2bae26d..ed2bae26d 100755..100644 --- a/library/simplepie/idn/idna_convert.class.php +++ b/library/simplepie/idn/idna_convert.class.php diff --git a/library/simplepie/idn/npdata.ser b/library/simplepie/idn/npdata.ser index d7ce6d03f..d7ce6d03f 100755..100644 --- a/library/simplepie/idn/npdata.ser +++ b/library/simplepie/idn/npdata.ser diff --git a/library/simplepie/simplepie.inc b/library/simplepie/simplepie.inc index 8a2739f52..8a2739f52 100755..100644 --- a/library/simplepie/simplepie.inc +++ b/library/simplepie/simplepie.inc diff --git a/library/slinky.php b/library/slinky.php index cae1f755f..cae1f755f 100755..100644 --- a/library/slinky.php +++ b/library/slinky.php diff --git a/library/tiptip/README b/library/tiptip/README index a83cfba3e..a83cfba3e 100755..100644 --- a/library/tiptip/README +++ b/library/tiptip/README diff --git a/library/tiptip/README.txt b/library/tiptip/README.txt index 740d11a50..740d11a50 100755..100644 --- a/library/tiptip/README.txt +++ b/library/tiptip/README.txt diff --git a/library/tiptip/jquery.tipTip.js b/library/tiptip/jquery.tipTip.js index a05315dd7..a05315dd7 100755..100644 --- a/library/tiptip/jquery.tipTip.js +++ b/library/tiptip/jquery.tipTip.js diff --git a/library/tiptip/jquery.tipTip.minified.js b/library/tiptip/jquery.tipTip.minified.js index 79e58f7ad..79e58f7ad 100755..100644 --- a/library/tiptip/jquery.tipTip.minified.js +++ b/library/tiptip/jquery.tipTip.minified.js diff --git a/library/tiptip/tipTip.css b/library/tiptip/tipTip.css index 4fb95d376..4fb95d376 100755..100644 --- a/library/tiptip/tipTip.css +++ b/library/tiptip/tipTip.css diff --git a/library/twitteroauth.php b/library/twitteroauth.php index 7f3dcba4d..7f3dcba4d 100755..100644 --- a/library/twitteroauth.php +++ b/library/twitteroauth.php diff --git a/mod/acl.php b/mod/acl.php index fe353d1eb..fe353d1eb 100755..100644 --- a/mod/acl.php +++ b/mod/acl.php diff --git a/mod/admin.php b/mod/admin.php index a395027c1..a395027c1 100755..100644 --- a/mod/admin.php +++ b/mod/admin.php diff --git a/mod/allfriends.php b/mod/allfriends.php index f675b8e29..f675b8e29 100755..100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php diff --git a/mod/amcd.php b/mod/amcd.php index a2a1327e6..a2a1327e6 100755..100644 --- a/mod/amcd.php +++ b/mod/amcd.php diff --git a/mod/api.php b/mod/api.php index ad75e6620..ad75e6620 100755..100644 --- a/mod/api.php +++ b/mod/api.php diff --git a/mod/apps.php b/mod/apps.php index 8049b45fb..8049b45fb 100755..100644 --- a/mod/apps.php +++ b/mod/apps.php diff --git a/mod/attach.php b/mod/attach.php index ae6540201..ae6540201 100755..100644 --- a/mod/attach.php +++ b/mod/attach.php diff --git a/mod/cb.php b/mod/cb.php index 6375d2398..6375d2398 100755..100644 --- a/mod/cb.php +++ b/mod/cb.php diff --git a/mod/common.php b/mod/common.php index 852388c14..852388c14 100755..100644 --- a/mod/common.php +++ b/mod/common.php diff --git a/mod/community.php b/mod/community.php index f8cc3305b..f8cc3305b 100755..100644 --- a/mod/community.php +++ b/mod/community.php diff --git a/mod/contactgroup.php b/mod/contactgroup.php index bf81afe07..bf81afe07 100755..100644 --- a/mod/contactgroup.php +++ b/mod/contactgroup.php diff --git a/mod/contacts.php b/mod/contacts.php index 8aa51d00a..8aa51d00a 100755..100644 --- a/mod/contacts.php +++ b/mod/contacts.php diff --git a/mod/crepair.php b/mod/crepair.php index ec963b105..ec963b105 100755..100644 --- a/mod/crepair.php +++ b/mod/crepair.php diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 65d39d5fe..65d39d5fe 100755..100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 5c2788983..5c2788983 100755..100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 5881b7b51..5881b7b51 100755..100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php diff --git a/mod/directory.php b/mod/directory.php index 7f18bd026..7f18bd026 100755..100644 --- a/mod/directory.php +++ b/mod/directory.php diff --git a/mod/dirfind.php b/mod/dirfind.php index 34c54dd91..34c54dd91 100755..100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php diff --git a/mod/display.php b/mod/display.php index 81ed174ac..81ed174ac 100755..100644 --- a/mod/display.php +++ b/mod/display.php diff --git a/mod/editpost.php b/mod/editpost.php index 4c00201ca..4c00201ca 100755..100644 --- a/mod/editpost.php +++ b/mod/editpost.php diff --git a/mod/events.php b/mod/events.php index e66a2dc44..e66a2dc44 100755..100644 --- a/mod/events.php +++ b/mod/events.php diff --git a/mod/filer.php b/mod/filer.php index c0cca9e6d..c0cca9e6d 100755..100644 --- a/mod/filer.php +++ b/mod/filer.php diff --git a/mod/follow.php b/mod/follow.php index ae8cb200c..ae8cb200c 100755..100644 --- a/mod/follow.php +++ b/mod/follow.php diff --git a/mod/friendica.php b/mod/friendica.php index 52a064224..52a064224 100755..100644 --- a/mod/friendica.php +++ b/mod/friendica.php diff --git a/mod/friendika.php b/mod/friendika.php index 1f3df565d..1f3df565d 100755..100644 --- a/mod/friendika.php +++ b/mod/friendika.php diff --git a/mod/fsuggest.php b/mod/fsuggest.php index 9ef8f4c55..9ef8f4c55 100755..100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php diff --git a/mod/group.php b/mod/group.php index a282dbccf..a282dbccf 100755..100644 --- a/mod/group.php +++ b/mod/group.php diff --git a/mod/hcard.php b/mod/hcard.php index 6d2d9e2eb..6d2d9e2eb 100755..100644 --- a/mod/hcard.php +++ b/mod/hcard.php diff --git a/mod/help.php b/mod/help.php index af05bd47c..af05bd47c 100755..100644 --- a/mod/help.php +++ b/mod/help.php diff --git a/mod/home.php b/mod/home.php index 0320c1b39..0320c1b39 100755..100644 --- a/mod/home.php +++ b/mod/home.php diff --git a/mod/hostxrd.php b/mod/hostxrd.php index fe61a874c..fe61a874c 100755..100644 --- a/mod/hostxrd.php +++ b/mod/hostxrd.php diff --git a/mod/install.php b/mod/install.php index d1142248a..d1142248a 100755..100644 --- a/mod/install.php +++ b/mod/install.php diff --git a/mod/invite.php b/mod/invite.php index 2dbf93c59..2dbf93c59 100755..100644 --- a/mod/invite.php +++ b/mod/invite.php diff --git a/mod/item.php b/mod/item.php index 72e63865b..72e63865b 100755..100644 --- a/mod/item.php +++ b/mod/item.php diff --git a/mod/like.php b/mod/like.php index 6b97fafb5..6b97fafb5 100755..100644 --- a/mod/like.php +++ b/mod/like.php diff --git a/mod/localtime.php b/mod/localtime.php index c03eae1b0..c03eae1b0 100755..100644 --- a/mod/localtime.php +++ b/mod/localtime.php diff --git a/mod/lockview.php b/mod/lockview.php index 9e64e2608..9e64e2608 100755..100644 --- a/mod/lockview.php +++ b/mod/lockview.php diff --git a/mod/login.php b/mod/login.php index 10b4d3001..10b4d3001 100755..100644 --- a/mod/login.php +++ b/mod/login.php diff --git a/mod/lostpass.php b/mod/lostpass.php index 57e6d6965..57e6d6965 100755..100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php diff --git a/mod/manage.php b/mod/manage.php index 84dfa6917..84dfa6917 100755..100644 --- a/mod/manage.php +++ b/mod/manage.php diff --git a/mod/match.php b/mod/match.php index 926df1dff..926df1dff 100755..100644 --- a/mod/match.php +++ b/mod/match.php diff --git a/mod/message.php b/mod/message.php index 1369fde2e..1369fde2e 100755..100644 --- a/mod/message.php +++ b/mod/message.php diff --git a/mod/modexp.php b/mod/modexp.php index bba2c2882..bba2c2882 100755..100644 --- a/mod/modexp.php +++ b/mod/modexp.php diff --git a/mod/msearch.php b/mod/msearch.php index 94def7d89..94def7d89 100755..100644 --- a/mod/msearch.php +++ b/mod/msearch.php diff --git a/mod/network.php b/mod/network.php index d27945a86..b12bd16da 100755..100644 --- a/mod/network.php +++ b/mod/network.php @@ -206,8 +206,12 @@ function network_content(&$a, $update = 0) { ); - $tpl = get_markup_template('common_tabs.tpl'); - $o .= replace_macros($tpl, array('$tabs'=>$tabs)); + + $arr = array('tabs' => $tabs); + call_hooks('network_tabs', $arr); + + $o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs'])); + // --- end item filter tabs diff --git a/mod/newmember.php b/mod/newmember.php index 683463ecb..683463ecb 100755..100644 --- a/mod/newmember.php +++ b/mod/newmember.php diff --git a/mod/notes.php b/mod/notes.php index e6e2b44fb..e6e2b44fb 100755..100644 --- a/mod/notes.php +++ b/mod/notes.php diff --git a/mod/notice.php b/mod/notice.php index 19cf53189..19cf53189 100755..100644 --- a/mod/notice.php +++ b/mod/notice.php diff --git a/mod/notifications.php b/mod/notifications.php index 690a99562..690a99562 100755..100644 --- a/mod/notifications.php +++ b/mod/notifications.php diff --git a/mod/oembed.php b/mod/oembed.php index 236625f68..236625f68 100755..100644 --- a/mod/oembed.php +++ b/mod/oembed.php diff --git a/mod/oexchange.php b/mod/oexchange.php index bbb436e70..bbb436e70 100755..100644 --- a/mod/oexchange.php +++ b/mod/oexchange.php diff --git a/mod/openid.php b/mod/openid.php index e2cea7d85..e2cea7d85 100755..100644 --- a/mod/openid.php +++ b/mod/openid.php diff --git a/mod/opensearch.php b/mod/opensearch.php index ff748d1c5..ff748d1c5 100755..100644 --- a/mod/opensearch.php +++ b/mod/opensearch.php diff --git a/mod/parse_url.php b/mod/parse_url.php index 27dac4d5d..27dac4d5d 100755..100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php diff --git a/mod/photo.php b/mod/photo.php index 3a7025120..3a7025120 100755..100644 --- a/mod/photo.php +++ b/mod/photo.php diff --git a/mod/photos.php b/mod/photos.php index 2a808cb41..2a808cb41 100755..100644 --- a/mod/photos.php +++ b/mod/photos.php diff --git a/mod/poco.php b/mod/poco.php index acfa3ffaa..acfa3ffaa 100755..100644 --- a/mod/poco.php +++ b/mod/poco.php diff --git a/mod/post.php b/mod/post.php index 4a7e33b23..4a7e33b23 100755..100644 --- a/mod/post.php +++ b/mod/post.php diff --git a/mod/probe.php b/mod/probe.php index c95db291b..c95db291b 100755..100644 --- a/mod/probe.php +++ b/mod/probe.php diff --git a/mod/profile.php b/mod/profile.php index 68d73fba3..68d73fba3 100755..100644 --- a/mod/profile.php +++ b/mod/profile.php diff --git a/mod/profile_photo.php b/mod/profile_photo.php index ace8dadd4..ace8dadd4 100755..100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php diff --git a/mod/profiles.php b/mod/profiles.php index 7b3b6ccc1..7b3b6ccc1 100755..100644 --- a/mod/profiles.php +++ b/mod/profiles.php diff --git a/mod/profperm.php b/mod/profperm.php index 8d09c429c..8d09c429c 100755..100644 --- a/mod/profperm.php +++ b/mod/profperm.php diff --git a/mod/pubsub.php b/mod/pubsub.php index 93d50ef90..93d50ef90 100755..100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php diff --git a/mod/qsearch.php b/mod/qsearch.php index c35e253b6..c35e253b6 100755..100644 --- a/mod/qsearch.php +++ b/mod/qsearch.php diff --git a/mod/receive.php b/mod/receive.php index 2bd3cc65b..2bd3cc65b 100755..100644 --- a/mod/receive.php +++ b/mod/receive.php diff --git a/mod/redir.php b/mod/redir.php index 9223e5483..9223e5483 100755..100644 --- a/mod/redir.php +++ b/mod/redir.php diff --git a/mod/register.php b/mod/register.php index 630c0a675..630c0a675 100755..100644 --- a/mod/register.php +++ b/mod/register.php diff --git a/mod/regmod.php b/mod/regmod.php index 21f41eb01..21f41eb01 100755..100644 --- a/mod/regmod.php +++ b/mod/regmod.php diff --git a/mod/removeme.php b/mod/removeme.php index ee88bd76a..ee88bd76a 100755..100644 --- a/mod/removeme.php +++ b/mod/removeme.php diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php index 5bf4663fd..5bf4663fd 100755..100644 --- a/mod/rsd_xml.php +++ b/mod/rsd_xml.php diff --git a/mod/salmon.php b/mod/salmon.php index 6172d17a1..6172d17a1 100755..100644 --- a/mod/salmon.php +++ b/mod/salmon.php diff --git a/mod/search.php b/mod/search.php index 4ca7db9bb..4ca7db9bb 100755..100644 --- a/mod/search.php +++ b/mod/search.php diff --git a/mod/session.php b/mod/session.php index 22c855edb..22c855edb 100755..100644 --- a/mod/session.php +++ b/mod/session.php diff --git a/mod/settings.php b/mod/settings.php index 6879da285..6879da285 100755..100644 --- a/mod/settings.php +++ b/mod/settings.php diff --git a/mod/share.php b/mod/share.php index 6c6098c83..6c6098c83 100755..100644 --- a/mod/share.php +++ b/mod/share.php diff --git a/mod/smilies.php b/mod/smilies.php index c47f95da7..c47f95da7 100755..100644 --- a/mod/smilies.php +++ b/mod/smilies.php diff --git a/mod/starred.php b/mod/starred.php index 035b81e76..035b81e76 100755..100644 --- a/mod/starred.php +++ b/mod/starred.php diff --git a/mod/suggest.php b/mod/suggest.php index 7a86d53a1..7a86d53a1 100755..100644 --- a/mod/suggest.php +++ b/mod/suggest.php diff --git a/mod/tagger.php b/mod/tagger.php index 3ff5d57aa..3ff5d57aa 100755..100644 --- a/mod/tagger.php +++ b/mod/tagger.php diff --git a/mod/tagrm.php b/mod/tagrm.php index 5041145cc..5041145cc 100755..100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php diff --git a/mod/uexport.php b/mod/uexport.php index e1fb22855..e1fb22855 100755..100644 --- a/mod/uexport.php +++ b/mod/uexport.php diff --git a/mod/update_community.php b/mod/update_community.php index 3dcbce6b1..3dcbce6b1 100755..100644 --- a/mod/update_community.php +++ b/mod/update_community.php diff --git a/mod/update_network.php b/mod/update_network.php index 36de0722a..36de0722a 100755..100644 --- a/mod/update_network.php +++ b/mod/update_network.php diff --git a/mod/update_notes.php b/mod/update_notes.php index 90cc5bc69..90cc5bc69 100755..100644 --- a/mod/update_notes.php +++ b/mod/update_notes.php diff --git a/mod/update_profile.php b/mod/update_profile.php index c4884b30f..c4884b30f 100755..100644 --- a/mod/update_profile.php +++ b/mod/update_profile.php diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index e7d26b73e..e7d26b73e 100755..100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 3fa4eaed5..3fa4eaed5 100755..100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php diff --git a/mod/wall_attach.php b/mod/wall_attach.php index ecf475291..ecf475291 100755..100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 64f174a78..64f174a78 100755..100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php diff --git a/mod/webfinger.php b/mod/webfinger.php index 74bd2c954..74bd2c954 100755..100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php diff --git a/mod/xrd.php b/mod/xrd.php index 2fa6bcd99..2fa6bcd99 100755..100644 --- a/mod/xrd.php +++ b/mod/xrd.php diff --git a/spec/dfrn-snap2.jpg b/spec/dfrn-snap2.jpg Binary files differindex ee00f5654..ee00f5654 100755..100644 --- a/spec/dfrn-snap2.jpg +++ b/spec/dfrn-snap2.jpg diff --git a/spec/dfrn2.odt b/spec/dfrn2.odt Binary files differindex 390fc4bb8..390fc4bb8 100755..100644 --- a/spec/dfrn2.odt +++ b/spec/dfrn2.odt diff --git a/spec/dfrn2.pdf b/spec/dfrn2.pdf Binary files differindex e46225f7e..e46225f7e 100755..100644 --- a/spec/dfrn2.pdf +++ b/spec/dfrn2.pdf diff --git a/spec/zot.txt b/spec/zot.txt index 2c3bbb180..2c3bbb180 100755..100644 --- a/spec/zot.txt +++ b/spec/zot.txt diff --git a/testargs.php b/testargs.php index 4c9bce4e9..4c9bce4e9 100755..100644 --- a/testargs.php +++ b/testargs.php diff --git a/tests/autoname_test.php b/tests/autoname_test.php index 9dae920ca..c83e4a471 100755..100644 --- a/tests/autoname_test.php +++ b/tests/autoname_test.php @@ -40,7 +40,7 @@ class AutonameTest extends PHPUnit_Framework_TestCase { */
public function testAutonameNoLength() {
$autoname1=autoname(0);
- $this->assertEquals(0, count($autoname1));
+ $this->assertEquals(0, strlen($autoname1));
}
/** @@ -50,7 +50,7 @@ class AutonameTest extends PHPUnit_Framework_TestCase { */
public function testAutonameNegativeLength() {
$autoname1=autoname(-23);
- $this->assertEquals(0, count($autoname1));
+ $this->assertEquals(0, strlen($autoname1));
}
// public function testAutonameMaxLength() {
diff --git a/tests/contains_attribute_test.php b/tests/contains_attribute_test.php index b0bb06acf..b0bb06acf 100755..100644 --- a/tests/contains_attribute_test.php +++ b/tests/contains_attribute_test.php diff --git a/tests/expand_acl_test.php b/tests/expand_acl_test.php index b516a3f14..154bc921d 100755..100644 --- a/tests/expand_acl_test.php +++ b/tests/expand_acl_test.php @@ -39,7 +39,7 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase { */
public function testExpandAclString() {
$text="<1><279012><tt>";
- $this->assertEquals(array(1, 279012, 'tt'), expand_acl($text));
+ $this->assertEquals(array(1, 279012), expand_acl($text));
}
/** @@ -49,7 +49,7 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase { */
public function testExpandAclSpace() {
$text="<1><279 012><32>";
- $this->assertEquals(array(1, "279 012", "32"), expand_acl($text));
+ $this->assertEquals(array(1, "279", "32"), expand_acl($text));
}
/** @@ -127,16 +127,22 @@ class ExpandAclTest extends PHPUnit_Framework_TestCase { */
public function testExpandAclNoMatching2() {
$text="<1>2><3>";
- $this->assertEquals(array(), expand_acl($text));
+// The angles are delimiters which aren't important +// the important thing is the numeric content, this returns array(1,2,3) currently +// we may wish to eliminate 2 from the results, though it isn't harmful +// It would be a better test to figure out if there is any ACL input which can +// produce this $text and fix that instead. +// $this->assertEquals(array(), expand_acl($text));
} /**
* test invalid input, empty <>
*
* TODO: should there be an exception? Or array(1, 3)
+ * (This should be array(1,3) - mike) */
public function testExpandAclEmptyMatch() {
$text="<1><><3>";
- $this->assertEquals(array(), expand_acl($text));
+ $this->assertEquals(array(1,3), expand_acl($text));
} }
\ No newline at end of file diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index 9051923be..e5c6485de 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -139,23 +139,35 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { $str_tags='';
handle_tag($this->a, $text, $inform, $str_tags, 11, $tags[0]);
- $this->assertEquals("cid:15", $inform); - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); - $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);
+ // (mike) - This is a tricky case. + // we support mentions as in @mike@example.com - which contains a period. + // This shouldn't match anything unless you have a contact named "Mike.because". + // We may need another test for "@Mike. because" - which should return the contact + // as we ignore trailing periods in tags. + +// $this->assertEquals("cid:15", $inform); +// $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); +// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text);
+ + $this->assertEquals("", $inform); + $this->assertEquals("", $str_tags); + } /**
* test with two Person tags. * There's a minor spelling mistake...
*/
+ public function testGetTagsPerson2Spelling() {
$text="hi @Mike@campino@friendica.eu";
$tags=get_tags($text);
- - $this->assertEquals(2, count($tags));
- $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("@campino@friendica.eu", $tags));
+ +// This construct is not supported. Results are indeterminate +// $this->assertEquals(2, count($tags));
+// $this->assertTrue(in_array("@Mike", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu", $tags));
}
/** @@ -251,7 +263,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text);
$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags);
- $this->assertEquals("cid:15", $inform); + // this test may produce two cid:15 entries - which is OK because duplicates are pruned before delivery + $this->assertContains("cid:15",$inform); } /** @@ -297,10 +310,10 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { $this->assertTrue(in_array("#nice", $tags));
$this->assertTrue(in_array("@first_last", $tags)); - //right now, none of the is matched - $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));
- $this->assertTrue(in_array("@campino@friendica.eu", $tags)); - $this->assertTrue(in_array("@campino@friendica.eu is", $tags));
+ //right now, none of the is matched (unsupported) +// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags));
+// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu is", $tags));
}
/** diff --git a/tests/template_test.php b/tests/template_test.php index 1f9f80531..1f9f80531 100755..100644 --- a/tests/template_test.php +++ b/tests/template_test.php diff --git a/update.php b/update.php index d38e39f8b..1a36c754d 100755..100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1134 ); +define( 'UPDATE_VERSION' , 1137 ); /** * @@ -1137,7 +1137,72 @@ INDEX ( `username` ) } function update_1133() { - q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) "); - q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) "); - q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) "); +q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
+q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
+q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) "); } + +function update_1134() { + // faulty update merged forward + // had a hardwired tablename of 'friendica' which isn't the right name on most systems +} + +function update_1135() { + //there can't be indexes with more than 1000 bytes in mysql, + //so change charset to be smaller + q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , +CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); + + //same thing for pconfig + q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , + CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); + // faulty update merged forward. Bad update in 1134 caused duplicate k,cat pairs + // these have to be cleared before the unique keys can be added. +} + +function update_1136() { + + $arr = array(); + + // order in reverse so that we save the newest entry + + $r = q("select * from config where 1 order by id desc"); + if(count($r)) { + foreach($r as $rr) { + $found = false; + foreach($arr as $x) { + if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) { + $found = true; + q("delete from config where id = %d limit 1", + intval($rr['id']) + ); + } + } + if(! $found) { + $arr[] = $rr; + } + } + } + + $arr = array(); + $r = q("select * from pconfig where 1 order by id desc"); + if(count($r)) { + foreach($r as $rr) { + $found = false; + foreach($arr as $x) { + if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) { + $found = true; + q("delete from pconfig where id = %d limit 1", + intval($rr['id']) + ); + } + } + if(! $found) { + $arr[] = $rr; + } + } + } + q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); + q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); + +}
\ No newline at end of file diff --git a/util/.htaccess b/util/.htaccess index b311c14c2..b311c14c2 100755..100644 --- a/util/.htaccess +++ b/util/.htaccess diff --git a/util/README b/util/README index aceade3e2..aceade3e2 100755..100644 --- a/util/README +++ b/util/README diff --git a/util/db_update.php b/util/db_update.php index 35620e80b..35620e80b 100755..100644 --- a/util/db_update.php +++ b/util/db_update.php diff --git a/util/extract.php b/util/extract.php index 90127f3c1..90127f3c1 100755..100644 --- a/util/extract.php +++ b/util/extract.php diff --git a/util/messages.po b/util/messages.po index 60c71f7fe..0cb9d094d 100755..100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1302\n" +"Project-Id-Version: 2.3.1304\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-04 15:51-0700\n" +"POT-Creation-Date: 2012-04-06 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -207,7 +207,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:272 ../../include/text.php:1050 +#: ../../mod/events.php:272 ../../include/text.php:1053 msgid "link to source" msgstr "" @@ -401,8 +401,8 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:82 #: ../../view/theme/diabook-blue/theme.php:82 #: ../../view/theme/diabook/theme.php:86 -#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 -#: ../../include/diaspora.php:1650 ../../include/conversation.php:53 +#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "" @@ -1010,7 +1010,7 @@ msgid "This is required for message delivery to work." msgstr "" #: ../../mod/install.php:343 -msgid "PHP \"register_argc_argv\"" +msgid "PHP register_argc_argv" msgstr "" #: ../../mod/install.php:364 @@ -2222,7 +2222,7 @@ msgstr "" msgid "Shared Links" msgstr "" -#: ../../mod/network.php:270 +#: ../../mod/network.php:274 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2230,31 +2230,31 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:273 +#: ../../mod/network.php:277 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:318 +#: ../../mod/network.php:322 msgid "No such group" msgstr "" -#: ../../mod/network.php:329 +#: ../../mod/network.php:333 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:333 +#: ../../mod/network.php:337 msgid "Group: " msgstr "" -#: ../../mod/network.php:343 +#: ../../mod/network.php:347 msgid "Contact: " msgstr "" -#: ../../mod/network.php:345 +#: ../../mod/network.php:349 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:350 +#: ../../mod/network.php:354 msgid "Invalid contact." msgstr "" @@ -2262,8 +2262,8 @@ msgstr "" msgid "Personal Notes" msgstr "" -#: ../../mod/notes.php:63 ../../mod/filer.php:29 -#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 +#: ../../mod/notes.php:63 ../../mod/filer.php:30 +#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652 msgid "Save" msgstr "" @@ -2526,7 +2526,7 @@ msgstr "" msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:76 ../../include/text.php:586 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:589 msgid "View Contacts" msgstr "" @@ -2701,7 +2701,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90 #: ../../view/theme/diabook-aerith/theme.php:77 #: ../../view/theme/diabook-aerith/theme.php:86 -#: ../../include/diaspora.php:1650 ../../include/conversation.php:48 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 msgid "status" @@ -2713,7 +2713,7 @@ msgstr "" #: ../../view/theme/diabook-blue/theme.php:91 #: ../../view/theme/diabook/theme.php:95 #: ../../view/theme/diabook-aerith/theme.php:91 -#: ../../include/diaspora.php:1666 ../../include/conversation.php:65 +#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" @@ -3785,11 +3785,11 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:28 ../../include/conversation.php:918 +#: ../../mod/filer.php:29 ../../include/conversation.php:918 msgid "Save to Folder:" msgstr "" -#: ../../mod/filer.php:28 +#: ../../mod/filer.php:29 msgid "- select -" msgstr "" @@ -3993,7 +3993,7 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:503 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" @@ -4386,7 +4386,7 @@ msgstr "" #: ../../view/theme/diabook-red/theme.php:74 #: ../../view/theme/diabook-blue/theme.php:74 #: ../../view/theme/diabook/theme.php:78 -#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292 +#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5683,170 +5683,170 @@ msgstr "" msgid "noreply" msgstr "" -#: ../../include/text.php:240 +#: ../../include/text.php:243 msgid "prev" msgstr "" -#: ../../include/text.php:242 +#: ../../include/text.php:245 msgid "first" msgstr "" -#: ../../include/text.php:271 +#: ../../include/text.php:274 msgid "last" msgstr "" -#: ../../include/text.php:274 +#: ../../include/text.php:277 msgid "next" msgstr "" -#: ../../include/text.php:565 +#: ../../include/text.php:568 msgid "No contacts" msgstr "" -#: ../../include/text.php:574 +#: ../../include/text.php:577 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:647 ../../include/nav.php:91 +#: ../../include/text.php:650 ../../include/nav.php:91 msgid "Search" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Monday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Tuesday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Wednesday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Thursday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Friday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Saturday" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:831 msgid "Sunday" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "January" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "February" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "March" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "April" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "May" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "June" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "July" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "August" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "September" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "October" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "November" msgstr "" -#: ../../include/text.php:832 +#: ../../include/text.php:835 msgid "December" msgstr "" -#: ../../include/text.php:916 +#: ../../include/text.php:919 msgid "bytes" msgstr "" -#: ../../include/text.php:933 +#: ../../include/text.php:936 msgid "Categories:" msgstr "" -#: ../../include/text.php:945 +#: ../../include/text.php:948 msgid "remove" msgstr "" -#: ../../include/text.php:945 +#: ../../include/text.php:948 msgid "[remove]" msgstr "" -#: ../../include/text.php:948 +#: ../../include/text.php:951 msgid "Filed under:" msgstr "" -#: ../../include/text.php:964 ../../include/text.php:976 +#: ../../include/text.php:967 ../../include/text.php:979 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1068 +#: ../../include/text.php:1071 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1080 +#: ../../include/text.php:1083 msgid "default" msgstr "" -#: ../../include/text.php:1296 +#: ../../include/text.php:1299 msgid "activity" msgstr "" -#: ../../include/text.php:1298 +#: ../../include/text.php:1301 msgid "comment" msgstr "" -#: ../../include/text.php:1299 +#: ../../include/text.php:1302 msgid "post" msgstr "" -#: ../../include/text.php:1454 +#: ../../include/text.php:1457 msgid "Item filed" msgstr "" -#: ../../include/diaspora.php:578 +#: ../../include/diaspora.php:582 msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:1965 +#: ../../include/diaspora.php:1969 msgid "Attachments:" msgstr "" -#: ../../include/diaspora.php:2148 +#: ../../include/diaspora.php:2152 #, php-format msgid "[Relayed] Comment authored by %s from network %s" msgstr "" diff --git a/util/php2po.php b/util/php2po.php index d3ce0a5af..d3ce0a5af 100755..100644 --- a/util/php2po.php +++ b/util/php2po.php diff --git a/util/po2php.php b/util/po2php.php index c703172af..c703172af 100755..100644 --- a/util/po2php.php +++ b/util/po2php.php diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 6ea603c83..6ea603c83 100755..100644 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh diff --git a/util/strings.php b/util/strings.php index e70766d86..e70766d86 100755..100644 --- a/util/strings.php +++ b/util/strings.php diff --git a/util/typo.php b/util/typo.php index e20cce86a..e20cce86a 100755..100644 --- a/util/typo.php +++ b/util/typo.php diff --git a/util/typohelper.php b/util/typohelper.php index 589702a02..589702a02 100755..100644 --- a/util/typohelper.php +++ b/util/typohelper.php diff --git a/view/.htaccess b/view/.htaccess index 559a5fcc0..559a5fcc0 100755..100644 --- a/view/.htaccess +++ b/view/.htaccess diff --git a/view/404.tpl b/view/404.tpl index bf4d4e949..bf4d4e949 100755..100644 --- a/view/404.tpl +++ b/view/404.tpl diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl index 4bf7ce9d3..4bf7ce9d3 100755..100644 --- a/view/admin_aside.tpl +++ b/view/admin_aside.tpl diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl index 9d133b155..9d133b155 100755..100644 --- a/view/admin_logs.tpl +++ b/view/admin_logs.tpl diff --git a/view/admin_plugins.tpl b/view/admin_plugins.tpl index 8367ff6a1..8367ff6a1 100755..100644 --- a/view/admin_plugins.tpl +++ b/view/admin_plugins.tpl diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl index cbaef2d66..cbaef2d66 100755..100644 --- a/view/admin_plugins_details.tpl +++ b/view/admin_plugins_details.tpl diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl index 874c6e626..874c6e626 100755..100644 --- a/view/admin_remoteupdate.tpl +++ b/view/admin_remoteupdate.tpl diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 01fe893c6..01fe893c6 100755..100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl index eed71fbe0..eed71fbe0 100755..100644 --- a/view/admin_summary.tpl +++ b/view/admin_summary.tpl diff --git a/view/admin_users.tpl b/view/admin_users.tpl index bde7edb59..bde7edb59 100755..100644 --- a/view/admin_users.tpl +++ b/view/admin_users.tpl diff --git a/view/album_edit.tpl b/view/album_edit.tpl index 56a7b73fc..56a7b73fc 100755..100644 --- a/view/album_edit.tpl +++ b/view/album_edit.tpl diff --git a/view/api_config_xml.tpl b/view/api_config_xml.tpl index 3281e59dd..3281e59dd 100755..100644 --- a/view/api_config_xml.tpl +++ b/view/api_config_xml.tpl diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl index 0ea7eb13b..0ea7eb13b 100755..100644 --- a/view/api_friends_xml.tpl +++ b/view/api_friends_xml.tpl diff --git a/view/api_ratelimit_xml.tpl b/view/api_ratelimit_xml.tpl index 36ec1993d..36ec1993d 100755..100644 --- a/view/api_ratelimit_xml.tpl +++ b/view/api_ratelimit_xml.tpl diff --git a/view/api_status_xml.tpl b/view/api_status_xml.tpl index f6cd9c2c0..f6cd9c2c0 100755..100644 --- a/view/api_status_xml.tpl +++ b/view/api_status_xml.tpl diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl index fb4f51f59..fb4f51f59 100755..100644 --- a/view/api_timeline_atom.tpl +++ b/view/api_timeline_atom.tpl diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl index 40239273c..40239273c 100755..100644 --- a/view/api_timeline_rss.tpl +++ b/view/api_timeline_rss.tpl diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl index 17860ca61..17860ca61 100755..100644 --- a/view/api_timeline_xml.tpl +++ b/view/api_timeline_xml.tpl diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl index f1e122f3e..f1e122f3e 100755..100644 --- a/view/api_user_xml.tpl +++ b/view/api_user_xml.tpl diff --git a/view/apps.tpl b/view/apps.tpl index 4c7f8c94c..4c7f8c94c 100755..100644 --- a/view/apps.tpl +++ b/view/apps.tpl diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl index 2feb547ee..2feb547ee 100755..100644 --- a/view/atom_feed.tpl +++ b/view/atom_feed.tpl diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl index 0bae62b52..0bae62b52 100755..100644 --- a/view/atom_feed_dfrn.tpl +++ b/view/atom_feed_dfrn.tpl diff --git a/view/atom_mail.tpl b/view/atom_mail.tpl index bf7c3efc8..bf7c3efc8 100755..100644 --- a/view/atom_mail.tpl +++ b/view/atom_mail.tpl diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl index 66c61f9b6..66c61f9b6 100755..100644 --- a/view/atom_suggest.tpl +++ b/view/atom_suggest.tpl diff --git a/view/auto_request.tpl b/view/auto_request.tpl index 2958397c9..2958397c9 100755..100644 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl diff --git a/view/ca/cmnt_received_eml.tpl b/view/ca/cmnt_received_eml.tpl index ca61ca492..ca61ca492 100755..100644 --- a/view/ca/cmnt_received_eml.tpl +++ b/view/ca/cmnt_received_eml.tpl diff --git a/view/ca/follow_notify_eml.tpl b/view/ca/follow_notify_eml.tpl index ab5a4b371..ab5a4b371 100755..100644 --- a/view/ca/follow_notify_eml.tpl +++ b/view/ca/follow_notify_eml.tpl diff --git a/view/ca/friend_complete_eml.tpl b/view/ca/friend_complete_eml.tpl index 539d9ff3d..539d9ff3d 100755..100644 --- a/view/ca/friend_complete_eml.tpl +++ b/view/ca/friend_complete_eml.tpl diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl index 28446f3df..28446f3df 100755..100644 --- a/view/ca/htconfig.tpl +++ b/view/ca/htconfig.tpl diff --git a/view/ca/intro_complete_eml.tpl b/view/ca/intro_complete_eml.tpl index 70507d71d..70507d71d 100755..100644 --- a/view/ca/intro_complete_eml.tpl +++ b/view/ca/intro_complete_eml.tpl diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl index eccf2050a..eccf2050a 100755..100644 --- a/view/ca/lostpass_eml.tpl +++ b/view/ca/lostpass_eml.tpl diff --git a/view/ca/mail_received_html_body_eml.tpl b/view/ca/mail_received_html_body_eml.tpl index 64eee0bf1..64eee0bf1 100755..100644 --- a/view/ca/mail_received_html_body_eml.tpl +++ b/view/ca/mail_received_html_body_eml.tpl diff --git a/view/ca/mail_received_text_body_eml.tpl b/view/ca/mail_received_text_body_eml.tpl index b343c4e6d..b343c4e6d 100755..100644 --- a/view/ca/mail_received_text_body_eml.tpl +++ b/view/ca/mail_received_text_body_eml.tpl diff --git a/view/ca/messages.po b/view/ca/messages.po index 8463ceb12..8463ceb12 100755..100644 --- a/view/ca/messages.po +++ b/view/ca/messages.po diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl index 22e54b8c0..22e54b8c0 100755..100644 --- a/view/ca/passchanged_eml.tpl +++ b/view/ca/passchanged_eml.tpl diff --git a/view/ca/register_open_eml.tpl b/view/ca/register_open_eml.tpl index 0170c98e3..0170c98e3 100755..100644 --- a/view/ca/register_open_eml.tpl +++ b/view/ca/register_open_eml.tpl diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl index 3dd966e0a..3dd966e0a 100755..100644 --- a/view/ca/register_verify_eml.tpl +++ b/view/ca/register_verify_eml.tpl diff --git a/view/ca/request_notify_eml.tpl b/view/ca/request_notify_eml.tpl index 276624aae..276624aae 100755..100644 --- a/view/ca/request_notify_eml.tpl +++ b/view/ca/request_notify_eml.tpl diff --git a/view/ca/strings.php b/view/ca/strings.php index e5aed8be6..e5aed8be6 100755..100644 --- a/view/ca/strings.php +++ b/view/ca/strings.php diff --git a/view/ca/wall_received_eml.tpl b/view/ca/wall_received_eml.tpl index 0b5c150fd..0b5c150fd 100755..100644 --- a/view/ca/wall_received_eml.tpl +++ b/view/ca/wall_received_eml.tpl diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl index 061821beb..061821beb 100755..100644 --- a/view/categories_widget.tpl +++ b/view/categories_widget.tpl diff --git a/view/comment_item.tpl b/view/comment_item.tpl index a1d4e1043..a1d4e1043 100755..100644 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl diff --git a/view/common_friends.tpl b/view/common_friends.tpl index 1f610d8c4..1f610d8c4 100755..100644 --- a/view/common_friends.tpl +++ b/view/common_friends.tpl diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl index 146ad29fa..146ad29fa 100755..100644 --- a/view/common_tabs.tpl +++ b/view/common_tabs.tpl diff --git a/view/contact_head.tpl b/view/contact_head.tpl index a76293a68..a76293a68 100755..100644 --- a/view/contact_head.tpl +++ b/view/contact_head.tpl diff --git a/view/contact_template.tpl b/view/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/contact_template.tpl +++ b/view/contact_template.tpl diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl index ecb342bf4..ecb342bf4 100755..100644 --- a/view/contacts-template.tpl +++ b/view/contacts-template.tpl diff --git a/view/conversation.tpl b/view/conversation.tpl index 43bb1dd47..43bb1dd47 100755..100644 --- a/view/conversation.tpl +++ b/view/conversation.tpl diff --git a/view/crepair.tpl b/view/crepair.tpl index a3e532b61..a3e532b61 100755..100644 --- a/view/crepair.tpl +++ b/view/crepair.tpl diff --git a/view/cropbody.tpl b/view/cropbody.tpl index b484d15bf..b484d15bf 100755..100644 --- a/view/cropbody.tpl +++ b/view/cropbody.tpl diff --git a/view/crophead.tpl b/view/crophead.tpl index 48f375426..48f375426 100755..100644 --- a/view/crophead.tpl +++ b/view/crophead.tpl diff --git a/view/cs/cmnt_received_eml.tpl b/view/cs/cmnt_received_eml.tpl index ff4492322..ff4492322 100755..100644 --- a/view/cs/cmnt_received_eml.tpl +++ b/view/cs/cmnt_received_eml.tpl diff --git a/view/cs/cmnt_received_html_body_eml.tpl b/view/cs/cmnt_received_html_body_eml.tpl index 6b6318743..6b6318743 100755..100644 --- a/view/cs/cmnt_received_html_body_eml.tpl +++ b/view/cs/cmnt_received_html_body_eml.tpl diff --git a/view/cs/cmnt_received_text_body_eml.tpl b/view/cs/cmnt_received_text_body_eml.tpl index ff4492322..ff4492322 100755..100644 --- a/view/cs/cmnt_received_text_body_eml.tpl +++ b/view/cs/cmnt_received_text_body_eml.tpl diff --git a/view/cs/follow_notify_eml.tpl b/view/cs/follow_notify_eml.tpl index 440ba9ca4..440ba9ca4 100755..100644 --- a/view/cs/follow_notify_eml.tpl +++ b/view/cs/follow_notify_eml.tpl diff --git a/view/cs/friend_complete_eml.tpl b/view/cs/friend_complete_eml.tpl index 50bb7e105..50bb7e105 100755..100644 --- a/view/cs/friend_complete_eml.tpl +++ b/view/cs/friend_complete_eml.tpl diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl index 5d116dd99..5d116dd99 100755..100644 --- a/view/cs/htconfig.tpl +++ b/view/cs/htconfig.tpl diff --git a/view/cs/intro_complete_eml.tpl b/view/cs/intro_complete_eml.tpl index 91753f35d..91753f35d 100755..100644 --- a/view/cs/intro_complete_eml.tpl +++ b/view/cs/intro_complete_eml.tpl diff --git a/view/cs/lostpass_eml.tpl b/view/cs/lostpass_eml.tpl index 05042ddce..05042ddce 100755..100644 --- a/view/cs/lostpass_eml.tpl +++ b/view/cs/lostpass_eml.tpl diff --git a/view/cs/mail_received_html_body_eml.tpl b/view/cs/mail_received_html_body_eml.tpl index 427c6c98d..427c6c98d 100755..100644 --- a/view/cs/mail_received_html_body_eml.tpl +++ b/view/cs/mail_received_html_body_eml.tpl diff --git a/view/cs/mail_received_text_body_eml.tpl b/view/cs/mail_received_text_body_eml.tpl index c69872377..c69872377 100755..100644 --- a/view/cs/mail_received_text_body_eml.tpl +++ b/view/cs/mail_received_text_body_eml.tpl diff --git a/view/cs/messages.po b/view/cs/messages.po index 529504c5c..529504c5c 100755..100644 --- a/view/cs/messages.po +++ b/view/cs/messages.po diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl index 5447d2e80..5447d2e80 100755..100644 --- a/view/cs/passchanged_eml.tpl +++ b/view/cs/passchanged_eml.tpl diff --git a/view/cs/register_open_eml.tpl b/view/cs/register_open_eml.tpl index f8e42678b..f8e42678b 100755..100644 --- a/view/cs/register_open_eml.tpl +++ b/view/cs/register_open_eml.tpl diff --git a/view/cs/register_verify_eml.tpl b/view/cs/register_verify_eml.tpl index 4b34c6b6d..4b34c6b6d 100755..100644 --- a/view/cs/register_verify_eml.tpl +++ b/view/cs/register_verify_eml.tpl diff --git a/view/cs/request_notify_eml.tpl b/view/cs/request_notify_eml.tpl index 74010c79c..74010c79c 100755..100644 --- a/view/cs/request_notify_eml.tpl +++ b/view/cs/request_notify_eml.tpl diff --git a/view/cs/strings.php b/view/cs/strings.php index 0c7d0d7bd..0c7d0d7bd 100755..100644 --- a/view/cs/strings.php +++ b/view/cs/strings.php diff --git a/view/cs/wall_received_eml.tpl b/view/cs/wall_received_eml.tpl index 9fb27ddd8..9fb27ddd8 100755..100644 --- a/view/cs/wall_received_eml.tpl +++ b/view/cs/wall_received_eml.tpl diff --git a/view/cs/wall_received_html_body_eml.tpl b/view/cs/wall_received_html_body_eml.tpl index 893eec20c..893eec20c 100755..100644 --- a/view/cs/wall_received_html_body_eml.tpl +++ b/view/cs/wall_received_html_body_eml.tpl diff --git a/view/cs/wall_received_text_body_eml.tpl b/view/cs/wall_received_text_body_eml.tpl index 088f7f9db..088f7f9db 100755..100644 --- a/view/cs/wall_received_text_body_eml.tpl +++ b/view/cs/wall_received_text_body_eml.tpl diff --git a/view/custom_tinymce.css b/view/custom_tinymce.css index 7932653b6..7932653b6 100755..100644 --- a/view/custom_tinymce.css +++ b/view/custom_tinymce.css diff --git a/view/de/cmnt_received_eml.tpl b/view/de/cmnt_received_eml.tpl index 500c93eb4..500c93eb4 100755..100644 --- a/view/de/cmnt_received_eml.tpl +++ b/view/de/cmnt_received_eml.tpl diff --git a/view/de/cmnt_received_html_body_eml.tpl b/view/de/cmnt_received_html_body_eml.tpl index db7f829bc..db7f829bc 100755..100644 --- a/view/de/cmnt_received_html_body_eml.tpl +++ b/view/de/cmnt_received_html_body_eml.tpl diff --git a/view/de/cmnt_received_text_body_eml.tpl b/view/de/cmnt_received_text_body_eml.tpl index e00a868af..e00a868af 100755..100644 --- a/view/de/cmnt_received_text_body_eml.tpl +++ b/view/de/cmnt_received_text_body_eml.tpl diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl index d7259a240..d7259a240 100755..100644 --- a/view/de/follow_notify_eml.tpl +++ b/view/de/follow_notify_eml.tpl diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl index 908d0df40..908d0df40 100755..100644 --- a/view/de/friend_complete_eml.tpl +++ b/view/de/friend_complete_eml.tpl diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl index 76709ea75..76709ea75 100755..100644 --- a/view/de/htconfig.tpl +++ b/view/de/htconfig.tpl diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl index ff9b8a379..ff9b8a379 100755..100644 --- a/view/de/intro_complete_eml.tpl +++ b/view/de/intro_complete_eml.tpl diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl index 4c06d0c8d..4c06d0c8d 100755..100644 --- a/view/de/lostpass_eml.tpl +++ b/view/de/lostpass_eml.tpl diff --git a/view/de/mail_received_html_body_eml.tpl b/view/de/mail_received_html_body_eml.tpl index 34eea59da..34eea59da 100755..100644 --- a/view/de/mail_received_html_body_eml.tpl +++ b/view/de/mail_received_html_body_eml.tpl diff --git a/view/de/mail_received_text_body_eml.tpl b/view/de/mail_received_text_body_eml.tpl index f5c90cfed..f5c90cfed 100755..100644 --- a/view/de/mail_received_text_body_eml.tpl +++ b/view/de/mail_received_text_body_eml.tpl diff --git a/view/de/messages.po b/view/de/messages.po index 6aab0bf1b..1036e7b75 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-03-06 15:09-0800\n" -"PO-Revision-Date: 2012-03-07 20:47+0000\n" -"Last-Translator: greeneyedred <greeneyedred@googlemail.com>\n" +"POT-Creation-Date: 2012-04-05 10:00-0700\n" +"PO-Revision-Date: 2012-04-06 10:40+0000\n" +"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,23 +45,26 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865 +#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866 #: ../../mod/editpost.php:10 ../../mod/install.php:171 -#: ../../mod/notifications.php:62 ../../mod/contacts.php:125 -#: ../../mod/settings.php:49 ../../mod/settings.php:411 -#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6 -#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19 -#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36 -#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140 -#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137 -#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159 -#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:125 +#: ../../mod/settings.php:62 ../../mod/settings.php:473 +#: ../../mod/settings.php:478 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 +#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 +#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 +#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 +#: ../../mod/item.php:140 ../../mod/profile_photo.php:19 +#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 +#: ../../mod/profile_photo.php:163 ../../mod/message.php:38 +#: ../../mod/message.php:91 ../../mod/allfriends.php:9 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:133 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:229 ../../mod/delegate.php:6 +#: ../../mod/display.php:138 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:232 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332 -#: ../../include/items.php:3030 ../../index.php:288 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:456 +#: ../../include/items.php:3118 ../../index.php:294 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -90,8 +93,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, w msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" -#: ../../mod/crepair.php:148 ../../mod/settings.php:462 -#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493 +#: ../../mod/crepair.php:148 ../../mod/settings.php:531 +#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537 msgid "Name" msgstr "Name" @@ -128,38 +131,38 @@ msgid "New photo from this URL" msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958 -#: ../../mod/photos.php:1182 ../../mod/photos.php:1222 -#: ../../mod/photos.php:1262 ../../mod/photos.php:1293 +#: ../../mod/events.php:400 ../../mod/photos.php:901 ../../mod/photos.php:959 +#: ../../mod/photos.php:1194 ../../mod/photos.php:1234 +#: ../../mod/photos.php:1274 ../../mod/photos.php:1305 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:319 -#: ../../mod/settings.php:460 ../../mod/settings.php:603 -#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80 -#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609 -#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375 -#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411 -#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92 -#: ../../addon/nsfw/nsfw.php:57 +#: ../../mod/settings.php:529 ../../mod/settings.php:679 +#: ../../mod/settings.php:741 ../../mod/settings.php:926 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357 +#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826 +#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119 +#: ../../addon/facebook/facebook.php:547 ../../addon/yourls/yourls.php:76 +#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/uhremotestorage/uhremotestorage.php:89 -#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92 +#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 #: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94 -#: ../../addon/pageheader/pageheader.php:52 -#: ../../addon/statusnet/statusnet.php:273 -#: ../../addon/statusnet/statusnet.php:287 -#: ../../addon/statusnet/statusnet.php:313 -#: ../../addon/statusnet/statusnet.php:320 -#: ../../addon/statusnet/statusnet.php:345 -#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 +#: ../../addon/statusnet/statusnet.php:278 +#: ../../addon/statusnet/statusnet.php:292 +#: ../../addon/statusnet/statusnet.php:318 +#: ../../addon/statusnet/statusnet.php:325 +#: ../../addon/statusnet/statusnet.php:353 +#: ../../addon/statusnet/statusnet.php:547 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 -#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175 -#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355 +#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:369 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552 +#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555 msgid "Submit" msgstr "Senden" @@ -167,15 +170,15 @@ msgstr "Senden" msgid "Help:" msgstr "Hilfe:" -#: ../../mod/help.php:34 ../../include/nav.php:82 +#: ../../mod/help.php:34 ../../include/nav.php:86 msgid "Help" msgstr "Hilfe" -#: ../../mod/help.php:38 ../../index.php:221 +#: ../../mod/help.php:38 ../../index.php:225 msgid "Not Found" msgstr "Nicht gefunden" -#: ../../mod/help.php:41 ../../index.php:224 +#: ../../mod/help.php:41 ../../index.php:228 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -213,11 +216,15 @@ msgstr "l, F j" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:272 ../../include/text.php:982 +#: ../../mod/events.php:272 ../../include/text.php:1050 msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349 +#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:240 +#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52 +#: ../../boot.php:1421 msgid "Events" msgstr "Veranstaltungen" @@ -267,7 +274,7 @@ msgid "Description:" msgstr "Beschreibung" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:980 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1042 msgid "Location:" msgstr "Ort:" @@ -276,8 +283,8 @@ msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461 -#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:530 +#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -297,7 +304,7 @@ msgstr "Wähle ein Tag zum Entfernen aus: " msgid "Remove" msgstr "Entfernen" -#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517 +#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:520 #, php-format msgid "%s welcomes %s" msgstr "%s heißt %s herzlich willkommen" @@ -320,246 +327,258 @@ msgid "" " and/or create new posts for you?" msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676 -#: ../../mod/settings.php:692 ../../mod/settings.php:698 -#: ../../mod/settings.php:706 ../../mod/settings.php:710 -#: ../../mod/settings.php:715 ../../mod/settings.php:721 -#: ../../mod/settings.php:727 ../../mod/settings.php:787 -#: ../../mod/settings.php:788 ../../mod/settings.php:789 -#: ../../mod/settings.php:790 ../../mod/register.php:524 -#: ../../mod/profiles.php:357 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:695 +#: ../../mod/settings.php:841 ../../mod/settings.php:847 +#: ../../mod/settings.php:855 ../../mod/settings.php:859 +#: ../../mod/settings.php:864 ../../mod/settings.php:870 +#: ../../mod/settings.php:876 ../../mod/settings.php:882 +#: ../../mod/settings.php:916 ../../mod/settings.php:917 +#: ../../mod/settings.php:918 ../../mod/settings.php:919 +#: ../../mod/register.php:536 ../../mod/profiles.php:369 msgid "Yes" msgstr "Ja" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677 -#: ../../mod/settings.php:692 ../../mod/settings.php:698 -#: ../../mod/settings.php:706 ../../mod/settings.php:710 -#: ../../mod/settings.php:715 ../../mod/settings.php:721 -#: ../../mod/settings.php:727 ../../mod/settings.php:787 -#: ../../mod/settings.php:788 ../../mod/settings.php:789 -#: ../../mod/settings.php:790 ../../mod/register.php:525 -#: ../../mod/profiles.php:358 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:696 +#: ../../mod/settings.php:841 ../../mod/settings.php:847 +#: ../../mod/settings.php:855 ../../mod/settings.php:859 +#: ../../mod/settings.php:864 ../../mod/settings.php:870 +#: ../../mod/settings.php:876 ../../mod/settings.php:882 +#: ../../mod/settings.php:916 ../../mod/settings.php:917 +#: ../../mod/settings.php:918 ../../mod/settings.php:919 +#: ../../mod/register.php:537 ../../mod/profiles.php:370 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:42 +#: ../../mod/photos.php:43 msgid "Photo Albums" msgstr "Fotoalben" -#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879 -#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371 -#: ../../mod/photos.php:1383 ../../addon/communityhome/communityhome.php:110 +#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880 +#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383 +#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 +#: ../../view/theme/diabook-red/theme.php:110 +#: ../../view/theme/diabook-blue/theme.php:110 +#: ../../view/theme/diabook/theme.php:114 +#: ../../view/theme/diabook-aerith/theme.php:110 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413 +#: ../../mod/photos.php:58 ../../mod/photos.php:976 ../../mod/photos.php:1425 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" -#: ../../mod/photos.php:68 ../../mod/settings.php:11 +#: ../../mod/photos.php:69 ../../mod/settings.php:24 msgid "everybody" msgstr "jeder" -#: ../../mod/photos.php:139 +#: ../../mod/photos.php:140 msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" -#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950 -#: ../../mod/photos.php:965 ../../mod/register.php:327 -#: ../../mod/register.php:334 ../../mod/register.php:341 -#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 -#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170 -#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255 +#: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951 +#: ../../mod/photos.php:966 ../../mod/register.php:339 +#: ../../mod/register.php:346 ../../mod/register.php:353 +#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67 +#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 +#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 +#: ../../view/theme/diabook-red/theme.php:111 +#: ../../view/theme/diabook-blue/theme.php:111 +#: ../../view/theme/diabook/theme.php:115 +#: ../../view/theme/diabook-aerith/theme.php:111 msgid "Profile Photos" msgstr "Profilbilder" -#: ../../mod/photos.php:160 +#: ../../mod/photos.php:161 msgid "Album not found." msgstr "Album nicht gefunden." -#: ../../mod/photos.php:178 ../../mod/photos.php:959 +#: ../../mod/photos.php:179 ../../mod/photos.php:960 msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:241 ../../mod/photos.php:1183 +#: ../../mod/photos.php:242 ../../mod/photos.php:1195 msgid "Delete Photo" msgstr "Foto löschen" -#: ../../mod/photos.php:528 +#: ../../mod/photos.php:529 msgid "was tagged in a" msgstr "wurde getaggt in einem" -#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226 -#: ../../include/diaspora.php:1600 ../../include/conversation.php:53 +#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../view/theme/diabook-red/theme.php:82 +#: ../../view/theme/diabook-blue/theme.php:82 +#: ../../view/theme/diabook/theme.php:86 +#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1294 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "Foto" -#: ../../mod/photos.php:528 +#: ../../mod/photos.php:529 msgid "by" msgstr "von" -#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "Die Bildgröße übersteigt das Limit von " -#: ../../mod/photos.php:639 +#: ../../mod/photos.php:640 msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122 +#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124 #: ../../mod/wall_upload.php:65 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251 +#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257 #: ../../mod/wall_upload.php:84 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." -#: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33 +#: ../../mod/photos.php:760 ../../mod/community.php:16 +#: ../../mod/dfrn_request.php:626 ../../mod/viewcontacts.php:17 +#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." -#: ../../mod/photos.php:769 +#: ../../mod/photos.php:770 msgid "No photos selected" msgstr "Keine Bilder ausgewählt" -#: ../../mod/photos.php:846 +#: ../../mod/photos.php:847 msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: ../../mod/photos.php:907 +#: ../../mod/photos.php:908 msgid "Upload Photos" msgstr "Bilder hochladen" -#: ../../mod/photos.php:910 ../../mod/photos.php:954 +#: ../../mod/photos.php:911 ../../mod/photos.php:955 msgid "New album name: " msgstr "Name des neuen Albums: " -#: ../../mod/photos.php:911 +#: ../../mod/photos.php:912 msgid "or existing album name: " msgstr "oder existierender Albumname: " -#: ../../mod/photos.php:912 +#: ../../mod/photos.php:913 msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:914 ../../mod/photos.php:1178 +#: ../../mod/photos.php:915 ../../mod/photos.php:1190 msgid "Permissions" msgstr "Berechtigungen" -#: ../../mod/photos.php:969 +#: ../../mod/photos.php:970 msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:984 ../../mod/photos.php:1396 +#: ../../mod/photos.php:985 ../../mod/photos.php:1408 msgid "View Photo" msgstr "Fotos betrachten" -#: ../../mod/photos.php:1019 +#: ../../mod/photos.php:1020 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:1021 +#: ../../mod/photos.php:1022 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1072 msgid "View photo" msgstr "Fotos ansehen" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1072 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1072 +#: ../../mod/photos.php:1073 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1078 ../../include/conversation.php:482 +#: ../../mod/photos.php:1079 ../../include/conversation.php:480 msgid "Private Message" msgstr "Private Nachricht" -#: ../../mod/photos.php:1089 +#: ../../mod/photos.php:1101 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1157 +#: ../../mod/photos.php:1169 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1160 +#: ../../mod/photos.php:1172 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1171 +#: ../../mod/photos.php:1183 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1174 +#: ../../mod/photos.php:1186 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1176 +#: ../../mod/photos.php:1188 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1180 +#: ../../mod/photos.php:1192 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1200 ../../include/conversation.php:529 +#: ../../mod/photos.php:1212 ../../include/conversation.php:529 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1201 ../../include/conversation.php:530 +#: ../../mod/photos.php:1213 ../../include/conversation.php:530 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1202 ../../include/conversation.php:933 +#: ../../mod/photos.php:1214 ../../include/conversation.php:960 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1203 ../../mod/editpost.php:104 -#: ../../mod/message.php:155 ../../mod/message.php:296 -#: ../../include/conversation.php:348 ../../include/conversation.php:694 -#: ../../include/conversation.php:950 +#: ../../mod/photos.php:1215 ../../mod/editpost.php:104 +#: ../../mod/wallmessage.php:145 ../../mod/message.php:189 +#: ../../mod/message.php:358 ../../include/conversation.php:362 +#: ../../include/conversation.php:702 ../../include/conversation.php:979 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1219 ../../mod/photos.php:1259 -#: ../../mod/photos.php:1290 ../../include/conversation.php:549 +#: ../../mod/photos.php:1231 ../../mod/photos.php:1271 +#: ../../mod/photos.php:1302 ../../include/conversation.php:552 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1221 ../../mod/photos.php:1261 -#: ../../mod/photos.php:1292 ../../include/conversation.php:551 -#: ../../boot.php:447 +#: ../../mod/photos.php:1233 ../../mod/photos.php:1273 +#: ../../mod/photos.php:1304 ../../include/conversation.php:554 +#: ../../boot.php:494 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1223 ../../mod/editpost.php:123 -#: ../../include/conversation.php:553 ../../include/conversation.php:968 +#: ../../mod/photos.php:1235 ../../mod/editpost.php:125 +#: ../../include/conversation.php:556 ../../include/conversation.php:997 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1320 ../../mod/settings.php:520 -#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488 -#: ../../include/conversation.php:304 ../../include/conversation.php:573 +#: ../../mod/photos.php:1332 ../../mod/settings.php:593 +#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:532 +#: ../../include/conversation.php:318 ../../include/conversation.php:576 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1402 +#: ../../mod/photos.php:1414 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1411 +#: ../../mod/photos.php:1423 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -567,43 +586,47 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:30 ../../include/nav.php:97 +#: ../../mod/community.php:30 ../../addon/pages/pages.php:75 +#: ../../view/theme/diabook-red/theme.php:242 +#: ../../view/theme/diabook-blue/theme.php:242 +#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" -#: ../../mod/community.php:60 ../../mod/search.php:118 +#: ../../mod/community.php:61 ../../mod/search.php:115 msgid "No results." msgstr "Keine Ergebnisse." -#: ../../mod/friendica.php:43 +#: ../../mod/friendica.php:47 msgid "This is Friendica, version" msgstr "Dies ist Friendica, Version" -#: ../../mod/friendica.php:44 +#: ../../mod/friendica.php:48 msgid "running at web location" msgstr "die unter folgender Webadresse zu finden ist" -#: ../../mod/friendica.php:46 +#: ../../mod/friendica.php:50 msgid "" "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn " "more about the Friendica project." msgstr "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren." -#: ../../mod/friendica.php:48 +#: ../../mod/friendica.php:52 msgid "Bug reports and issues: please visit" msgstr "Probleme oder Fehler gefunden? Bitte besuche" -#: ../../mod/friendica.php:49 +#: ../../mod/friendica.php:53 msgid "" "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " "dot com" msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com" -#: ../../mod/friendica.php:54 -msgid "Installed plugins/addons/apps" +#: ../../mod/friendica.php:58 +msgid "Installed plugins/addons/apps:" msgstr "Installierte Plugins/Erweiterungen/Apps" -#: ../../mod/friendica.php:62 +#: ../../mod/friendica.php:71 msgid "No installed plugins/addons/apps" msgstr "Keine Plugins/Erweiterungen/Apps installiert" @@ -615,28 +638,30 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:80 ../../include/conversation.php:919 +#: ../../mod/editpost.php:80 ../../include/conversation.php:946 msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:95 ../../mod/settings.php:519 -#: ../../include/conversation.php:560 +#: ../../mod/editpost.php:95 ../../mod/settings.php:592 +#: ../../include/conversation.php:563 msgid "Edit" msgstr "Bearbeiten" -#: ../../mod/editpost.php:96 ../../mod/message.php:153 -#: ../../mod/message.php:294 ../../include/conversation.php:934 +#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 +#: ../../mod/message.php:187 ../../mod/message.php:356 +#: ../../include/conversation.php:961 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:97 ../../include/conversation.php:936 +#: ../../mod/editpost.php:97 ../../include/conversation.php:963 msgid "Attach file" msgstr "Datei anhängen" -#: ../../mod/editpost.php:98 ../../mod/message.php:154 -#: ../../mod/message.php:295 ../../include/conversation.php:938 +#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 +#: ../../mod/message.php:188 ../../mod/message.php:357 +#: ../../include/conversation.php:965 msgid "Insert web link" -msgstr "Weblink einfügen" +msgstr "eine Kontaktanfrage" #: ../../mod/editpost.php:99 msgid "Insert YouTube video" @@ -650,201 +675,212 @@ msgstr "Vorbis [.ogg] Video einfügen" msgid "Insert Vorbis [.ogg] audio" msgstr "Vorbis [.ogg] Audio einfügen" -#: ../../mod/editpost.php:102 ../../include/conversation.php:944 +#: ../../mod/editpost.php:102 ../../include/conversation.php:971 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:103 ../../include/conversation.php:946 +#: ../../mod/editpost.php:103 ../../include/conversation.php:973 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:105 ../../include/conversation.php:951 +#: ../../mod/editpost.php:105 ../../include/conversation.php:980 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:113 ../../include/conversation.php:960 +#: ../../mod/editpost.php:113 ../../include/conversation.php:989 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:114 ../../include/conversation.php:961 +#: ../../mod/editpost.php:114 ../../include/conversation.php:990 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:117 ../../include/conversation.php:949 +#: ../../mod/editpost.php:117 ../../include/conversation.php:976 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:118 ../../include/conversation.php:963 +#: ../../mod/editpost.php:119 ../../include/conversation.php:978 +msgid "Categories (comma-separated list)" +msgstr "Kategorien (mit Komma separierte Liste)" + +#: ../../mod/editpost.php:120 ../../include/conversation.php:992 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" -#: ../../mod/dfrn_request.php:92 +#: ../../mod/dfrn_request.php:93 msgid "This introduction has already been accepted." msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." -#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381 +#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:382 msgid "Profile location is not valid or does not contain profile information." msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung." -#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386 +#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:387 msgid "Warning: profile location has no identifiable owner name." msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388 +#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:389 msgid "Warning: profile location has no profile photo." msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391 +#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:392 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" msgstr[0] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden" msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden" -#: ../../mod/dfrn_request.php:167 +#: ../../mod/dfrn_request.php:168 msgid "Introduction complete." msgstr "Kontaktanfrage abgeschlossen." -#: ../../mod/dfrn_request.php:191 +#: ../../mod/dfrn_request.php:192 msgid "Unrecoverable protocol error." msgstr "Nicht behebbarer Protokollfehler." -#: ../../mod/dfrn_request.php:219 +#: ../../mod/dfrn_request.php:220 msgid "Profile unavailable." msgstr "Profil nicht verfügbar." -#: ../../mod/dfrn_request.php:244 +#: ../../mod/dfrn_request.php:245 #, php-format msgid "%s has received too many connection requests today." msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten." -#: ../../mod/dfrn_request.php:245 +#: ../../mod/dfrn_request.php:246 msgid "Spam protection measures have been invoked." msgstr "Maßnahmen zum Spamschutz wurden ergriffen." -#: ../../mod/dfrn_request.php:246 +#: ../../mod/dfrn_request.php:247 msgid "Friends are advised to please try again in 24 hours." msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen." -#: ../../mod/dfrn_request.php:306 +#: ../../mod/dfrn_request.php:307 msgid "Invalid locator" msgstr "Ungültiger Locator" -#: ../../mod/dfrn_request.php:326 +#: ../../mod/dfrn_request.php:327 msgid "Unable to resolve your name at the provided location." msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden." -#: ../../mod/dfrn_request.php:339 +#: ../../mod/dfrn_request.php:340 msgid "You have already introduced yourself here." msgstr "Du hast dich hier bereits vorgestellt." -#: ../../mod/dfrn_request.php:343 +#: ../../mod/dfrn_request.php:344 #, php-format msgid "Apparently you are already friends with %s." msgstr "Es scheint so, als ob du bereits mit %s befreundet bist." -#: ../../mod/dfrn_request.php:364 +#: ../../mod/dfrn_request.php:365 msgid "Invalid profile URL." msgstr "Ungültige Profil-URL." -#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20 +#: ../../mod/dfrn_request.php:371 ../../mod/follow.php:20 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:440 ../../mod/contacts.php:102 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." -#: ../../mod/dfrn_request.php:460 +#: ../../mod/dfrn_request.php:461 msgid "Your introduction has been sent." msgstr "Deine Kontaktanfrage wurde gesendet." -#: ../../mod/dfrn_request.php:513 +#: ../../mod/dfrn_request.php:514 msgid "Please login to confirm introduction." msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen." -#: ../../mod/dfrn_request.php:527 +#: ../../mod/dfrn_request.php:528 msgid "" "Incorrect identity currently logged in. Please login to " "<strong>this</strong> profile." msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an." -#: ../../mod/dfrn_request.php:539 +#: ../../mod/dfrn_request.php:540 #, php-format msgid "Welcome home %s." msgstr "Willkommen zurück %s." -#: ../../mod/dfrn_request.php:540 +#: ../../mod/dfrn_request.php:541 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "Bitte bestätige deine Kontaktanfrage bei %s." -#: ../../mod/dfrn_request.php:541 +#: ../../mod/dfrn_request.php:542 msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566 +#: ../../mod/dfrn_request.php:583 ../../include/items.php:2649 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" -#: ../../mod/dfrn_request.php:666 -#, php-format -msgid "" -"Diaspora members: Please do not use this form. Instead, enter \"%s\" into " -"your Diaspora search bar." -msgstr "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein." - -#: ../../mod/dfrn_request.php:669 +#: ../../mod/dfrn_request.php:670 msgid "" "Please enter your 'Identity Address' from one of the following supported " -"social networks:" +"communications networks:" msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:" -#: ../../mod/dfrn_request.php:672 +#: ../../mod/dfrn_request.php:686 +msgid "<strike>Connect as an email follower</strike> (Coming soon)" +msgstr "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)" + +#: ../../mod/dfrn_request.php:688 +msgid "" +"If you are not yet a member of the free social web, <a " +"href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public" +" Friendica site and join us today</a>." +msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten." + +#: ../../mod/dfrn_request.php:691 msgid "Friend/Connection Request" msgstr "Freundschafts-/Kontaktanfrage" -#: ../../mod/dfrn_request.php:673 +#: ../../mod/dfrn_request.php:692 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" -#: ../../mod/dfrn_request.php:674 +#: ../../mod/dfrn_request.php:693 msgid "Please answer the following:" msgstr "Bitte beantworte Folgendes:" -#: ../../mod/dfrn_request.php:675 +#: ../../mod/dfrn_request.php:694 #, php-format msgid "Does %s know you?" msgstr "Kennt %s dich?" -#: ../../mod/dfrn_request.php:678 +#: ../../mod/dfrn_request.php:697 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:699 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: ../../mod/dfrn_request.php:681 +#: ../../mod/dfrn_request.php:700 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555 +#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:629 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" -#: ../../mod/dfrn_request.php:683 -msgid "- please share from your own site as noted above" -msgstr "- bitte fange von Deiner eigenen Seite aus zu teilen an" +#: ../../mod/dfrn_request.php:702 +#, php-format +msgid "" +" - please do not use this form. Instead, enter %s into your Diaspora search" +" bar." +msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste." -#: ../../mod/dfrn_request.php:684 +#: ../../mod/dfrn_request.php:703 msgid "Your Identity Address:" msgstr "Adresse deines Profils:" -#: ../../mod/dfrn_request.php:685 +#: ../../mod/dfrn_request.php:706 msgid "Submit Request" msgstr "Anfrage abschicken" @@ -985,8 +1021,8 @@ msgid "This is required for message delivery to work." msgstr "Dies wird für die Auslieferung von Nachrichten benötigt." #: ../../mod/install.php:343 -msgid "PHP \"register_argc_argv\"" -msgstr "PHP \"register_argc_argv\"" +msgid "PHP register_argc_argv" +msgstr "PHP register_argc_argv" #: ../../mod/install.php:364 msgid "" @@ -1140,7 +1176,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:930 +#: ../../include/contact_widgets.php:9 ../../boot.php:986 msgid "Connect" msgstr "Verbinden" @@ -1165,184 +1201,187 @@ msgstr "Willkommen zu %s" msgid "Invalid request identifier." msgstr "Invalid request identifier." -#: ../../mod/notifications.php:35 ../../mod/notifications.php:157 -#: ../../mod/notifications.php:203 +#: ../../mod/notifications.php:35 ../../mod/notifications.php:161 +#: ../../mod/notifications.php:207 msgid "Discard" msgstr "Verwerfen" -#: ../../mod/notifications.php:47 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:202 ../../mod/contacts.php:302 +#: ../../mod/notifications.php:51 ../../mod/notifications.php:160 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:302 #: ../../mod/contacts.php:345 msgid "Ignore" msgstr "Ignorieren" -#: ../../mod/notifications.php:71 +#: ../../mod/notifications.php:75 msgid "System" msgstr "System" -#: ../../mod/notifications.php:76 ../../include/nav.php:109 +#: ../../mod/notifications.php:80 ../../include/nav.php:113 msgid "Network" msgstr "Netzwerk" -#: ../../mod/notifications.php:81 ../../mod/network.php:177 +#: ../../mod/notifications.php:85 ../../mod/network.php:182 msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:86 ../../include/nav.php:73 -#: ../../include/nav.php:111 +#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:236 +#: ../../view/theme/diabook-blue/theme.php:236 +#: ../../view/theme/diabook/theme.php:244 +#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:77 +#: ../../include/nav.php:115 msgid "Home" msgstr "Pinnwand" -#: ../../mod/notifications.php:91 ../../include/nav.php:117 +#: ../../mod/notifications.php:95 ../../include/nav.php:121 msgid "Introductions" msgstr "Kontaktanfragen" -#: ../../mod/notifications.php:96 ../../mod/message.php:76 -#: ../../include/nav.php:124 +#: ../../mod/notifications.php:100 ../../mod/message.php:103 +#: ../../include/nav.php:128 msgid "Messages" msgstr "Nachrichten" -#: ../../mod/notifications.php:115 +#: ../../mod/notifications.php:119 msgid "Show Ignored Requests" msgstr "Zeige ignorierte Anfragen" -#: ../../mod/notifications.php:115 +#: ../../mod/notifications.php:119 msgid "Hide Ignored Requests" msgstr "Verberge ignorierte Anfragen" -#: ../../mod/notifications.php:141 ../../mod/notifications.php:187 +#: ../../mod/notifications.php:145 ../../mod/notifications.php:191 msgid "Notification type: " msgstr "Benachrichtigungstyp: " -#: ../../mod/notifications.php:142 +#: ../../mod/notifications.php:146 msgid "Friend Suggestion" msgstr "Kontaktvorschlag" -#: ../../mod/notifications.php:144 +#: ../../mod/notifications.php:148 #, php-format msgid "suggested by %s" msgstr "vorgeschlagen von %s" -#: ../../mod/notifications.php:149 ../../mod/notifications.php:196 +#: ../../mod/notifications.php:153 ../../mod/notifications.php:200 #: ../../mod/contacts.php:350 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" -#: ../../mod/notifications.php:150 ../../mod/notifications.php:197 +#: ../../mod/notifications.php:154 ../../mod/notifications.php:201 msgid "Post a new friend activity" msgstr "Neue-Kontakt Nachricht senden" -#: ../../mod/notifications.php:150 ../../mod/notifications.php:197 +#: ../../mod/notifications.php:154 ../../mod/notifications.php:201 msgid "if applicable" msgstr "falls anwendbar" -#: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/admin.php:486 +#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 +#: ../../mod/admin.php:530 msgid "Approve" msgstr "Genehmigen" -#: ../../mod/notifications.php:173 +#: ../../mod/notifications.php:177 msgid "Claims to be known to you: " msgstr "Behauptet dich zu kennen: " -#: ../../mod/notifications.php:173 +#: ../../mod/notifications.php:177 msgid "yes" msgstr "ja" -#: ../../mod/notifications.php:173 +#: ../../mod/notifications.php:177 msgid "no" msgstr "nein" -#: ../../mod/notifications.php:180 +#: ../../mod/notifications.php:184 msgid "Approve as: " msgstr "Genehmigen als: " -#: ../../mod/notifications.php:181 +#: ../../mod/notifications.php:185 msgid "Friend" msgstr "Freund" -#: ../../mod/notifications.php:182 +#: ../../mod/notifications.php:186 msgid "Sharer" msgstr "Teilenden" -#: ../../mod/notifications.php:182 +#: ../../mod/notifications.php:186 msgid "Fan/Admirer" msgstr "Fan/Verehrer" -#: ../../mod/notifications.php:188 +#: ../../mod/notifications.php:192 msgid "Friend/Connect Request" msgstr "Kontakt-/Freundschaftsanfrage" -#: ../../mod/notifications.php:188 +#: ../../mod/notifications.php:192 msgid "New Follower" msgstr "Neuer Bewunderer" -#: ../../mod/notifications.php:209 +#: ../../mod/notifications.php:213 msgid "No introductions." msgstr "Keine Kontaktanfragen." -#: ../../mod/notifications.php:212 ../../include/nav.php:118 +#: ../../mod/notifications.php:216 ../../include/nav.php:122 msgid "Notifications" msgstr "Benachrichtigungen" -#: ../../mod/notifications.php:249 ../../mod/notifications.php:374 -#: ../../mod/notifications.php:461 +#: ../../mod/notifications.php:253 ../../mod/notifications.php:378 +#: ../../mod/notifications.php:465 #, php-format msgid "%s liked %s's post" msgstr "%s mag %ss Beitrag" -#: ../../mod/notifications.php:258 ../../mod/notifications.php:383 -#: ../../mod/notifications.php:470 +#: ../../mod/notifications.php:262 ../../mod/notifications.php:387 +#: ../../mod/notifications.php:474 #, php-format msgid "%s disliked %s's post" msgstr "%s mag %ss Beitrag nicht" -#: ../../mod/notifications.php:272 ../../mod/notifications.php:397 -#: ../../mod/notifications.php:484 +#: ../../mod/notifications.php:276 ../../mod/notifications.php:401 +#: ../../mod/notifications.php:488 #, php-format msgid "%s is now friends with %s" msgstr "%s ist jetzt mit %s befreundet" -#: ../../mod/notifications.php:279 ../../mod/notifications.php:404 +#: ../../mod/notifications.php:283 ../../mod/notifications.php:408 #, php-format msgid "%s created a new post" msgstr "%s hat einen neuen Beitrag erstellt" -#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 -#: ../../mod/notifications.php:493 +#: ../../mod/notifications.php:284 ../../mod/notifications.php:409 +#: ../../mod/notifications.php:497 #, php-format msgid "%s commented on %s's post" msgstr "%s hat %ss Beitrag kommentiert" -#: ../../mod/notifications.php:294 +#: ../../mod/notifications.php:298 msgid "No more network notifications." msgstr "Keine weiteren Netzwerk-Benachrichtigungen." -#: ../../mod/notifications.php:298 +#: ../../mod/notifications.php:302 msgid "Network Notifications" msgstr "Netzwerk Benachrichtigungen" -#: ../../mod/notifications.php:324 ../../mod/notify.php:61 +#: ../../mod/notifications.php:328 ../../mod/notify.php:61 msgid "No more system notifications." msgstr "Keine weiteren System Benachrichtigungen." -#: ../../mod/notifications.php:328 ../../mod/notify.php:65 +#: ../../mod/notifications.php:332 ../../mod/notify.php:65 msgid "System Notifications" msgstr "System Benachrichtigungen" -#: ../../mod/notifications.php:419 +#: ../../mod/notifications.php:423 msgid "No more personal notifications." msgstr "Keine weiteren persönlichen Benachrichtigungen" -#: ../../mod/notifications.php:423 +#: ../../mod/notifications.php:427 msgid "Personal Notifications" msgstr "Persönliche Benachrichtigungen" -#: ../../mod/notifications.php:500 +#: ../../mod/notifications.php:504 msgid "No more home notifications." msgstr "Keine weiteren Pinnwand-Benachrichtigungen" -#: ../../mod/notifications.php:504 +#: ../../mod/notifications.php:508 msgid "Home Notifications" msgstr "Pinnwand Benachrichtigungen" @@ -1434,12 +1473,12 @@ msgid "View all contacts" msgstr "Alle Kontakte anzeigen" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:534 msgid "Unblock" msgstr "Entsperren" #: ../../mod/contacts.php:297 ../../mod/contacts.php:344 -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:533 msgid "Block" msgstr "Sperren" @@ -1474,8 +1513,8 @@ msgstr "Kontakt Informationen / Notizen" msgid "Edit contact notes" msgstr "Notizen zum Kontakt bearbiten" -#: ../../mod/contacts.php:328 ../../mod/contacts.php:497 -#: ../../mod/viewcontacts.php:60 +#: ../../mod/contacts.php:328 ../../mod/contacts.php:501 +#: ../../mod/viewcontacts.php:62 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" @@ -1508,7 +1547,7 @@ msgstr "letzte Aktualisierung:" msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:341 ../../mod/admin.php:905 +#: ../../mod/contacts.php:341 ../../mod/admin.php:955 msgid "Update now" msgstr "Jetzt aktualisieren" @@ -1525,57 +1564,64 @@ msgid "" "Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein" -#: ../../mod/contacts.php:399 ../../mod/group.php:179 +#: ../../mod/contacts.php:399 +msgid "Suggestions" +msgstr "Kontaktvorschläge" + +#: ../../mod/contacts.php:404 ../../mod/group.php:191 msgid "All Contacts" msgstr "Alle Kontakte" -#: ../../mod/contacts.php:404 +#: ../../mod/contacts.php:409 msgid "Unblocked Contacts" msgstr "Nicht blockierte Kontakte" -#: ../../mod/contacts.php:410 +#: ../../mod/contacts.php:415 msgid "Blocked Contacts" msgstr "Blockierte Kontakte" -#: ../../mod/contacts.php:416 +#: ../../mod/contacts.php:421 msgid "Ignored Contacts" msgstr "Ignorierte Kontakte" -#: ../../mod/contacts.php:422 +#: ../../mod/contacts.php:427 msgid "Hidden Contacts" msgstr "Verborgene Kontakte" -#: ../../mod/contacts.php:473 +#: ../../mod/contacts.php:477 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:481 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: ../../mod/contacts.php:481 +#: ../../mod/contacts.php:485 msgid "you are a fan of" msgstr "du bist Fan von" -#: ../../mod/contacts.php:498 ../../include/Contact.php:135 -#: ../../include/conversation.php:792 +#: ../../mod/contacts.php:502 ../../include/Contact.php:141 +#: ../../include/conversation.php:817 msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:519 ../../include/nav.php:132 +#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:238 +#: ../../view/theme/diabook-blue/theme.php:238 +#: ../../view/theme/diabook/theme.php:246 +#: ../../view/theme/diabook-aerith/theme.php:238 ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" -#: ../../mod/contacts.php:523 +#: ../../mod/contacts.php:527 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: ../../mod/contacts.php:524 ../../mod/directory.php:67 +#: ../../mod/contacts.php:528 ../../mod/directory.php:57 msgid "Finding: " msgstr "Funde: " -#: ../../mod/contacts.php:525 ../../mod/directory.php:69 -#: ../../include/contact_widgets.php:34 +#: ../../mod/contacts.php:529 ../../mod/directory.php:59 +#: ../../include/contact_widgets.php:32 msgid "Find" msgstr "Finde" @@ -1583,511 +1629,558 @@ msgstr "Finde" msgid "No valid account found." msgstr "Kein gültiger Account gefunden." -#: ../../mod/lostpass.php:31 +#: ../../mod/lostpass.php:32 msgid "Password reset request issued. Check your email." msgstr "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail." -#: ../../mod/lostpass.php:42 +#: ../../mod/lostpass.php:43 #, php-format msgid "Password reset requested at %s" msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" -#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 -#: ../../mod/register.php:380 ../../mod/register.php:434 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726 -#: ../../include/items.php:2575 +#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 +#: ../../mod/register.php:392 ../../mod/register.php:446 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 +#: ../../addon/facebook/facebook.php:617 +#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658 msgid "Administrator" msgstr "Administrator" -#: ../../mod/lostpass.php:64 +#: ../../mod/lostpass.php:65 msgid "" "Request could not be verified. (You may have previously submitted it.) " "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:82 ../../boot.php:723 +#: ../../mod/lostpass.php:83 ../../boot.php:779 msgid "Password Reset" msgstr "Passwort zurücksetzen" -#: ../../mod/lostpass.php:83 +#: ../../mod/lostpass.php:84 msgid "Your password has been reset as requested." msgstr "Dein Passwort wurde wie gewünscht zurückgesetzt." -#: ../../mod/lostpass.php:84 +#: ../../mod/lostpass.php:85 msgid "Your new password is" msgstr "Dein neues Passwort lautet" -#: ../../mod/lostpass.php:85 +#: ../../mod/lostpass.php:86 msgid "Save or copy your new password - and then" msgstr "Speichere oder kopiere dein neues Passwort - und dann" -#: ../../mod/lostpass.php:86 +#: ../../mod/lostpass.php:87 msgid "click here to login" msgstr "hier klicken, um dich anzumelden" -#: ../../mod/lostpass.php:87 +#: ../../mod/lostpass.php:88 msgid "" "Your password may be changed from the <em>Settings</em> page after " "successful login." msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast." -#: ../../mod/lostpass.php:118 +#: ../../mod/lostpass.php:119 msgid "Forgot your Password?" msgstr "Hast du dein Passwort vergessen?" -#: ../../mod/lostpass.php:119 +#: ../../mod/lostpass.php:120 msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet." -#: ../../mod/lostpass.php:120 +#: ../../mod/lostpass.php:121 msgid "Nickname or Email: " msgstr "Spitzname oder Email:" -#: ../../mod/lostpass.php:121 +#: ../../mod/lostpass.php:122 msgid "Reset" msgstr "Zurücksetzen" -#: ../../mod/settings.php:72 +#: ../../mod/settings.php:89 msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75 +#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75 msgid "Update" msgstr "Aktualisierungen" -#: ../../mod/settings.php:175 +#: ../../mod/settings.php:197 msgid "Failed to connect with email account using the settings provided." msgstr "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen." -#: ../../mod/settings.php:180 +#: ../../mod/settings.php:202 msgid "Email settings updated." msgstr "EMail Einstellungen bearbeitet." -#: ../../mod/settings.php:198 +#: ../../mod/settings.php:261 msgid "Passwords do not match. Password unchanged." msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." -#: ../../mod/settings.php:203 +#: ../../mod/settings.php:266 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert." -#: ../../mod/settings.php:214 +#: ../../mod/settings.php:277 msgid "Password changed." msgstr "Passwort ändern." -#: ../../mod/settings.php:216 +#: ../../mod/settings.php:279 msgid "Password update failed. Please try again." msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." -#: ../../mod/settings.php:280 +#: ../../mod/settings.php:340 msgid " Please use a shorter name." msgstr " Bitte verwende einen kürzeren Namen." -#: ../../mod/settings.php:282 +#: ../../mod/settings.php:342 msgid " Name too short." msgstr " Name ist zu kurz." -#: ../../mod/settings.php:288 +#: ../../mod/settings.php:348 msgid " Not valid email." msgstr " Keine gültige E-Mail." -#: ../../mod/settings.php:290 +#: ../../mod/settings.php:350 msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321 +#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445 #: ../../addon/impressum/impressum.php:64 #: ../../addon/openstreetmap/openstreetmap.php:80 -#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350 +#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:364 msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:422 ../../include/nav.php:130 +#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284 +#: ../../view/theme/diabook-blue/theme.php:283 +#: ../../view/theme/diabook/theme.php:293 +#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137 msgid "Account settings" msgstr "Account Einstellungen" -#: ../../mod/settings.php:427 +#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289 +#: ../../view/theme/diabook-blue/theme.php:288 +#: ../../view/theme/diabook/theme.php:298 +#: ../../view/theme/diabook-aerith/theme.php:288 +msgid "Display settings" +msgstr "Anzeige Einstellungen" + +#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298 +#: ../../view/theme/diabook-blue/theme.php:297 +#: ../../view/theme/diabook/theme.php:307 +#: ../../view/theme/diabook-aerith/theme.php:297 msgid "Connector settings" msgstr "Connector-Einstellungen" -#: ../../mod/settings.php:432 +#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303 +#: ../../view/theme/diabook-blue/theme.php:302 +#: ../../view/theme/diabook/theme.php:312 +#: ../../view/theme/diabook-aerith/theme.php:302 msgid "Plugin settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:437 +#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308 +#: ../../view/theme/diabook-blue/theme.php:307 +#: ../../view/theme/diabook/theme.php:317 +#: ../../view/theme/diabook-aerith/theme.php:307 msgid "Connections" msgstr "Verbindungen" -#: ../../mod/settings.php:442 +#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313 +#: ../../view/theme/diabook-blue/theme.php:312 +#: ../../view/theme/diabook/theme.php:322 +#: ../../view/theme/diabook-aerith/theme.php:312 msgid "Export personal data" msgstr "Persönliche Daten exportieren" -#: ../../mod/settings.php:459 ../../mod/settings.php:485 -#: ../../mod/settings.php:518 +#: ../../mod/settings.php:528 ../../mod/settings.php:555 +#: ../../mod/settings.php:591 msgid "Add application" msgstr "Programm hinzufügen" -#: ../../mod/settings.php:463 ../../mod/settings.php:489 -#: ../../addon/statusnet/statusnet.php:526 +#: ../../mod/settings.php:532 ../../mod/settings.php:559 +#: ../../addon/statusnet/statusnet.php:541 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:464 ../../mod/settings.php:490 -#: ../../addon/statusnet/statusnet.php:525 +#: ../../mod/settings.php:533 ../../mod/settings.php:560 +#: ../../addon/statusnet/statusnet.php:540 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:465 ../../mod/settings.php:491 +#: ../../mod/settings.php:534 ../../mod/settings.php:561 msgid "Redirect" msgstr "Umleiten" -#: ../../mod/settings.php:466 ../../mod/settings.php:492 +#: ../../mod/settings.php:535 ../../mod/settings.php:562 msgid "Icon url" msgstr "Icon URL" -#: ../../mod/settings.php:477 +#: ../../mod/settings.php:546 msgid "You can't edit this application." msgstr "Du kannst dieses Programm nicht bearbeiten." -#: ../../mod/settings.php:517 +#: ../../mod/settings.php:590 msgid "Connected Apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:521 +#: ../../mod/settings.php:594 msgid "Client key starts with" msgstr "Anwender Schlüssel beginnt mit" -#: ../../mod/settings.php:522 +#: ../../mod/settings.php:595 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:523 +#: ../../mod/settings.php:596 msgid "Remove authorization" msgstr "Autorisierung entziehen" -#: ../../mod/settings.php:535 +#: ../../mod/settings.php:608 msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122 +#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:555 ../../mod/settings.php:556 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:556 +#: ../../mod/settings.php:630 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:584 +#: ../../mod/settings.php:660 msgid "Connector Settings" msgstr "Verbindungs-Einstellungen" -#: ../../mod/settings.php:590 +#: ../../mod/settings.php:666 msgid "Email/Mailbox Setup" msgstr "E-Mail/Postfach-Einstellungen" -#: ../../mod/settings.php:591 +#: ../../mod/settings.php:667 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an." -#: ../../mod/settings.php:592 +#: ../../mod/settings.php:668 msgid "Last successful email check:" msgstr "Letzter erfolgreicher Email Check" -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:669 msgid "Email access is disabled on this site." msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." -#: ../../mod/settings.php:594 +#: ../../mod/settings.php:670 msgid "IMAP server name:" msgstr "IMAP-Server-Name:" -#: ../../mod/settings.php:595 +#: ../../mod/settings.php:671 msgid "IMAP port:" msgstr "IMAP-Port:" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:672 msgid "Security:" msgstr "Sicherheit:" -#: ../../mod/settings.php:596 ../../mod/settings.php:601 +#: ../../mod/settings.php:672 ../../mod/settings.php:677 msgid "None" msgstr "Keine" -#: ../../mod/settings.php:597 +#: ../../mod/settings.php:673 msgid "Email login name:" msgstr "E-Mail-Login-Name:" -#: ../../mod/settings.php:598 +#: ../../mod/settings.php:674 msgid "Email password:" msgstr "E-Mail-Passwort:" -#: ../../mod/settings.php:599 +#: ../../mod/settings.php:675 msgid "Reply-to address:" msgstr "Reply-to Adresse:" -#: ../../mod/settings.php:600 +#: ../../mod/settings.php:676 msgid "Send public posts to all email contacts:" msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:677 msgid "Action after import:" msgstr "Aktion nach Import:" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:677 msgid "Mark as seen" msgstr "Als gelesen markieren" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:677 msgid "Move to folder" msgstr "In einen Ordner verschieben" -#: ../../mod/settings.php:602 +#: ../../mod/settings.php:678 msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462 +#: ../../mod/settings.php:739 +msgid "Display Settings" +msgstr "Anzeige Einstellungen" + +#: ../../mod/settings.php:745 +msgid "Display Theme:" +msgstr "Theme:" + +#: ../../mod/settings.php:746 +msgid "Update browser every xx seconds" +msgstr "Browser alle xx Sekunden aktualisieren" + +#: ../../mod/settings.php:746 +msgid "Minimum of 10 seconds, no maximum" +msgstr "Minimal 10 Sekunden, kein Maximum" + +#: ../../mod/settings.php:747 +msgid "Number of items to display on the network page:" +msgstr "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: " + +#: ../../mod/settings.php:747 +msgid "Maximum of 100 items" +msgstr "Maximal 100 Beiträge" + +#: ../../mod/settings.php:748 +msgid "Don't show emoticons" +msgstr "Keine Smilies anzeigen" + +#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:506 msgid "Normal Account" msgstr "Normaler Account" -#: ../../mod/settings.php:660 +#: ../../mod/settings.php:809 msgid "This account is a normal personal profile" msgstr "Dieser Account ist ein normales persönliches Profil" -#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463 +#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507 msgid "Soapbox Account" msgstr "Sandkasten-Account" -#: ../../mod/settings.php:664 +#: ../../mod/settings.php:813 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464 +#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508 msgid "Community/Celebrity Account" msgstr "Gemeinschafts/Promi-Account" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:817 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465 +#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509 msgid "Automatic Friend Account" msgstr "Automatischer Freundesaccount" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:821 msgid "Automatically approve all connection/friend requests as friends" msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:831 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:831 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID." -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:841 msgid "Publish your default profile in your local site directory?" msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?" -#: ../../mod/settings.php:698 +#: ../../mod/settings.php:847 msgid "Publish your default profile in the global social directory?" msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?" -#: ../../mod/settings.php:706 +#: ../../mod/settings.php:855 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" -#: ../../mod/settings.php:710 +#: ../../mod/settings.php:859 msgid "Hide your profile details from unknown viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:864 msgid "Allow friends to post to your profile page?" msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?" -#: ../../mod/settings.php:721 +#: ../../mod/settings.php:870 msgid "Allow friends to tag your posts?" msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?" -#: ../../mod/settings.php:727 +#: ../../mod/settings.php:876 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:882 +msgid "Permit unknown people to send you private mail?" +msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?" + +#: ../../mod/settings.php:891 msgid "Profile is <strong>not published</strong>." msgstr "Profil ist <strong>nicht veröffentlicht</strong>." -#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206 +#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211 msgid "or" msgstr "oder" -#: ../../mod/settings.php:773 +#: ../../mod/settings.php:902 msgid "Your Identity Address is" msgstr "Die Adresse deines Profils lautet:" -#: ../../mod/settings.php:784 +#: ../../mod/settings.php:913 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen" -#: ../../mod/settings.php:784 +#: ../../mod/settings.php:913 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." -#: ../../mod/settings.php:785 +#: ../../mod/settings.php:914 msgid "Advanced expiration settings" msgstr "Erweiterte Verfallseinstellungen" -#: ../../mod/settings.php:786 +#: ../../mod/settings.php:915 msgid "Advanced Expiration" msgstr "Erweitertes Verfallen" -#: ../../mod/settings.php:787 +#: ../../mod/settings.php:916 msgid "Expire posts:" msgstr "Beiträge verfallen lassen:" -#: ../../mod/settings.php:788 +#: ../../mod/settings.php:917 msgid "Expire personal notes:" msgstr "Persönliche Notizen verfallen lassen:" -#: ../../mod/settings.php:789 +#: ../../mod/settings.php:918 msgid "Expire starred posts:" msgstr "Markierte Beiträge verfallen lassen:" -#: ../../mod/settings.php:790 +#: ../../mod/settings.php:919 msgid "Expire photos:" msgstr "Fotos verfallen lassen:" -#: ../../mod/settings.php:795 +#: ../../mod/settings.php:924 msgid "Account Settings" msgstr "Account-Einstellungen" -#: ../../mod/settings.php:803 +#: ../../mod/settings.php:933 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: ../../mod/settings.php:804 +#: ../../mod/settings.php:934 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:935 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:935 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: ../../mod/settings.php:809 +#: ../../mod/settings.php:939 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Kompletter Name:" -#: ../../mod/settings.php:811 +#: ../../mod/settings.php:941 msgid "Email Address:" msgstr "Emailadresse:" -#: ../../mod/settings.php:812 +#: ../../mod/settings.php:942 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:943 msgid "Default Post Location:" msgstr "Standardstandort:" -#: ../../mod/settings.php:814 +#: ../../mod/settings.php:944 msgid "Use Browser Location:" msgstr "Verwende den Standort des Browsers:" -#: ../../mod/settings.php:815 -msgid "Display Theme:" -msgstr "Theme:" - -#: ../../mod/settings.php:816 -msgid "Update browser every xx seconds" -msgstr "Browser alle xx Sekunden aktualisieren" - -#: ../../mod/settings.php:816 -msgid "Minimum of 10 seconds, no maximum" -msgstr "Minimal 10 Sekunden, kein Maximum" - -#: ../../mod/settings.php:818 +#: ../../mod/settings.php:947 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: ../../mod/settings.php:820 +#: ../../mod/settings.php:949 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:" -#: ../../mod/settings.php:820 +#: ../../mod/settings.php:949 ../../mod/settings.php:964 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: ../../mod/settings.php:821 +#: ../../mod/settings.php:950 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: ../../mod/settings.php:822 +#: ../../mod/settings.php:951 msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: ../../mod/settings.php:837 +#: ../../mod/settings.php:964 +msgid "Maximum private messages per day from unknown people:" +msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:" + +#: ../../mod/settings.php:967 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: ../../mod/settings.php:838 +#: ../../mod/settings.php:968 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden wenn:" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:969 msgid "You receive an introduction" msgstr "- du eine Kontaktanfrage erhältst" -#: ../../mod/settings.php:840 +#: ../../mod/settings.php:970 msgid "Your introductions are confirmed" msgstr "- eine deiner Kontaktanfragen akzeptiert wurde" -#: ../../mod/settings.php:841 +#: ../../mod/settings.php:971 msgid "Someone writes on your profile wall" msgstr "- jemand etwas auf deine Pinnwand schreibt" -#: ../../mod/settings.php:842 +#: ../../mod/settings.php:972 msgid "Someone writes a followup comment" msgstr "- jemand auch einen Kommentar verfasst" -#: ../../mod/settings.php:843 +#: ../../mod/settings.php:973 msgid "You receive a private message" msgstr "- du eine private Nachricht erhältst" -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:974 msgid "You receive a friend suggestion" msgstr "- du eine Empfehlung erhältst" -#: ../../mod/settings.php:845 +#: ../../mod/settings.php:975 msgid "You are tagged in a post" -msgstr "- du in einem Beitrag erwähnt wurdest" +msgstr "Du wurdest in einem Beitrag erwähnt." -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:978 msgid "Advanced Page Settings" msgstr "Erweiterte Seiten-Einstellungen" @@ -2109,39 +2202,39 @@ msgstr "Wähle eine Identität zum Verwalten: " msgid "Search Results For:" msgstr "Suchergebnisse für:" -#: ../../mod/network.php:77 ../../mod/search.php:16 +#: ../../mod/network.php:82 ../../mod/search.php:16 msgid "Remove term" msgstr "Begriff entfernen" -#: ../../mod/network.php:86 ../../mod/search.php:13 +#: ../../mod/network.php:91 ../../mod/search.php:13 msgid "Saved Searches" msgstr "Gespeicherte Suchen" -#: ../../mod/network.php:87 ../../include/group.php:216 +#: ../../mod/network.php:92 ../../include/group.php:216 msgid "add" msgstr "hinzufügen" -#: ../../mod/network.php:166 +#: ../../mod/network.php:171 msgid "Commented Order" msgstr "Neueste Kommentare" -#: ../../mod/network.php:171 +#: ../../mod/network.php:176 msgid "Posted Order" msgstr "Neueste Beiträge" -#: ../../mod/network.php:182 +#: ../../mod/network.php:187 msgid "New" msgstr "Neue" -#: ../../mod/network.php:187 +#: ../../mod/network.php:192 msgid "Starred" msgstr "Markierte" -#: ../../mod/network.php:192 -msgid "Bookmarks" -msgstr "Lesezeichen" +#: ../../mod/network.php:197 +msgid "Shared Links" +msgstr "Geteilte Links" -#: ../../mod/network.php:250 +#: ../../mod/network.php:270 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2149,42 +2242,103 @@ msgid_plural "" msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk." msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken." -#: ../../mod/network.php:253 +#: ../../mod/network.php:273 msgid "Private messages to this group are at risk of public disclosure." msgstr "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten." -#: ../../mod/network.php:298 +#: ../../mod/network.php:318 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: ../../mod/network.php:309 +#: ../../mod/network.php:329 msgid "Group is empty" msgstr "Gruppe ist leer" -#: ../../mod/network.php:313 +#: ../../mod/network.php:333 msgid "Group: " msgstr "Gruppe: " -#: ../../mod/network.php:323 +#: ../../mod/network.php:343 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:325 +#: ../../mod/network.php:345 msgid "Private messages to this person are at risk of public disclosure." msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." -#: ../../mod/network.php:330 +#: ../../mod/network.php:350 msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1354 +#: ../../mod/notes.php:44 ../../boot.php:1426 msgid "Personal Notes" msgstr "Persönliche Notizen" -#: ../../mod/notes.php:63 ../../include/text.php:645 +#: ../../mod/notes.php:63 ../../mod/filer.php:30 +#: ../../addon/facebook/facebook.php:673 ../../include/text.php:649 msgid "Save" msgstr "Speichern" +#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 +#, php-format +msgid "Number of daily wall messages for %s exceeded. Message failed." +msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen." + +#: ../../mod/wallmessage.php:56 ../../mod/message.php:60 +msgid "No recipient selected." +msgstr "Kein Empfänger gewählt." + +#: ../../mod/wallmessage.php:59 +msgid "Unable to check your home location." +msgstr "Konnte deinen Heimatort nicht bestimmen." + +#: ../../mod/wallmessage.php:62 ../../mod/message.php:67 +msgid "Message could not be sent." +msgstr "Nachricht konnte nicht gesendet werden." + +#: ../../mod/wallmessage.php:65 ../../mod/message.php:70 +msgid "Message collection failure." +msgstr "Konnte Nachrichten nicht abrufen." + +#: ../../mod/wallmessage.php:68 ../../mod/message.php:73 +msgid "Message sent." +msgstr "Nachricht gesendet." + +#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95 +msgid "No recipient." +msgstr "Kein Empfänger." + +#: ../../mod/wallmessage.php:124 ../../mod/message.php:170 +#: ../../include/conversation.php:914 +msgid "Please enter a link URL:" +msgstr "Bitte gib die URL des Links ein:" + +#: ../../mod/wallmessage.php:131 ../../mod/message.php:178 +msgid "Send Private Message" +msgstr "Private Nachricht senden" + +#: ../../mod/wallmessage.php:132 +#, php-format +msgid "" +"If you wish for %s to respond, please check that the privacy settings on " +"your site allow private mail from unknown senders." +msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." + +#: ../../mod/wallmessage.php:133 ../../mod/message.php:179 +#: ../../mod/message.php:348 +msgid "To:" +msgstr "An:" + +#: ../../mod/wallmessage.php:134 ../../mod/message.php:180 +#: ../../mod/message.php:349 +msgid "Subject:" +msgstr "Betreff:" + +#: ../../mod/wallmessage.php:140 ../../mod/message.php:184 +#: ../../mod/message.php:352 ../../mod/invite.php:113 +msgid "Your message:" +msgstr "Deine Nachricht:" + #: ../../mod/newmember.php:6 msgid "Welcome to Friendica" msgstr "Willkommen bei Friendica" @@ -2203,12 +2357,19 @@ msgstr "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnte #: ../../mod/newmember.php:16 msgid "" +"On your <em>Quick Start</em> page - find a brief introduction to your " +"profile and network tabs, connect to Facebook, make some new connections, " +"and find some groups to join." +msgstr "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst." + +#: ../../mod/newmember.php:18 +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 "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen." -#: ../../mod/newmember.php:18 +#: ../../mod/newmember.php:20 msgid "" "Review the other settings, particularly the privacy settings. An unpublished" " directory listing is like having an unlisted phone number. In general, you " @@ -2216,61 +2377,61 @@ msgid "" "potential friends know exactly how to find you." msgstr "Ãœberprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können." -#: ../../mod/newmember.php:20 +#: ../../mod/newmember.php:22 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 "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust." -#: ../../mod/newmember.php:23 +#: ../../mod/newmember.php:25 msgid "" "Authorise the Facebook Connector if you currently have a Facebook account " "and we will (optionally) import all your Facebook friends and conversations." msgstr "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook Konto hast und (optional) deine Facebook Freunde und Unterhaltungen importieren willst." -#: ../../mod/newmember.php:25 +#: ../../mod/newmember.php:27 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>Wenn</em> dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten." -#: ../../mod/newmember.php:30 +#: ../../mod/newmember.php:32 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 "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willlst." -#: ../../mod/newmember.php:32 +#: ../../mod/newmember.php:34 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 "Editiere dein <strong>Standard</strong> Profil nach deinen Vorlieben. Ãœberprüfe die Einstellungen zum Verbergen deiner Freundesliste vor unbekannten Betrachtern des Profils." -#: ../../mod/newmember.php:34 +#: ../../mod/newmember.php:36 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 "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die deine Interessen teilen und können dir dann Kontakte vorschlagen." -#: ../../mod/newmember.php:36 +#: ../../mod/newmember.php:38 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 "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein." -#: ../../mod/newmember.php:38 +#: ../../mod/newmember.php:40 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 "Ãœber die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst." -#: ../../mod/newmember.php:40 +#: ../../mod/newmember.php:42 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 " @@ -2279,14 +2440,14 @@ msgid "" "hours." msgstr "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden." -#: ../../mod/newmember.php:42 +#: ../../mod/newmember.php:44 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 "Sobald du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren." -#: ../../mod/newmember.php:44 +#: ../../mod/newmember.php:46 msgid "" "Our <strong>help</strong> pages may be consulted for detail on other program" " features and resources." @@ -2300,51 +2461,51 @@ msgstr "Beitrag nicht verfügbar." msgid "Item was not found." msgstr "Beitrag konnte nicht gefunden werden." -#: ../../mod/group.php:27 +#: ../../mod/group.php:29 msgid "Group created." msgstr "Gruppe erstellt." -#: ../../mod/group.php:33 +#: ../../mod/group.php:35 msgid "Could not create group." msgstr "Konnte die Gruppe nicht erstellen." -#: ../../mod/group.php:43 ../../mod/group.php:127 +#: ../../mod/group.php:47 ../../mod/group.php:137 msgid "Group not found." msgstr "Gruppe nicht gefunden." -#: ../../mod/group.php:56 +#: ../../mod/group.php:60 msgid "Group name changed." msgstr "Gruppenname geändert." -#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293 msgid "Permission denied" msgstr "Zugriff verweigert" -#: ../../mod/group.php:85 +#: ../../mod/group.php:90 msgid "Create a group of contacts/friends." msgstr "Eine Gruppe von Kontakten/Freunden anlegen." -#: ../../mod/group.php:86 ../../mod/group.php:166 +#: ../../mod/group.php:91 ../../mod/group.php:177 msgid "Group Name: " msgstr "Gruppenname:" -#: ../../mod/group.php:102 +#: ../../mod/group.php:110 msgid "Group removed." msgstr "Gruppe entfernt." -#: ../../mod/group.php:104 +#: ../../mod/group.php:112 msgid "Unable to remove group." msgstr "Konnte die Gruppe nicht entfernen." -#: ../../mod/group.php:165 +#: ../../mod/group.php:176 msgid "Group Editor" msgstr "Gruppeneditor" -#: ../../mod/group.php:177 +#: ../../mod/group.php:189 msgid "Members" msgstr "Mitglieder" -#: ../../mod/group.php:209 ../../mod/profperm.php:105 +#: ../../mod/group.php:221 ../../mod/profperm.php:105 msgid "Click on a contact to add or remove." msgstr "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen" @@ -2356,9 +2517,12 @@ msgstr "Ungültiger Profil-Bezeichner" msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" -#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7 -#: ../../include/profile_advanced.php:76 ../../include/nav.php:48 -#: ../../boot.php:1336 +#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:237 +#: ../../view/theme/diabook-blue/theme.php:237 +#: ../../view/theme/diabook/theme.php:245 +#: ../../view/theme/diabook-aerith/theme.php:237 +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 +#: ../../include/nav.php:50 ../../boot.php:1408 msgid "Profile" msgstr "Profil" @@ -2374,157 +2538,163 @@ msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" msgid "No contacts." msgstr "Keine Kontakte." -#: ../../mod/viewcontacts.php:74 ../../include/text.php:584 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:586 msgid "View Contacts" msgstr "Kontakte anzeigen" -#: ../../mod/register.php:62 +#: ../../mod/register.php:64 msgid "An invitation is required." msgstr "Du benötigst eine Einladung." -#: ../../mod/register.php:67 +#: ../../mod/register.php:69 msgid "Invitation could not be verified." msgstr "Die Einladung konnte nicht überprüft werden." -#: ../../mod/register.php:75 +#: ../../mod/register.php:77 msgid "Invalid OpenID url" msgstr "Ungültige OpenID URL" -#: ../../mod/register.php:90 +#: ../../mod/register.php:92 msgid "Please enter the required information." msgstr "Bitte trage die erforderlichen Informationen ein." -#: ../../mod/register.php:104 +#: ../../mod/register.php:106 msgid "Please use a shorter name." msgstr "Bitte verwende einen kürzeren Namen." -#: ../../mod/register.php:106 +#: ../../mod/register.php:108 msgid "Name too short." msgstr "Der Name ist zu kurz." -#: ../../mod/register.php:121 +#: ../../mod/register.php:123 msgid "That doesn't appear to be your full (First Last) name." msgstr "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein." -#: ../../mod/register.php:126 +#: ../../mod/register.php:128 msgid "Your email domain is not among those allowed on this site." msgstr "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt." -#: ../../mod/register.php:129 +#: ../../mod/register.php:131 msgid "Not a valid email address." msgstr "Keine gültige E-Mail-Adresse." -#: ../../mod/register.php:139 +#: ../../mod/register.php:141 msgid "Cannot use that email." msgstr "Konnte diese E-Mail-Adresse nicht verwenden." -#: ../../mod/register.php:145 +#: ../../mod/register.php:147 msgid "" "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " "must also begin with a letter." msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen." -#: ../../mod/register.php:151 ../../mod/register.php:252 +#: ../../mod/register.php:153 ../../mod/register.php:264 msgid "Nickname is already registered. Please choose another." msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." -#: ../../mod/register.php:170 +#: ../../mod/register.php:163 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." + +#: ../../mod/register.php:182 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." -#: ../../mod/register.php:238 +#: ../../mod/register.php:250 msgid "An error occurred during registration. Please try again." msgstr "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." -#: ../../mod/register.php:274 +#: ../../mod/register.php:286 msgid "An error occurred creating your default profile. Please try again." msgstr "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." -#: ../../mod/register.php:378 ../../mod/regmod.php:52 +#: ../../mod/register.php:390 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "Details der Registration von %s" -#: ../../mod/register.php:386 +#: ../../mod/register.php:398 msgid "" "Registration successful. Please check your email for further instructions." msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet." -#: ../../mod/register.php:390 +#: ../../mod/register.php:402 msgid "Failed to send email message. Here is the message that failed." msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte." -#: ../../mod/register.php:395 +#: ../../mod/register.php:407 msgid "Your registration can not be processed." msgstr "Deine Registrierung konnte nicht verarbeitet werden." -#: ../../mod/register.php:432 +#: ../../mod/register.php:444 #, php-format msgid "Registration request at %s" msgstr "Registrierungsanfrage auf %s" -#: ../../mod/register.php:441 +#: ../../mod/register.php:453 msgid "Your registration is pending approval by the site owner." msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." -#: ../../mod/register.php:479 +#: ../../mod/register.php:491 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal." -#: ../../mod/register.php:505 +#: ../../mod/register.php:517 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst." -#: ../../mod/register.php:506 +#: ../../mod/register.php:518 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus." -#: ../../mod/register.php:507 +#: ../../mod/register.php:519 msgid "Your OpenID (optional): " msgstr "Deine OpenID (optional): " -#: ../../mod/register.php:521 +#: ../../mod/register.php:533 msgid "Include your profile in member directory?" msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?" -#: ../../mod/register.php:536 +#: ../../mod/register.php:553 msgid "Membership on this site is by invitation only." msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." -#: ../../mod/register.php:537 +#: ../../mod/register.php:554 msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:540 ../../mod/admin.php:314 +#: ../../mod/register.php:557 ../../mod/admin.php:358 msgid "Registration" msgstr "Registrierung" -#: ../../mod/register.php:548 +#: ../../mod/register.php:565 msgid "Your Full Name (e.g. Joe Smith): " msgstr "Vollständiger Name (z.B. Max Mustermann): " -#: ../../mod/register.php:549 +#: ../../mod/register.php:566 msgid "Your Email Address: " msgstr "Deine E-Mail-Adresse: " -#: ../../mod/register.php:550 +#: ../../mod/register.php:567 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be " "'<strong>nickname@$sitename</strong>'." msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein." -#: ../../mod/register.php:551 +#: ../../mod/register.php:568 msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693 +#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:745 msgid "Register" msgstr "Registrieren" @@ -2533,18 +2703,29 @@ msgid "People Search" msgstr "Personen Suche" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1092 +#: ../../addon/facebook/facebook.php:1440 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../include/diaspora.php:1600 ../../include/conversation.php:48 +#: ../../view/theme/diabook-red/theme.php:77 +#: ../../view/theme/diabook-red/theme.php:86 +#: ../../view/theme/diabook-blue/theme.php:77 +#: ../../view/theme/diabook-blue/theme.php:86 +#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90 +#: ../../view/theme/diabook-aerith/theme.php:77 +#: ../../view/theme/diabook-aerith/theme.php:86 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 msgid "status" msgstr "Status" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444 #: ../../addon/communityhome/communityhome.php:172 -#: ../../include/diaspora.php:1616 ../../include/conversation.php:65 +#: ../../view/theme/diabook-red/theme.php:91 +#: ../../view/theme/diabook-blue/theme.php:91 +#: ../../view/theme/diabook/theme.php:95 +#: ../../view/theme/diabook-aerith/theme.php:91 +#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" @@ -2555,13 +2736,12 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127 -#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29 -#: ../../mod/display.php:137 ../../mod/viewd.php:14 -#: ../../include/items.php:2942 +#: ../../mod/admin.php:566 ../../mod/admin.php:745 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3030 msgid "Item not found." msgstr "Beitrag nicht gefunden." -#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6 +#: ../../mod/viewsrc.php:7 msgid "Access denied." msgstr "Zugriff verweigert." @@ -2569,12 +2749,12 @@ msgstr "Zugriff verweigert." msgid "Account approved." msgstr "Account freigegeben." -#: ../../mod/regmod.php:93 +#: ../../mod/regmod.php:98 #, php-format msgid "Registration revoked for %s" msgstr "Registrierung für %s wurde zurückgezogen" -#: ../../mod/regmod.php:105 +#: ../../mod/regmod.php:110 msgid "Please login." msgstr "Bitte melde dich an." @@ -2586,97 +2766,97 @@ msgstr "Konnte den Originalbeitrag nicht finden." msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: ../../mod/item.php:351 ../../mod/wall_upload.php:81 +#: ../../mod/item.php:373 ../../mod/wall_upload.php:81 #: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97 -#: ../../include/message.php:143 +#: ../../include/message.php:144 msgid "Wall Photos" msgstr "Pinnwand-Bilder" -#: ../../mod/item.php:833 +#: ../../mod/item.php:763 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." -#: ../../mod/item.php:858 +#: ../../mod/item.php:788 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social " "network." msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica." -#: ../../mod/item.php:860 +#: ../../mod/item.php:790 #, php-format msgid "You may visit them online at %s" msgstr "Du kannst sie online unter %s besuchen" -#: ../../mod/item.php:861 +#: ../../mod/item.php:791 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest." -#: ../../mod/item.php:863 +#: ../../mod/item.php:793 #, php-format msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." -#: ../../mod/profile_photo.php:28 +#: ../../mod/profile_photo.php:30 msgid "Image uploaded but image cropping failed." msgstr "Bilder hochgeladen, aber das Zuschneiden ist fehlgeschlagen." -#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258 +#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 +#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264 #, php-format msgid "Image size reduction [%s] failed." msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert." -#: ../../mod/profile_photo.php:89 +#: ../../mod/profile_photo.php:91 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." -#: ../../mod/profile_photo.php:99 +#: ../../mod/profile_photo.php:101 msgid "Unable to process image" msgstr "Bild konnte nicht verarbeitet werden" -#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56 +#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56 #, php-format msgid "Image exceeds size limit of %d" msgstr "Bildgröße überschreitet das Limit von %d" -#: ../../mod/profile_photo.php:203 +#: ../../mod/profile_photo.php:207 msgid "Upload File:" msgstr "Datei hochladen:" -#: ../../mod/profile_photo.php:204 +#: ../../mod/profile_photo.php:208 msgid "Upload Profile Photo" msgstr "Profilbild hochladen" -#: ../../mod/profile_photo.php:205 +#: ../../mod/profile_photo.php:209 msgid "Upload" msgstr "Hochladen" -#: ../../mod/profile_photo.php:206 +#: ../../mod/profile_photo.php:211 msgid "skip this step" msgstr "diesen Schritt überspringen" -#: ../../mod/profile_photo.php:206 +#: ../../mod/profile_photo.php:211 msgid "select a photo from your photo albums" msgstr "wähle ein Foto von deinen Fotoalben" -#: ../../mod/profile_photo.php:219 +#: ../../mod/profile_photo.php:224 msgid "Crop Image" msgstr "Bild zurechtschneiden" -#: ../../mod/profile_photo.php:220 +#: ../../mod/profile_photo.php:225 msgid "Please adjust the image cropping for optimum viewing." msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." -#: ../../mod/profile_photo.php:221 +#: ../../mod/profile_photo.php:227 msgid "Done Editing" msgstr "Bearbeitung abgeschlossen" -#: ../../mod/profile_photo.php:249 +#: ../../mod/profile_photo.php:255 msgid "Image uploaded successfully." msgstr "Bild erfolgreich auf den Server geladen." @@ -2698,88 +2878,71 @@ msgstr "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit msgid "Please enter your password for verification:" msgstr "Bitte gib dein Passwort zur Verifikation ein:" -#: ../../mod/message.php:23 -msgid "No recipient selected." -msgstr "Kein Empfänger gewählt." +#: ../../mod/message.php:22 ../../include/nav.php:131 +msgid "New Message" +msgstr "Neue Nachricht" -#: ../../mod/message.php:26 +#: ../../mod/message.php:64 msgid "Unable to locate contact information." msgstr "Konnte die Kontaktinformationen nicht finden." -#: ../../mod/message.php:29 -msgid "Message could not be sent." -msgstr "Nachricht konnte nicht gesendet werden." - -#: ../../mod/message.php:32 -msgid "Message collection failure." -msgstr "Konnte Nachrichten nicht abrufen." - -#: ../../mod/message.php:35 -msgid "Message sent." -msgstr "Nachricht gesendet." - -#: ../../mod/message.php:55 -msgid "Inbox" -msgstr "Eingang" - -#: ../../mod/message.php:60 -msgid "Outbox" -msgstr "Ausgang" - -#: ../../mod/message.php:65 -msgid "New Message" -msgstr "Neue Nachricht" - -#: ../../mod/message.php:91 +#: ../../mod/message.php:118 msgid "Message deleted." msgstr "Nachricht gelöscht." -#: ../../mod/message.php:121 +#: ../../mod/message.php:148 msgid "Conversation removed." msgstr "Unterhaltung gelöscht." -#: ../../mod/message.php:137 ../../include/conversation.php:887 -msgid "Please enter a link URL:" -msgstr "Bitte gib die URL des Links ein:" - -#: ../../mod/message.php:145 -msgid "Send Private Message" -msgstr "Private Nachricht senden" - -#: ../../mod/message.php:146 ../../mod/message.php:287 -msgid "To:" -msgstr "An:" +#: ../../mod/message.php:220 +msgid "No messages." +msgstr "Keine Nachrichten." -#: ../../mod/message.php:147 ../../mod/message.php:288 -msgid "Subject:" -msgstr "Betreff:" +#: ../../mod/message.php:227 +#, php-format +msgid "Unknown sender - %s" +msgstr "'Unbekannter Absender - %s" -#: ../../mod/message.php:150 ../../mod/message.php:291 -#: ../../mod/invite.php:101 -msgid "Your message:" -msgstr "Deine Nachricht:" +#: ../../mod/message.php:230 +#, php-format +msgid "You and %s" +msgstr "Du und %s" -#: ../../mod/message.php:188 -msgid "No messages." -msgstr "Keine Nachrichten." +#: ../../mod/message.php:233 +#, php-format +msgid "%s and You" +msgstr "%s und Du" -#: ../../mod/message.php:201 +#: ../../mod/message.php:243 ../../mod/message.php:341 msgid "Delete conversation" msgstr "Unterhaltung löschen" -#: ../../mod/message.php:204 +#: ../../mod/message.php:246 msgid "D, d M Y - g:i A" msgstr "D, d. M Y - g:i A" -#: ../../mod/message.php:239 +#: ../../mod/message.php:248 +#, php-format +msgid "%d message" +msgid_plural "%d messages" +msgstr[0] "%d Nachricht" +msgstr[1] "%d Nachrichten" + +#: ../../mod/message.php:283 msgid "Message not available." msgstr "Nachricht nicht verfügbar." -#: ../../mod/message.php:276 +#: ../../mod/message.php:325 msgid "Delete message" msgstr "Nachricht löschen" -#: ../../mod/message.php:286 +#: ../../mod/message.php:343 +msgid "" +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." +msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten." + +#: ../../mod/message.php:347 msgid "Send Reply" msgstr "Antwort senden" @@ -2792,23 +2955,23 @@ msgstr "Freunde von %s" msgid "No friends to display." msgstr "Keine Freunde zum Anzeigen." -#: ../../mod/admin.php:71 ../../mod/admin.php:312 +#: ../../mod/admin.php:71 ../../mod/admin.php:356 msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492 +#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608 +#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775 +#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825 msgid "Themes" msgstr "Themen" -#: ../../mod/admin.php:89 ../../mod/admin.php:855 +#: ../../mod/admin.php:89 ../../mod/admin.php:905 msgid "Logs" msgstr "Protokolle" @@ -2816,501 +2979,534 @@ msgstr "Protokolle" msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479 -#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741 -#: ../../mod/admin.php:774 ../../mod/admin.php:854 +#: ../../mod/admin.php:157 ../../mod/admin.php:355 ../../mod/admin.php:523 +#: ../../mod/admin.php:612 ../../mod/admin.php:652 ../../mod/admin.php:790 +#: ../../mod/admin.php:824 ../../mod/admin.php:904 msgid "Administration" msgstr "Administration" -#: ../../mod/admin.php:162 +#: ../../mod/admin.php:158 msgid "Summary" msgstr "Zusammenfassung" -#: ../../mod/admin.php:163 +#: ../../mod/admin.php:159 msgid "Registered users" msgstr "Registrierte Nutzer" -#: ../../mod/admin.php:165 +#: ../../mod/admin.php:161 msgid "Pending registrations" msgstr "Anstehende Anmeldungen" -#: ../../mod/admin.php:166 +#: ../../mod/admin.php:162 msgid "Version" msgstr "Version" -#: ../../mod/admin.php:168 +#: ../../mod/admin.php:164 msgid "Active plugins" msgstr "Aktive Plugins" -#: ../../mod/admin.php:260 +#: ../../mod/admin.php:298 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: ../../mod/admin.php:304 +#: ../../mod/admin.php:342 msgid "Closed" msgstr "Geschlossen" -#: ../../mod/admin.php:305 +#: ../../mod/admin.php:343 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: ../../mod/admin.php:306 +#: ../../mod/admin.php:344 msgid "Open" msgstr "Offen" -#: ../../mod/admin.php:315 +#: ../../mod/admin.php:348 +msgid "No SSL policy, links will track page SSL state" +msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" + +#: ../../mod/admin.php:349 +msgid "Force all links to use SSL" +msgstr "SSL für alle Links erzwingen" + +#: ../../mod/admin.php:350 +msgid "Self-signed certificate, use SSL for local links only (discouraged)" +msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)" + +#: ../../mod/admin.php:359 msgid "File upload" msgstr "Datei hochladen" -#: ../../mod/admin.php:316 +#: ../../mod/admin.php:360 msgid "Policies" msgstr "Regeln" -#: ../../mod/admin.php:317 +#: ../../mod/admin.php:361 msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523 +#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538 msgid "Site name" msgstr "Seitenname" -#: ../../mod/admin.php:322 +#: ../../mod/admin.php:366 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../mod/admin.php:323 +#: ../../mod/admin.php:367 msgid "System language" msgstr "Systemsprache" -#: ../../mod/admin.php:324 +#: ../../mod/admin.php:368 msgid "System theme" msgstr "Systemweites Thema" -#: ../../mod/admin.php:324 +#: ../../mod/admin.php:368 msgid "Default system theme - may be over-ridden by user profiles" msgstr "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden." -#: ../../mod/admin.php:326 +#: ../../mod/admin.php:369 +msgid "SSL link policy" +msgstr "Regeln für SSL Links" + +#: ../../mod/admin.php:369 +msgid "Determines whether generated links should be forced to use SSL" +msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" + +#: ../../mod/admin.php:370 msgid "Maximum image size" msgstr "Maximale Größe von Bildern" -#: ../../mod/admin.php:326 +#: ../../mod/admin.php:370 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit." -#: ../../mod/admin.php:328 +#: ../../mod/admin.php:372 msgid "Register policy" msgstr "Registrierungsmethode" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:373 msgid "Register text" msgstr "Registrierungstext" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:373 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:374 msgid "Accounts abandoned after x days" msgstr "Accounts gelten nach x Tagen als unbenutzt" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:374 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: ../../mod/admin.php:331 +#: ../../mod/admin.php:375 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/admin.php:331 +#: ../../mod/admin.php:375 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:332 +#: ../../mod/admin.php:376 msgid "Allowed email domains" msgstr "Erlaubte Domains für Emails" -#: ../../mod/admin.php:332 +#: ../../mod/admin.php:376 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:333 +#: ../../mod/admin.php:377 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/admin.php:333 +#: ../../mod/admin.php:377 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist." -#: ../../mod/admin.php:334 +#: ../../mod/admin.php:378 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: ../../mod/admin.php:334 +#: ../../mod/admin.php:378 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen." -#: ../../mod/admin.php:335 +#: ../../mod/admin.php:379 msgid "Global directory update URL" msgstr "URL für Updates beim weltweiten Verzeichnis" -#: ../../mod/admin.php:335 +#: ../../mod/admin.php:379 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar." -#: ../../mod/admin.php:337 +#: ../../mod/admin.php:381 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: ../../mod/admin.php:337 +#: ../../mod/admin.php:381 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen." -#: ../../mod/admin.php:338 +#: ../../mod/admin.php:382 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: ../../mod/admin.php:338 +#: ../../mod/admin.php:382 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:383 msgid "Gravatar support" msgstr "Gravatar Unterstützung" -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:383 msgid "Search new user's photo on Gravatar." msgstr "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer." -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:384 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:384 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden." -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:385 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:385 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: ../../mod/admin.php:342 +#: ../../mod/admin.php:386 msgid "Show Community Page" msgstr "Gemeinschaftsseite anzeigen" -#: ../../mod/admin.php:342 +#: ../../mod/admin.php:386 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server." -#: ../../mod/admin.php:343 +#: ../../mod/admin.php:387 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: ../../mod/admin.php:343 +#: ../../mod/admin.php:387 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt." -#: ../../mod/admin.php:344 +#: ../../mod/admin.php:388 msgid "Enable Diaspora support" msgstr "Diaspora-Support aktivieren" -#: ../../mod/admin.php:344 +#: ../../mod/admin.php:388 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: ../../mod/admin.php:345 +#: ../../mod/admin.php:389 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: ../../mod/admin.php:345 +#: ../../mod/admin.php:389 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert." -#: ../../mod/admin.php:346 +#: ../../mod/admin.php:390 msgid "Verify SSL" msgstr "SSL Ãœberprüfen" -#: ../../mod/admin.php:346 +#: ../../mod/admin.php:390 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann." -#: ../../mod/admin.php:347 +#: ../../mod/admin.php:391 msgid "Proxy user" msgstr "Proxy Nutzer" -#: ../../mod/admin.php:348 +#: ../../mod/admin.php:392 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../mod/admin.php:349 +#: ../../mod/admin.php:393 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: ../../mod/admin.php:349 +#: ../../mod/admin.php:393 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)." -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:414 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s Benutzer geblockt/freigegeben" msgstr[1] "%s Benutzer geblockt/freigegeben" -#: ../../mod/admin.php:377 +#: ../../mod/admin.php:421 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s Nutzer gelöscht" msgstr[1] "%s Nutzer gelöscht" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:455 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:462 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:462 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:526 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:527 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:528 msgid "Request date" msgstr "Anfrage Datum" -#: ../../mod/admin.php:484 ../../mod/admin.php:493 +#: ../../mod/admin.php:528 ../../mod/admin.php:537 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "Email" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:529 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:531 msgid "Deny" msgstr "Verwehren" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:537 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:537 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:537 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:537 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:495 +#: ../../mod/admin.php:539 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:496 +#: ../../mod/admin.php:540 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:576 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:536 +#: ../../mod/admin.php:580 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:546 ../../mod/admin.php:724 +#: ../../mod/admin.php:590 ../../mod/admin.php:769 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:548 ../../mod/admin.php:726 +#: ../../mod/admin.php:592 ../../mod/admin.php:771 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:570 ../../mod/admin.php:743 +#: ../../mod/admin.php:614 ../../mod/admin.php:792 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130 +#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137 msgid "Settings" msgstr "Einstellungen" -#: ../../mod/admin.php:578 ../../mod/admin.php:753 +#: ../../mod/admin.php:622 ../../mod/admin.php:802 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:579 ../../mod/admin.php:754 +#: ../../mod/admin.php:623 ../../mod/admin.php:803 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:689 +#: ../../mod/admin.php:734 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:780 +#: ../../mod/admin.php:784 +msgid "Screenshot" +msgstr "Bildschirmfoto" + +#: ../../mod/admin.php:830 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:781 +#: ../../mod/admin.php:831 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:804 +#: ../../mod/admin.php:854 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:857 +#: ../../mod/admin.php:907 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:863 +#: ../../mod/admin.php:913 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:864 +#: ../../mod/admin.php:914 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:864 +#: ../../mod/admin.php:914 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis." -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:915 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:906 +#: ../../mod/admin.php:956 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:912 +#: ../../mod/admin.php:962 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:913 +#: ../../mod/admin.php:963 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:914 +#: ../../mod/admin.php:964 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:915 +#: ../../mod/admin.php:965 msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:15 ../../boot.php:845 +#: ../../mod/profile.php:20 ../../boot.php:901 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../mod/profile.php:111 ../../mod/display.php:67 +#: ../../mod/profile.php:123 ../../mod/display.php:75 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." -#: ../../mod/profile.php:131 +#: ../../mod/profile.php:144 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" -#: ../../mod/ping.php:174 +#: ../../mod/ping.php:175 msgid "{0} wants to be your friend" msgstr "{0} möchte mit dir in Kontakt treten" -#: ../../mod/ping.php:179 +#: ../../mod/ping.php:180 msgid "{0} sent you a message" msgstr "{0} hat dir eine Nachricht geschickt" -#: ../../mod/ping.php:184 +#: ../../mod/ping.php:185 msgid "{0} requested registration" msgstr "{0} möchte sich registrieren" -#: ../../mod/ping.php:190 +#: ../../mod/ping.php:191 #, php-format msgid "{0} commented %s's post" msgstr "{0} kommentierte einen Beitrag von %s" -#: ../../mod/ping.php:195 +#: ../../mod/ping.php:196 #, php-format msgid "{0} liked %s's post" msgstr "{0} mag %ss Beitrag" -#: ../../mod/ping.php:200 +#: ../../mod/ping.php:201 #, php-format msgid "{0} disliked %s's post" msgstr "{0} mag %ss Beitrag nicht" -#: ../../mod/ping.php:205 +#: ../../mod/ping.php:206 #, php-format msgid "{0} is now friends with %s" msgstr "{0} ist jetzt mit %s befreundet" -#: ../../mod/ping.php:210 +#: ../../mod/ping.php:211 msgid "{0} posted" msgstr "{0} hat etwas veröffentlicht" -#: ../../mod/ping.php:215 +#: ../../mod/ping.php:216 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen" -#: ../../mod/ping.php:221 +#: ../../mod/ping.php:222 msgid "{0} mentioned you in a post" msgstr "{0} hat dich in einem Beitrag erwähnt" -#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90 -#: ../../include/auth.php:115 ../../include/auth.php:169 +#: ../../mod/openid.php:24 +msgid "OpenID protocol error. No ID returned." +msgstr "OpenID Protokollfehler. Keine ID zurückgegeben." + +#: ../../mod/openid.php:53 +msgid "" +"Account not found and OpenID registration is not permitted on this site." +msgstr "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet." + +#: ../../mod/openid.php:93 ../../include/auth.php:90 +#: ../../include/auth.php:153 msgid "Login failed." msgstr "Annmeldung fehlgeschlagen." @@ -3367,7 +3563,7 @@ msgstr "Gemeinsame Freunde" msgid "No friends in common." msgstr "Keine gemeinsamen Freunde." -#: ../../mod/display.php:130 +#: ../../mod/display.php:135 msgid "Item has been removed." msgstr "Eintrag wurde entfernt." @@ -3383,222 +3579,233 @@ msgstr "Keine Applikationen installiert." msgid "Search This Site" msgstr "Diese Seite durchsuchen" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:239 -#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:242 +#: ../../mod/profiles.php:356 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "Profil nicht gefunden." -#: ../../mod/profiles.php:28 +#: ../../mod/profiles.php:31 msgid "Profile Name is required." msgstr "Profilname ist erforderlich." -#: ../../mod/profiles.php:198 +#: ../../mod/profiles.php:201 msgid "Profile updated." msgstr "Profil aktualisiert." -#: ../../mod/profiles.php:256 +#: ../../mod/profiles.php:261 msgid "Profile deleted." msgstr "Profil gelöscht." -#: ../../mod/profiles.php:272 ../../mod/profiles.php:303 +#: ../../mod/profiles.php:279 ../../mod/profiles.php:313 msgid "Profile-" msgstr "Profil-" -#: ../../mod/profiles.php:291 ../../mod/profiles.php:330 +#: ../../mod/profiles.php:298 ../../mod/profiles.php:340 msgid "New profile created." msgstr "Neues Profil angelegt." -#: ../../mod/profiles.php:309 +#: ../../mod/profiles.php:319 msgid "Profile unavailable to clone." msgstr "Profil nicht zum Duplizieren verfügbar." -#: ../../mod/profiles.php:356 +#: ../../mod/profiles.php:368 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" -#: ../../mod/profiles.php:374 +#: ../../mod/profiles.php:389 msgid "Edit Profile Details" msgstr "Profil bearbeiten" -#: ../../mod/profiles.php:376 +#: ../../mod/profiles.php:391 msgid "View this profile" msgstr "Dieses Profil anzeigen" -#: ../../mod/profiles.php:377 +#: ../../mod/profiles.php:392 msgid "Create a new profile using these settings" msgstr "Neues Profil anlegen und diese Einstellungen verwenden" -#: ../../mod/profiles.php:378 +#: ../../mod/profiles.php:393 msgid "Clone this profile" msgstr "Dieses Profil duplizieren" -#: ../../mod/profiles.php:379 +#: ../../mod/profiles.php:394 msgid "Delete this profile" msgstr "Dieses Profil löschen" -#: ../../mod/profiles.php:380 +#: ../../mod/profiles.php:395 msgid "Profile Name:" msgstr "Profilname:" -#: ../../mod/profiles.php:381 +#: ../../mod/profiles.php:396 msgid "Your Full Name:" msgstr "Dein kompletter Name:" -#: ../../mod/profiles.php:382 +#: ../../mod/profiles.php:397 msgid "Title/Description:" msgstr "Titel/Beschreibung:" -#: ../../mod/profiles.php:383 +#: ../../mod/profiles.php:398 msgid "Your Gender:" msgstr "Dein Geschlecht:" -#: ../../mod/profiles.php:384 +#: ../../mod/profiles.php:399 #, php-format msgid "Birthday (%s):" msgstr "Geburtstag (%s):" -#: ../../mod/profiles.php:385 +#: ../../mod/profiles.php:400 msgid "Street Address:" msgstr "Adresse:" -#: ../../mod/profiles.php:386 +#: ../../mod/profiles.php:401 msgid "Locality/City:" msgstr "Wohnort/Stadt:" -#: ../../mod/profiles.php:387 +#: ../../mod/profiles.php:402 msgid "Postal/Zip Code:" msgstr "Postleitzahl:" -#: ../../mod/profiles.php:388 +#: ../../mod/profiles.php:403 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:389 +#: ../../mod/profiles.php:404 msgid "Region/State:" msgstr "Region/Bundesstaat:" -#: ../../mod/profiles.php:390 +#: ../../mod/profiles.php:405 msgid "<span class=\"heart\">♥</span> Marital Status:" msgstr "<span class=\"heart\">♥</span> Beziehungsstatus:" -#: ../../mod/profiles.php:391 +#: ../../mod/profiles.php:406 msgid "Who: (if applicable)" msgstr "Wer: (falls anwendbar)" -#: ../../mod/profiles.php:392 +#: ../../mod/profiles.php:407 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43 +#: ../../mod/profiles.php:408 ../../include/profile_advanced.php:43 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" -#: ../../mod/profiles.php:394 +#: ../../mod/profiles.php:409 msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49 +#: ../../mod/profiles.php:410 ../../include/profile_advanced.php:49 msgid "Political Views:" msgstr "Politische Ansichten:" -#: ../../mod/profiles.php:396 +#: ../../mod/profiles.php:411 msgid "Religious Views:" msgstr "Religiöse Ansichten:" -#: ../../mod/profiles.php:397 +#: ../../mod/profiles.php:412 msgid "Public Keywords:" msgstr "Öffentliche Schlüsselwörter:" -#: ../../mod/profiles.php:398 +#: ../../mod/profiles.php:413 msgid "Private Keywords:" msgstr "Private Schlüsselwörter:" -#: ../../mod/profiles.php:399 +#: ../../mod/profiles.php:414 msgid "Example: fishing photography software" msgstr "Beispiel: Fischen Fotografie Software" -#: ../../mod/profiles.php:400 +#: ../../mod/profiles.php:415 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)" -#: ../../mod/profiles.php:401 +#: ../../mod/profiles.php:416 msgid "(Used for searching profiles, never shown to others)" msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" -#: ../../mod/profiles.php:402 +#: ../../mod/profiles.php:417 msgid "Tell us about yourself..." msgstr "Erzähle uns ein bisschen von dir …" -#: ../../mod/profiles.php:403 +#: ../../mod/profiles.php:418 msgid "Hobbies/Interests" msgstr "Hobbies/Interessen" -#: ../../mod/profiles.php:404 +#: ../../mod/profiles.php:419 msgid "Contact information and Social Networks" msgstr "Kontaktinformationen und Soziale Netzwerke" -#: ../../mod/profiles.php:405 +#: ../../mod/profiles.php:420 msgid "Musical interests" msgstr "Musikalische Interessen" -#: ../../mod/profiles.php:406 +#: ../../mod/profiles.php:421 msgid "Books, literature" msgstr "Literatur/Bücher" -#: ../../mod/profiles.php:407 +#: ../../mod/profiles.php:422 msgid "Television" msgstr "Fernsehen" -#: ../../mod/profiles.php:408 +#: ../../mod/profiles.php:423 msgid "Film/dance/culture/entertainment" msgstr "Filme/Tänze/Kultur/Unterhaltung" -#: ../../mod/profiles.php:409 +#: ../../mod/profiles.php:424 msgid "Love/romance" msgstr "Liebesleben" -#: ../../mod/profiles.php:410 +#: ../../mod/profiles.php:425 msgid "Work/employment" msgstr "Arbeit/Beschäftigung" -#: ../../mod/profiles.php:411 +#: ../../mod/profiles.php:426 msgid "School/education" msgstr "Schule/Ausbildung" -#: ../../mod/profiles.php:416 +#: ../../mod/profiles.php:431 msgid "" "This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "be visible to anybody using the internet." msgstr "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein." -#: ../../mod/profiles.php:426 ../../mod/directory.php:124 +#: ../../mod/profiles.php:441 ../../mod/directory.php:111 msgid "Age: " msgstr "Alter: " -#: ../../mod/profiles.php:461 +#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294 +#: ../../view/theme/diabook-blue/theme.php:293 +#: ../../view/theme/diabook/theme.php:303 +#: ../../view/theme/diabook-aerith/theme.php:293 msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:462 ../../boot.php:946 +#: ../../mod/profiles.php:477 ../../boot.php:1008 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:463 ../../boot.php:947 +#: ../../mod/profiles.php:478 ../../boot.php:1009 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:473 ../../boot.php:957 +#: ../../mod/profiles.php:489 ../../boot.php:1019 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:475 ../../boot.php:960 +#: ../../mod/profiles.php:491 ../../boot.php:1022 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:476 ../../boot.php:961 +#: ../../mod/profiles.php:492 ../../boot.php:1023 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" +#: ../../mod/filer.php:29 ../../include/conversation.php:918 +msgid "Save to Folder:" +msgstr "In diesen Ordner verschieben:" + +#: ../../mod/filer.php:29 +msgid "- select -" +msgstr "- auswählen -" + #: ../../mod/tagger.php:103 ../../include/conversation.php:138 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" @@ -3639,7 +3846,11 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge" -#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35 +#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:146 +#: ../../view/theme/diabook-blue/theme.php:146 +#: ../../view/theme/diabook/theme.php:150 +#: ../../view/theme/diabook-aerith/theme.php:146 +#: ../../include/contact_widgets.php:33 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -3653,31 +3864,26 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:51 +#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144 +#: ../../view/theme/diabook-blue/theme.php:144 +#: ../../view/theme/diabook/theme.php:148 +#: ../../view/theme/diabook-aerith/theme.php:144 msgid "Global Directory" msgstr "Weltweites Verzeichnis" -#: ../../mod/directory.php:57 -msgid "Normal site view" -msgstr "Normale Seitenansicht" - -#: ../../mod/directory.php:59 -msgid "Admin - View all site entries" -msgstr "Admin: Alle Einträge dieses Servers anzeigen" - -#: ../../mod/directory.php:65 +#: ../../mod/directory.php:55 msgid "Find on this site" msgstr "Auf diesem Server suchen" -#: ../../mod/directory.php:68 +#: ../../mod/directory.php:58 msgid "Site Directory" msgstr "Verzeichnis" -#: ../../mod/directory.php:127 +#: ../../mod/directory.php:114 msgid "Gender: " msgstr "Geschlecht:" -#: ../../mod/directory.php:153 +#: ../../mod/directory.php:140 msgid "No entries (some entries may be hidden)." msgstr "Keine Einträge (einige Einträge könnten versteckt sein)." @@ -3687,9 +3893,8 @@ msgid "%s : Not a valid email address." msgstr "%s: Keine gültige Email Adresse." #: ../../mod/invite.php:59 -#, php-format -msgid "Please join my network on %s" -msgstr "Bitte trete meinem Netzwerk auf %s bei" +msgid "Please join us on Friendica" +msgstr "Bitte trete uns auf Friendica bei" #: ../../mod/invite.php:69 #, php-format @@ -3707,179 +3912,212 @@ msgstr[1] "%d Nachrichten gesendet." msgid "You have no more invitations available" msgstr "Du hast keine weiteren Einladungen" -#: ../../mod/invite.php:99 -msgid "Send invitations" -msgstr "Einladungen senden" - #: ../../mod/invite.php:100 -msgid "Enter email addresses, one per line:" -msgstr "E-Mail-Adressen eingeben, eine pro Zeile:" +#, php-format +msgid "" +"Visit %s for a list of public sites that you can join. Friendica members on " +"other sites can all connect with each other, as well as with members of many" +" other social networks." +msgstr "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke." #: ../../mod/invite.php:102 #, php-format -msgid "Please join my social network on %s" -msgstr "Bitte trete meinem Sozialen Netzwerk auf %s bei" +msgid "" +"To accept this invitation, please visit and register at %s or any other " +"public Friendica website." +msgstr "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website." #: ../../mod/invite.php:103 -msgid "To accept this invitation, please visit:" -msgstr "Um diese Einladung anzunehmen besuche bitte:" +#, php-format +msgid "" +"Friendica sites all inter-connect to create a huge privacy-enhanced social " +"web that is owned and controlled by its members. They can also connect with " +"many traditional social networks. See %s for a list of alternate Friendica " +"sites you can join." +msgstr "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst." + +#: ../../mod/invite.php:106 +msgid "" +"Our apologies. This system is not currently configured to connect with other" +" public sites or invite members." +msgstr "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen." + +#: ../../mod/invite.php:111 +msgid "Send invitations" +msgstr "Einladungen senden" -#: ../../mod/invite.php:104 +#: ../../mod/invite.php:112 +msgid "Enter email addresses, one per line:" +msgstr "E-Mail-Adressen eingeben, eine pro Zeile:" + +#: ../../mod/invite.php:114 +msgid "" +"You are cordially invited to join me and other close friends on Friendica - " +"and help us to create a better social web." +msgstr "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen." + +#: ../../mod/invite.php:116 msgid "You will need to supply this invitation code: $invite_code" msgstr "Du benötigst den folgenden Einladungscode: $invite_code" -#: ../../mod/invite.php:104 +#: ../../mod/invite.php:116 msgid "" "Once you have registered, please connect with me via my profile page at:" msgstr "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:" +#: ../../mod/invite.php:118 +msgid "" +"For more information about the Friendica project and why we feel it is " +"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/dfrn_confirm.php:119 msgid "" "This may occasionally happen if contact was requested by both persons and it" " has already been approved." msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde." -#: ../../mod/dfrn_confirm.php:239 +#: ../../mod/dfrn_confirm.php:242 msgid "Response from remote site was not understood." msgstr "Antwort der Gegenstelle unverständlich." -#: ../../mod/dfrn_confirm.php:248 +#: ../../mod/dfrn_confirm.php:251 msgid "Unexpected response from remote site: " msgstr "Unerwartete Antwort der Gegenstelle: " -#: ../../mod/dfrn_confirm.php:256 +#: ../../mod/dfrn_confirm.php:259 msgid "Confirmation completed successfully." msgstr "Bestätigung erfolgreich abgeschlossen." -#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272 -#: ../../mod/dfrn_confirm.php:279 +#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275 +#: ../../mod/dfrn_confirm.php:282 msgid "Remote site reported: " msgstr "Gegenstelle meldet: " -#: ../../mod/dfrn_confirm.php:270 +#: ../../mod/dfrn_confirm.php:273 msgid "Temporary failure. Please wait and try again." msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal." -#: ../../mod/dfrn_confirm.php:277 +#: ../../mod/dfrn_confirm.php:280 msgid "Introduction failed or was revoked." msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen." -#: ../../mod/dfrn_confirm.php:422 +#: ../../mod/dfrn_confirm.php:425 msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." -#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "%1$s ist nun mit %2$s befreundet" -#: ../../mod/dfrn_confirm.php:544 +#: ../../mod/dfrn_confirm.php:548 #, php-format msgid "No user record found for '%s' " msgstr "Für '%s' wurde kein Nutzer gefunden" -#: ../../mod/dfrn_confirm.php:554 +#: ../../mod/dfrn_confirm.php:558 msgid "Our site encryption key is apparently messed up." msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch." -#: ../../mod/dfrn_confirm.php:565 +#: ../../mod/dfrn_confirm.php:569 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden." -#: ../../mod/dfrn_confirm.php:586 +#: ../../mod/dfrn_confirm.php:590 msgid "Contact record was not found for you on our site." msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden." -#: ../../mod/dfrn_confirm.php:600 +#: ../../mod/dfrn_confirm.php:604 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server." -#: ../../mod/dfrn_confirm.php:620 +#: ../../mod/dfrn_confirm.php:624 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." -#: ../../mod/dfrn_confirm.php:631 +#: ../../mod/dfrn_confirm.php:635 msgid "Unable to set your contact credentials on our system." msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden." -#: ../../mod/dfrn_confirm.php:694 +#: ../../mod/dfrn_confirm.php:700 msgid "Unable to update your contact profile details on our system" msgstr "Die Updates für dein Profil konnten nicht gespeichert werden" -#: ../../mod/dfrn_confirm.php:724 +#: ../../mod/dfrn_confirm.php:730 #, php-format msgid "Connection accepted at %s" msgstr "Auf %s wurde die Verbindung akzeptiert" -#: ../../addon/facebook/facebook.php:338 +#: ../../addon/facebook/facebook.php:462 msgid "Facebook disabled" msgstr "Facebook deaktiviert" -#: ../../addon/facebook/facebook.php:343 +#: ../../addon/facebook/facebook.php:467 msgid "Updating contacts" msgstr "Aktualisiere Kontakte" -#: ../../addon/facebook/facebook.php:352 +#: ../../addon/facebook/facebook.php:488 msgid "Facebook API key is missing." msgstr "Facebook-API-Schlüssel nicht gefunden" -#: ../../addon/facebook/facebook.php:359 +#: ../../addon/facebook/facebook.php:495 msgid "Facebook Connect" msgstr "Mit Facebook verbinden" -#: ../../addon/facebook/facebook.php:365 +#: ../../addon/facebook/facebook.php:501 msgid "Install Facebook connector for this account." msgstr "Facebook-Connector für diesen Account installieren." -#: ../../addon/facebook/facebook.php:372 +#: ../../addon/facebook/facebook.php:508 msgid "Remove Facebook connector" msgstr "Facebook-Connector entfernen" -#: ../../addon/facebook/facebook.php:377 +#: ../../addon/facebook/facebook.php:513 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]" -#: ../../addon/facebook/facebook.php:384 +#: ../../addon/facebook/facebook.php:520 msgid "Post to Facebook by default" msgstr "Veröffentliche standardmäßig bei Facebook" -#: ../../addon/facebook/facebook.php:388 +#: ../../addon/facebook/facebook.php:524 msgid "Link all your Facebook friends and conversations on this website" msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren" -#: ../../addon/facebook/facebook.php:390 +#: ../../addon/facebook/facebook.php:526 msgid "" "Facebook conversations consist of your <em>profile wall</em> and your friend" " <em>stream</em>." msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>." -#: ../../addon/facebook/facebook.php:391 +#: ../../addon/facebook/facebook.php:527 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen." -#: ../../addon/facebook/facebook.php:392 +#: ../../addon/facebook/facebook.php:528 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen." -#: ../../addon/facebook/facebook.php:396 +#: ../../addon/facebook/facebook.php:532 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen" -#: ../../addon/facebook/facebook.php:401 +#: ../../addon/facebook/facebook.php:537 msgid "Do not import your Facebook profile wall conversations" msgstr "Facebook-Pinnwand nicht importieren" -#: ../../addon/facebook/facebook.php:403 +#: ../../addon/facebook/facebook.php:539 msgid "" "If you choose to link conversations and leave both of these boxes unchecked," " your Facebook profile wall will be merged with your profile wall on this " @@ -3887,43 +4125,123 @@ msgid "" "who may see the conversations." msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann." -#: ../../addon/facebook/facebook.php:408 +#: ../../addon/facebook/facebook.php:544 msgid "Comma separated applications to ignore" msgstr "Komma separiert Anwendungen, die ignoriert werden sollen" -#: ../../addon/facebook/facebook.php:476 +#: ../../addon/facebook/facebook.php:615 +msgid "Problems with Facebook Real-Time Updates" +msgstr "Probleme mit Facebook Echtzeit-Updates" + +#: ../../addon/facebook/facebook.php:639 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" -#: ../../addon/facebook/facebook.php:477 +#: ../../addon/facebook/facebook.php:640 msgid "Facebook Connector Settings" msgstr "Facebook-Verbindungseinstellungen" -#: ../../addon/facebook/facebook.php:491 +#: ../../addon/facebook/facebook.php:649 +msgid "Facebook API Key" +msgstr "Facebook API Schlüssel" + +#: ../../addon/facebook/facebook.php:658 +msgid "" +"Error: it appears that you have specified the App-ID and -Secret in your " +".htconfig.php file. As long as they are specified there, they cannot be set " +"using this form.<br><br>" +msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>" + +#: ../../addon/facebook/facebook.php:663 +msgid "" +"Error: the given API Key seems to be incorrect (the application access token" +" could not be retrieved)." +msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)." + +#: ../../addon/facebook/facebook.php:665 +msgid "The given API Key seems to work correctly." +msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren." + +#: ../../addon/facebook/facebook.php:667 +msgid "" +"The correctness of the API Key could not be detected. Somthing strange's " +"going on." +msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange." + +#: ../../addon/facebook/facebook.php:670 +msgid "App-ID / API-Key" +msgstr "App-ID / API-Key" + +#: ../../addon/facebook/facebook.php:671 +msgid "Application secret" +msgstr "Anwendungs-Geheimnis" + +#: ../../addon/facebook/facebook.php:672 +#, php-format +msgid "Polling Interval (min. %1$s minutes)" +msgstr "Abrufintervall (min. %1$s Minuten)" + +#: ../../addon/facebook/facebook.php:676 +msgid "Real-Time Updates" +msgstr "Echt-Zeit Aktualisierungen" + +#: ../../addon/facebook/facebook.php:680 +msgid "Real-Time Updates are activated." +msgstr "Echtzeit-Updates sind aktiviert." + +#: ../../addon/facebook/facebook.php:681 +msgid "Deactivate Real-Time Updates" +msgstr "Echtzeit-Updates deaktivieren" + +#: ../../addon/facebook/facebook.php:683 +msgid "Real-Time Updates not activated." +msgstr "Echtzeit-Updates nicht aktiviert." + +#: ../../addon/facebook/facebook.php:683 +msgid "Activate Real-Time Updates" +msgstr "Echtzeit-Updates aktivieren" + +#: ../../addon/facebook/facebook.php:697 +msgid "The new values have been saved." +msgstr "Die neuen Einstellungen wurden gespeichert." + +#: ../../addon/facebook/facebook.php:716 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:582 +#: ../../addon/facebook/facebook.php:808 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:651 -msgid "Image: " -msgstr "Bild: " - -#: ../../addon/facebook/facebook.php:728 +#: ../../addon/facebook/facebook.php:1026 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:752 +#: ../../addon/facebook/facebook.php:1051 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886 -#: ../../include/bb2diaspora.php:102 +#: ../../addon/facebook/facebook.php:1087 +msgid "Your Facebook connection became invalid. Please Re-authenticate." +msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich." + +#: ../../addon/facebook/facebook.php:1088 +msgid "Facebook connection became invalid" +msgstr "Facebook Anmeldedaten sind ungültig geworden" + +#: ../../addon/facebook/facebook.php:1089 +#, php-format +msgid "" +"Hi %1$s,\n" +"\n" +"The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." +msgstr "Hi %1$s,\n\ndie Verbindung von deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3$sden Facebook-Connector neu Authentifizieren%4$s." + +#: ../../addon/facebook/facebook.php:1214 +#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102 msgid "link" msgstr "Verweis" @@ -3941,15 +4259,15 @@ msgid_plural "%d people don't like this" msgstr[0] " %d Person mag das nicht" msgstr[1] "%d Leute mögen das nicht" -#: ../../addon/widgets/widgets.php:55 +#: ../../addon/widgets/widgets.php:56 msgid "Generate new key" msgstr "Neuen Schlüssel erstellen" -#: ../../addon/widgets/widgets.php:58 +#: ../../addon/widgets/widgets.php:59 msgid "Widgets key" msgstr "Widgets Schlüssel" -#: ../../addon/widgets/widgets.php:60 +#: ../../addon/widgets/widgets.php:61 msgid "Widgets available" msgstr "Verfügbare Widgets" @@ -3981,41 +4299,51 @@ msgstr "SSL Verwenden " msgid "yourls Settings saved." msgstr "yourls Einstellungen gespeichert" -#: ../../addon/ljpost/ljpost.php:38 +#: ../../addon/ljpost/ljpost.php:39 msgid "Post to LiveJournal" msgstr "In LiveJournal veröffentlichen." -#: ../../addon/ljpost/ljpost.php:69 +#: ../../addon/ljpost/ljpost.php:70 msgid "LiveJournal Post Settings" msgstr "LiveJournal Veröffentlichungs-Einstellungen" -#: ../../addon/ljpost/ljpost.php:71 +#: ../../addon/ljpost/ljpost.php:72 msgid "Enable LiveJournal Post Plugin" msgstr "LiveJournal Post Plugin aktivieren" -#: ../../addon/ljpost/ljpost.php:76 +#: ../../addon/ljpost/ljpost.php:77 msgid "LiveJournal username" msgstr "LiveJournal Benutzername" -#: ../../addon/ljpost/ljpost.php:81 +#: ../../addon/ljpost/ljpost.php:82 msgid "LiveJournal password" msgstr "LiveJournal Passwort" -#: ../../addon/ljpost/ljpost.php:86 +#: ../../addon/ljpost/ljpost.php:87 msgid "Post to LiveJournal by default" msgstr "Standardmäßig bei LiveJournal veröffentlichen" #: ../../addon/nsfw/nsfw.php:47 -msgid "\"Not Safe For Work\" Settings" -msgstr "\"Not Safe For Work\"-Einstellungen" +msgid "Not Safe For Work (General Purpose Content Filter) settings" +msgstr "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:" + +#: ../../addon/nsfw/nsfw.php:49 +msgid "" +"This plugin looks in posts for the words/text you specify below, and " +"collapses any content containing those keywords so it is not displayed at " +"inappropriate times, such as sexual innuendo that may be improper in a work " +"setting. It is polite and recommended to tag any content containing nudity " +"with #NSFW. This filter can also match any other word/text you specify, and" +" can thereby be used as a general purpose content filter." +msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden." #: ../../addon/nsfw/nsfw.php:50 -msgid "Enable NSFW filter" -msgstr "NSFW Filter aktivieren" +msgid "Enable Content filter" +msgstr "Aktiviere den Inhaltsfilter" #: ../../addon/nsfw/nsfw.php:53 -msgid "Comma separated words to treat as NSFW" -msgstr "Wörter, die gefiltert werden sollen (durch Kommas getrennt)" +msgid "Comma separated list of keywords to hide" +msgstr "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen" #: ../../addon/nsfw/nsfw.php:58 msgid "Use /expression/ to provide regular expressions" @@ -4030,11 +4358,15 @@ msgstr "NSFW-Einstellungen gespeichert" msgid "%s - Click to open/close" msgstr "%s – Zum Öffnen/Schließen klicken" +#: ../../addon/page/page.php:47 +msgid "Forums" +msgstr "Foren" + #: ../../addon/communityhome/communityhome.php:28 #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:62 ../../boot.php:710 +#: ../../include/nav.php:64 ../../boot.php:766 msgid "Login" msgstr "Anmeldung" @@ -4044,8 +4376,9 @@ msgid "OpenID" msgstr "OpenID" #: ../../addon/communityhome/communityhome.php:38 -msgid "Last users" -msgstr "Letzte Nutzer" +#: ../../addon/communityhome/twillingham/communityhome.php:38 +msgid "Latest users" +msgstr "Letzte Benutzer" #: ../../addon/communityhome/communityhome.php:81 #: ../../addon/communityhome/twillingham/communityhome.php:81 @@ -4053,22 +4386,22 @@ msgid "Most active users" msgstr "Aktivste Nutzer" #: ../../addon/communityhome/communityhome.php:98 -msgid "Last photos" -msgstr "Letzte Fotos" +msgid "Latest photos" +msgstr "Neueste Fotos" #: ../../addon/communityhome/communityhome.php:133 -msgid "Last likes" -msgstr "Zuletzt gemocht" - -#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224 +msgid "Latest likes" +msgstr "Neueste Favoriten" + +#: ../../addon/communityhome/communityhome.php:155 +#: ../../view/theme/diabook-red/theme.php:74 +#: ../../view/theme/diabook-blue/theme.php:74 +#: ../../view/theme/diabook/theme.php:78 +#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1292 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" -#: ../../addon/communityhome/twillingham/communityhome.php:38 -msgid "Latest users" -msgstr "Letzte Benutzer" - #: ../../addon/uhremotestorage/uhremotestorage.php:84 #, php-format msgid "" @@ -4156,27 +4489,27 @@ msgstr "Randplace-Einstellungen" msgid "Enable Randplace Plugin" msgstr "Randplace-Plugin aktivieren" -#: ../../addon/dwpost/dwpost.php:38 +#: ../../addon/dwpost/dwpost.php:39 msgid "Post to Dreamwidth" msgstr "In Dreamwidth veröffentlichen" -#: ../../addon/dwpost/dwpost.php:69 +#: ../../addon/dwpost/dwpost.php:70 msgid "Dreamwidth Post Settings" msgstr "Dreamwidth Veröffentlichungs-Einstellungen" -#: ../../addon/dwpost/dwpost.php:71 +#: ../../addon/dwpost/dwpost.php:72 msgid "Enable dreamwidth Post Plugin" msgstr "Dreamwidth Post Plugin aktivieren" -#: ../../addon/dwpost/dwpost.php:76 +#: ../../addon/dwpost/dwpost.php:77 msgid "dreamwidth username" msgstr "Dreamwidth Benutzername" -#: ../../addon/dwpost/dwpost.php:81 +#: ../../addon/dwpost/dwpost.php:82 msgid "dreamwidth password" msgstr "Dreamwidth Passwort" -#: ../../addon/dwpost/dwpost.php:86 +#: ../../addon/dwpost/dwpost.php:87 msgid "Post to dreamwidth by default" msgstr "Standardmäßig bei Dreamwidth veröffentlichen" @@ -4216,7 +4549,7 @@ msgstr "Drupal Seite verwendet bereinigte URLs" msgid "Post to Drupal by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal" -#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172 +#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190 #: ../../addon/posterous/posterous.php:173 msgid "Post from Friendica" msgstr "Beitrag via Friendica" @@ -4401,15 +4734,39 @@ msgstr "Editplain Einstellungen" msgid "Disable richtext status editor" msgstr "RichText Editor deaktivieren" -#: ../../addon/pageheader/pageheader.php:47 +#: ../../addon/pageheader/pageheader.php:50 msgid "\"pageheader\" Settings" msgstr "\"pageheader\"-Einstellungen" -#: ../../addon/pageheader/pageheader.php:65 +#: ../../addon/pageheader/pageheader.php:68 msgid "pageheader Settings saved." msgstr "pageheader-Einstellungen gespeichert." -#: ../../addon/viewsrc/viewsrc.php:25 +#: ../../addon/ijpost/ijpost.php:39 +msgid "Post to Insanejournal" +msgstr "Auf InsaneJournal posten." + +#: ../../addon/ijpost/ijpost.php:70 +msgid "InsaneJournal Post Settings" +msgstr "InsaneJournal Beitrags-Einstellungen" + +#: ../../addon/ijpost/ijpost.php:72 +msgid "Enable InsaneJournal Post Plugin" +msgstr "InsaneJournal Plugin aktivieren" + +#: ../../addon/ijpost/ijpost.php:77 +msgid "InsaneJournal username" +msgstr "InsaneJournal Benutzername" + +#: ../../addon/ijpost/ijpost.php:82 +msgid "InsaneJournal password" +msgstr "InsaneJournal Passwort" + +#: ../../addon/ijpost/ijpost.php:87 +msgid "Post to InsaneJournal by default" +msgstr "Standardmäßig auf InsaneJournal posten." + +#: ../../addon/viewsrc/viewsrc.php:37 msgid "View Source" msgstr "Quelle ansehen" @@ -4417,40 +4774,40 @@ msgstr "Quelle ansehen" msgid "Post to StatusNet" msgstr "Bei StatusNet veröffentlichen" -#: ../../addon/statusnet/statusnet.php:175 +#: ../../addon/statusnet/statusnet.php:176 msgid "" "Please contact your site administrator.<br />The provided API URL is not " "valid." msgstr "Bitte kontaktiere den Administrator des Servers.<br />Die angegebene API-URL ist nicht gültig." -#: ../../addon/statusnet/statusnet.php:203 +#: ../../addon/statusnet/statusnet.php:204 msgid "We could not contact the StatusNet API with the Path you entered." msgstr "Die StatusNet-API konnte mit dem angegebenen Pfad nicht erreicht werden." -#: ../../addon/statusnet/statusnet.php:229 +#: ../../addon/statusnet/statusnet.php:232 msgid "StatusNet settings updated." msgstr "StatusNet Einstellungen aktualisiert." -#: ../../addon/statusnet/statusnet.php:252 +#: ../../addon/statusnet/statusnet.php:257 msgid "StatusNet Posting Settings" msgstr "StatusNet-Beitragseinstellungen" -#: ../../addon/statusnet/statusnet.php:266 +#: ../../addon/statusnet/statusnet.php:271 msgid "Globally Available StatusNet OAuthKeys" msgstr "Verfügbare OAuth Schlüssel für StatusNet" -#: ../../addon/statusnet/statusnet.php:267 +#: ../../addon/statusnet/statusnet.php:272 msgid "" "There are preconfigured OAuth key pairs for some StatusNet servers " "available. If you are useing one of them, please use these credentials. If " "not feel free to connect to any other StatusNet instance (see below)." msgstr "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten)." -#: ../../addon/statusnet/statusnet.php:275 +#: ../../addon/statusnet/statusnet.php:280 msgid "Provide your own OAuth Credentials" msgstr "Eigene OAuth Schlüssel eintragen" -#: ../../addon/statusnet/statusnet.php:276 +#: ../../addon/statusnet/statusnet.php:281 msgid "" "No consumer key pair for StatusNet found. Register your Friendica Account as" " an desktop client on your StatusNet account, copy the consumer key pair " @@ -4459,19 +4816,19 @@ msgid "" "Friendica installation at your favorited StatusNet installation." msgstr "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert." -#: ../../addon/statusnet/statusnet.php:278 +#: ../../addon/statusnet/statusnet.php:283 msgid "OAuth Consumer Key" msgstr "OAuth Consumer Key" -#: ../../addon/statusnet/statusnet.php:281 +#: ../../addon/statusnet/statusnet.php:286 msgid "OAuth Consumer Secret" msgstr "OAuth Consumer Secret" -#: ../../addon/statusnet/statusnet.php:284 +#: ../../addon/statusnet/statusnet.php:289 msgid "Base API Path (remember the trailing /)" msgstr "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)" -#: ../../addon/statusnet/statusnet.php:305 +#: ../../addon/statusnet/statusnet.php:310 msgid "" "To connect to your StatusNet account click the button below to get a " "security code from StatusNet which you have to copy into the input box below" @@ -4479,38 +4836,38 @@ msgid "" " to StatusNet." msgstr "Um deinen Account mit einem StatusNet-Account zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten an StatusNet gesendet." -#: ../../addon/statusnet/statusnet.php:306 +#: ../../addon/statusnet/statusnet.php:311 msgid "Log in with StatusNet" msgstr "Bei StatusNet anmelden" -#: ../../addon/statusnet/statusnet.php:308 +#: ../../addon/statusnet/statusnet.php:313 msgid "Copy the security code from StatusNet here" msgstr "Kopiere den Sicherheitscode von StatusNet hier hin" -#: ../../addon/statusnet/statusnet.php:314 +#: ../../addon/statusnet/statusnet.php:319 msgid "Cancel Connection Process" msgstr "Verbindungsprozess abbrechen" -#: ../../addon/statusnet/statusnet.php:316 +#: ../../addon/statusnet/statusnet.php:321 msgid "Current StatusNet API is" msgstr "Derzeitige StatusNet-API-URL lautet" -#: ../../addon/statusnet/statusnet.php:317 +#: ../../addon/statusnet/statusnet.php:322 msgid "Cancel StatusNet Connection" msgstr "Verbindung zum StatusNet Server abbrechen" -#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184 +#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189 msgid "Currently connected to: " msgstr "Momentan verbunden mit: " -#: ../../addon/statusnet/statusnet.php:329 +#: ../../addon/statusnet/statusnet.php:334 msgid "" "If enabled all your <strong>public</strong> postings can be posted to the " "associated StatusNet account. You can choose to do so by default (here) or " "for every posting separately in the posting options when writing the entry." msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen StatusNet Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." -#: ../../addon/statusnet/statusnet.php:331 +#: ../../addon/statusnet/statusnet.php:336 msgid "" "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile " "details from unknown viewers?</em>) the link potentially included in public " @@ -4518,19 +4875,23 @@ msgid "" "informing the visitor that the access to your profile has been restricted." msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." -#: ../../addon/statusnet/statusnet.php:334 +#: ../../addon/statusnet/statusnet.php:339 msgid "Allow posting to StatusNet" msgstr "Veröffentlichung bei StatusNet erlauben" -#: ../../addon/statusnet/statusnet.php:337 +#: ../../addon/statusnet/statusnet.php:342 msgid "Send public postings to StatusNet by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet" -#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198 +#: ../../addon/statusnet/statusnet.php:345 +msgid "Send #tag links to StatusNet" +msgstr "#Tags nach StatusNet senden" + +#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206 msgid "Clear OAuth configuration" msgstr "OAuth-Konfiguration löschen" -#: ../../addon/statusnet/statusnet.php:524 +#: ../../addon/statusnet/statusnet.php:539 msgid "API URL" msgstr "API-URL" @@ -4637,9 +4998,10 @@ msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben" msgid "Show More Settings saved." msgstr "\"Mehr zeigen\" Einstellungen gesichert." -#: ../../addon/showmore/showmore.php:86 -msgid "Show More" -msgstr "\"Mehr zeigen\"" +#: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466 +#: ../../boot.php:495 +msgid "show more" +msgstr "mehr anzeigen" #: ../../addon/piwik/piwik.php:79 msgid "" @@ -4681,21 +5043,21 @@ msgstr "Asynchrones Tracken" msgid "Post to Twitter" msgstr "Bei Twitter veröffentlichen" -#: ../../addon/twitter/twitter.php:119 +#: ../../addon/twitter/twitter.php:122 msgid "Twitter settings updated." msgstr "Twitter Einstellungen aktualisiert." -#: ../../addon/twitter/twitter.php:141 +#: ../../addon/twitter/twitter.php:146 msgid "Twitter Posting Settings" msgstr "Twitter-Beitragseinstellungen" -#: ../../addon/twitter/twitter.php:148 +#: ../../addon/twitter/twitter.php:153 msgid "" "No consumer key pair for Twitter found. Please contact your site " "administrator." msgstr "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite." -#: ../../addon/twitter/twitter.php:167 +#: ../../addon/twitter/twitter.php:172 msgid "" "At this Friendica instance the Twitter plugin was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " @@ -4704,22 +5066,22 @@ msgid "" " be posted to Twitter." msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht." -#: ../../addon/twitter/twitter.php:168 +#: ../../addon/twitter/twitter.php:173 msgid "Log in with Twitter" msgstr "bei Twitter anmelden" -#: ../../addon/twitter/twitter.php:170 +#: ../../addon/twitter/twitter.php:175 msgid "Copy the PIN from Twitter here" msgstr "Kopiere die Twitter-PIN hier her" -#: ../../addon/twitter/twitter.php:185 +#: ../../addon/twitter/twitter.php:190 msgid "" "If enabled all your <strong>public</strong> postings can be posted to the " "associated Twitter account. You can choose to do so by default (here) or for" " every posting separately in the posting options when writing the entry." msgstr "Wenn aktiviert, so können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen." -#: ../../addon/twitter/twitter.php:187 +#: ../../addon/twitter/twitter.php:192 msgid "" "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile " "details from unknown viewers?</em>) the link potentially included in public " @@ -4727,25 +5089,33 @@ msgid "" "the visitor that the access to your profile has been restricted." msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." -#: ../../addon/twitter/twitter.php:190 +#: ../../addon/twitter/twitter.php:195 msgid "Allow posting to Twitter" msgstr "Veröffentlichung bei Twitter erlauben" -#: ../../addon/twitter/twitter.php:193 +#: ../../addon/twitter/twitter.php:198 msgid "Send public postings to Twitter by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter" -#: ../../addon/twitter/twitter.php:357 +#: ../../addon/twitter/twitter.php:201 +msgid "Send #tag links to Twitter" +msgstr "#Tags nach Twitter senden" + +#: ../../addon/twitter/twitter.php:371 msgid "Consumer key" msgstr "Consumer Key" -#: ../../addon/twitter/twitter.php:358 +#: ../../addon/twitter/twitter.php:372 msgid "Consumer secret" msgstr "Consumer Secret" -#: ../../addon/irc/irc.php:20 -msgid "irc Chatroom" -msgstr "irc Chatroom" +#: ../../addon/irc/irc.php:25 +msgid "IRC Chatroom" +msgstr "IRC Chatraum" + +#: ../../addon/irc/irc.php:46 +msgid "Popular Channels" +msgstr "Beliebte Räume" #: ../../addon/posterous/posterous.php:36 msgid "Post to Posterous" @@ -4771,23 +5141,183 @@ msgstr "Posterous-Passwort" msgid "Post to Posterous by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" -#: ../../view/theme/quattro/theme.php:17 +#: ../../view/theme/diabook-red/theme.php:23 +#: ../../view/theme/diabook-blue/theme.php:23 +#: ../../view/theme/diabook/theme.php:27 +#: ../../view/theme/dispy-dark/theme.php:116 +#: ../../view/theme/diabook-aerith/theme.php:23 +msgid "Last users" +msgstr "Letzte Nutzer" + +#: ../../view/theme/diabook-red/theme.php:52 +#: ../../view/theme/diabook-blue/theme.php:52 +#: ../../view/theme/diabook/theme.php:56 +#: ../../view/theme/diabook-aerith/theme.php:52 +msgid "Last likes" +msgstr "Zuletzt gemocht" + +#: ../../view/theme/diabook-red/theme.php:97 +#: ../../view/theme/diabook-blue/theme.php:97 +#: ../../view/theme/diabook/theme.php:101 +#: ../../view/theme/diabook-aerith/theme.php:97 +msgid "Last photos" +msgstr "Letzte Fotos" + +#: ../../view/theme/diabook-red/theme.php:142 +#: ../../view/theme/diabook-blue/theme.php:142 +#: ../../view/theme/diabook/theme.php:146 +#: ../../view/theme/diabook-aerith/theme.php:142 +msgid "Find Friends" +msgstr "Freunde finden" + +#: ../../view/theme/diabook-red/theme.php:143 +#: ../../view/theme/diabook-blue/theme.php:143 +#: ../../view/theme/diabook/theme.php:147 +#: ../../view/theme/diabook-aerith/theme.php:143 +msgid "Local Directory" +msgstr "Lokales Verzeichnis" + +#: ../../view/theme/diabook-red/theme.php:145 +#: ../../view/theme/diabook-blue/theme.php:145 +#: ../../view/theme/diabook/theme.php:149 +#: ../../view/theme/diabook-aerith/theme.php:145 +#: ../../include/contact_widgets.php:34 +msgid "Similar Interests" +msgstr "Ähnliche Interessen" + +#: ../../view/theme/diabook-red/theme.php:147 +#: ../../view/theme/diabook-blue/theme.php:147 +#: ../../view/theme/diabook/theme.php:151 +#: ../../view/theme/diabook-aerith/theme.php:147 +#: ../../include/contact_widgets.php:35 +msgid "Invite Friends" +msgstr "Freunde einladen" + +#: ../../view/theme/diabook-red/theme.php:162 +#: ../../view/theme/diabook-red/theme.php:243 +#: ../../view/theme/diabook-blue/theme.php:162 +#: ../../view/theme/diabook-blue/theme.php:243 +#: ../../view/theme/diabook/theme.php:167 +#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook-aerith/theme.php:162 +#: ../../view/theme/diabook-aerith/theme.php:243 +msgid "Community Pages" +msgstr "Foren" + +#: ../../view/theme/diabook-red/theme.php:195 +#: ../../view/theme/diabook-blue/theme.php:195 +#: ../../view/theme/diabook/theme.php:200 +#: ../../view/theme/diabook-aerith/theme.php:195 +msgid "Help or @NewHere ?" +msgstr "Hilfe oder @NewHere" + +#: ../../view/theme/diabook-red/theme.php:201 +#: ../../view/theme/diabook-blue/theme.php:201 +#: ../../view/theme/diabook/theme.php:206 +#: ../../view/theme/diabook-aerith/theme.php:201 +msgid "Connect Services" +msgstr "Verbinde Dienste" + +#: ../../view/theme/diabook-red/theme.php:207 +#: ../../view/theme/diabook-blue/theme.php:207 +#: ../../view/theme/diabook/theme.php:212 +#: ../../view/theme/diabook-aerith/theme.php:207 +msgid "PostIt to Friendica" +msgstr "PostIt nach Friendica" + +#: ../../view/theme/diabook-red/theme.php:207 +#: ../../view/theme/diabook-blue/theme.php:207 +#: ../../view/theme/diabook/theme.php:212 +#: ../../view/theme/diabook-aerith/theme.php:207 +msgid "Post to Friendica" +msgstr "Bei Friendica veröffentlichen" + +#: ../../view/theme/diabook-red/theme.php:208 +#: ../../view/theme/diabook-blue/theme.php:208 +#: ../../view/theme/diabook/theme.php:213 +#: ../../view/theme/diabook-aerith/theme.php:208 +msgid " from anywhere by bookmarking this Link." +msgstr " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst." + +#: ../../view/theme/diabook-red/theme.php:236 +#: ../../view/theme/diabook-blue/theme.php:236 +#: ../../view/theme/diabook/theme.php:244 +#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:49 +#: ../../include/nav.php:115 +msgid "Your posts and conversations" +msgstr "Deine Beiträge und Unterhaltungen" + +#: ../../view/theme/diabook-red/theme.php:237 +#: ../../view/theme/diabook-blue/theme.php:237 +#: ../../view/theme/diabook/theme.php:245 +#: ../../view/theme/diabook-aerith/theme.php:237 ../../include/nav.php:50 +msgid "Your profile page" +msgstr "Deine Profilseite" + +#: ../../view/theme/diabook-red/theme.php:238 +#: ../../view/theme/diabook-blue/theme.php:238 +#: ../../view/theme/diabook/theme.php:246 +#: ../../view/theme/diabook-aerith/theme.php:238 +msgid "Your contacts" +msgstr "Deine Kontakte" + +#: ../../view/theme/diabook-red/theme.php:239 +#: ../../view/theme/diabook-blue/theme.php:239 +#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51 +#: ../../boot.php:1413 +msgid "Photos" +msgstr "Bilder" + +#: ../../view/theme/diabook-red/theme.php:239 +#: ../../view/theme/diabook-blue/theme.php:239 +#: ../../view/theme/diabook/theme.php:247 +#: ../../view/theme/diabook-aerith/theme.php:239 ../../include/nav.php:51 +msgid "Your photos" +msgstr "Deine Fotos" + +#: ../../view/theme/diabook-red/theme.php:240 +#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:52 +msgid "Your events" +msgstr "Deine Ereignisse" + +#: ../../view/theme/diabook-red/theme.php:241 +#: ../../view/theme/diabook-blue/theme.php:241 +#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53 +msgid "Personal notes" +msgstr "Persönliche Notizen" + +#: ../../view/theme/diabook-red/theme.php:241 +#: ../../view/theme/diabook-blue/theme.php:241 +#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:53 +msgid "Your personal photos" +msgstr "Deine privaten Fotos" + +#: ../../view/theme/quattro/config.php:23 msgid "Theme settings" msgstr "Themen Einstellungen" -#: ../../view/theme/quattro/theme.php:18 +#: ../../view/theme/quattro/config.php:24 msgid "Alignment" msgstr "Ausrichtung" -#: ../../view/theme/quattro/theme.php:18 +#: ../../view/theme/quattro/config.php:24 msgid "Left" msgstr "Links" -#: ../../view/theme/quattro/theme.php:18 +#: ../../view/theme/quattro/config.php:24 msgid "Center" msgstr "Mitte" -#: ../../include/profile_advanced.php:17 ../../boot.php:982 +#: ../../view/theme/quattro/config.php:25 +msgid "Color scheme" +msgstr "Farbschema" + +#: ../../include/profile_advanced.php:17 ../../boot.php:1044 msgid "Gender:" msgstr "Geschlecht:" @@ -4800,7 +5330,7 @@ msgid "j F" msgstr "j F" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438 -#: ../../include/items.php:1349 +#: ../../include/items.php:1392 msgid "Birthday:" msgstr "Geburtstag:" @@ -4808,11 +5338,11 @@ msgstr "Geburtstag:" msgid "Age:" msgstr "Alter:" -#: ../../include/profile_advanced.php:37 ../../boot.php:985 +#: ../../include/profile_advanced.php:37 ../../boot.php:1047 msgid "Status:" msgstr "Status:" -#: ../../include/profile_advanced.php:45 ../../boot.php:987 +#: ../../include/profile_advanced.php:45 ../../boot.php:1049 msgid "Homepage:" msgstr "Homepage:" @@ -5156,168 +5686,192 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:425 ../../include/notifier.php:638 +#: ../../include/delivery.php:434 ../../include/notifier.php:651 msgid "(no subject)" msgstr "(kein Betreff)" -#: ../../include/delivery.php:432 ../../include/enotify.php:17 -#: ../../include/notifier.php:645 +#: ../../include/delivery.php:441 ../../include/enotify.php:23 +#: ../../include/notifier.php:658 msgid "noreply" msgstr "noreply" -#: ../../include/text.php:238 +#: ../../include/text.php:240 msgid "prev" msgstr "vorige" -#: ../../include/text.php:240 +#: ../../include/text.php:242 msgid "first" msgstr "erste" -#: ../../include/text.php:269 +#: ../../include/text.php:271 msgid "last" msgstr "letzte" -#: ../../include/text.php:272 +#: ../../include/text.php:274 msgid "next" msgstr "nächste" -#: ../../include/text.php:563 +#: ../../include/text.php:565 msgid "No contacts" msgstr "Keine Kontakte" -#: ../../include/text.php:572 +#: ../../include/text.php:574 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "%d Kontakt" msgstr[1] "%d Kontakte" -#: ../../include/text.php:643 ../../include/nav.php:87 +#: ../../include/text.php:647 ../../include/nav.php:91 msgid "Search" msgstr "Suche" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Monday" msgstr "Montag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Tuesday" msgstr "Dienstag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Wednesday" msgstr "Mittwoch" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Thursday" msgstr "Donnerstag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Friday" msgstr "Freitag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Saturday" msgstr "Samstag" -#: ../../include/text.php:831 +#: ../../include/text.php:828 msgid "Sunday" msgstr "Sonntag" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "January" msgstr "Januar" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "February" msgstr "Februar" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "March" msgstr "März" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "April" msgstr "April" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "May" msgstr "Mai" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "June" msgstr "Juni" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "July" msgstr "Juli" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "August" msgstr "August" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "September" msgstr "September" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "October" msgstr "Oktober" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "November" msgstr "November" -#: ../../include/text.php:835 +#: ../../include/text.php:832 msgid "December" msgstr "Dezember" -#: ../../include/text.php:905 +#: ../../include/text.php:916 msgid "bytes" msgstr "Byte" -#: ../../include/text.php:1000 +#: ../../include/text.php:933 +msgid "Categories:" +msgstr "Kategorien:" + +#: ../../include/text.php:945 +msgid "remove" +msgstr "löschen" + +#: ../../include/text.php:945 +msgid "[remove]" +msgstr "[löschen]" + +#: ../../include/text.php:948 +msgid "Filed under:" +msgstr "Abgelegt unter:" + +#: ../../include/text.php:964 ../../include/text.php:976 +msgid "Click to open/close" +msgstr "Zum öffnen/schließen klicken" + +#: ../../include/text.php:1068 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1012 +#: ../../include/text.php:1080 msgid "default" msgstr "standard" -#: ../../include/text.php:1228 +#: ../../include/text.php:1296 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1230 +#: ../../include/text.php:1298 msgid "comment" msgstr "Kommentar" -#: ../../include/text.php:1231 +#: ../../include/text.php:1299 msgid "post" msgstr "Beitrag" -#: ../../include/diaspora.php:570 +#: ../../include/text.php:1454 +msgid "Item filed" +msgstr "Beitrag abgelegt" + +#: ../../include/diaspora.php:582 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:1911 +#: ../../include/diaspora.php:1969 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/diaspora.php:2094 +#: ../../include/diaspora.php:2152 #, php-format msgid "[Relayed] Comment authored by %s from network %s" msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk" -#: ../../include/network.php:814 +#: ../../include/network.php:817 msgid "view full size" msgstr "Volle Größe anzeigen" -#: ../../include/oembed.php:128 +#: ../../include/oembed.php:132 msgid "Embedded content" msgstr "Eingebetteter Inhalt" -#: ../../include/oembed.php:137 +#: ../../include/oembed.php:141 msgid "Embedding disabled" msgstr "Einbettungen deaktiviert" @@ -5348,135 +5902,115 @@ msgstr "Gruppe bearbeiten" msgid "Create a new group" msgstr "Neue Gruppe erstellen" -#: ../../include/nav.php:44 ../../boot.php:709 +#: ../../include/nav.php:46 ../../boot.php:765 msgid "Logout" msgstr "Abmelden" -#: ../../include/nav.php:44 +#: ../../include/nav.php:46 msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:47 ../../boot.php:1331 +#: ../../include/nav.php:49 ../../boot.php:1403 msgid "Status" msgstr "Status" -#: ../../include/nav.php:47 ../../include/nav.php:111 -msgid "Your posts and conversations" -msgstr "Deine Beiträge und Unterhaltungen" - -#: ../../include/nav.php:48 -msgid "Your profile page" -msgstr "Deine Profilseite" - -#: ../../include/nav.php:49 ../../boot.php:1341 -msgid "Photos" -msgstr "Bilder" - -#: ../../include/nav.php:49 -msgid "Your photos" -msgstr "Deine Fotos" - -#: ../../include/nav.php:50 -msgid "Your events" -msgstr "Deine Ereignisse" - -#: ../../include/nav.php:51 -msgid "Personal notes" -msgstr "Persönliche Notizen" - -#: ../../include/nav.php:51 -msgid "Your personal photos" -msgstr "Deine privaten Fotos" - -#: ../../include/nav.php:62 +#: ../../include/nav.php:64 msgid "Sign in" msgstr "Anmelden" -#: ../../include/nav.php:73 +#: ../../include/nav.php:77 msgid "Home Page" msgstr "Homepage" -#: ../../include/nav.php:77 +#: ../../include/nav.php:81 msgid "Create an account" msgstr "Account erstellen" -#: ../../include/nav.php:82 +#: ../../include/nav.php:86 msgid "Help and documentation" msgstr "Hilfe und Dokumentation" -#: ../../include/nav.php:85 +#: ../../include/nav.php:89 msgid "Apps" msgstr "Apps" -#: ../../include/nav.php:85 +#: ../../include/nav.php:89 msgid "Addon applications, utilities, games" msgstr "Addon Anwendungen, Dienstprogramme, Spiele" -#: ../../include/nav.php:87 +#: ../../include/nav.php:91 msgid "Search site content" msgstr "Inhalt der Seite durchsuchen" -#: ../../include/nav.php:97 +#: ../../include/nav.php:101 msgid "Conversations on this site" msgstr "Unterhaltungen auf dieser Seite" -#: ../../include/nav.php:99 +#: ../../include/nav.php:103 msgid "Directory" msgstr "Verzeichnis" -#: ../../include/nav.php:99 +#: ../../include/nav.php:103 msgid "People directory" msgstr "Nutzerverzeichnis" -#: ../../include/nav.php:109 +#: ../../include/nav.php:113 msgid "Conversations from your friends" msgstr "Unterhaltungen deiner Kontakte" -#: ../../include/nav.php:117 +#: ../../include/nav.php:121 msgid "Friend Requests" msgstr "Kontaktanfragen" -#: ../../include/nav.php:119 +#: ../../include/nav.php:123 msgid "See all notifications" msgstr "Alle Benachrichtigungen anzeigen" -#: ../../include/nav.php:120 +#: ../../include/nav.php:124 msgid "Mark all system notifications seen" msgstr "Markiere alle System-Benachrichtigungen als gelesen" -#: ../../include/nav.php:124 +#: ../../include/nav.php:128 msgid "Private mail" msgstr "Private Email" -#: ../../include/nav.php:127 +#: ../../include/nav.php:129 +msgid "Inbox" +msgstr "Eingang" + +#: ../../include/nav.php:130 +msgid "Outbox" +msgstr "Ausgang" + +#: ../../include/nav.php:134 msgid "Manage" msgstr "Verwalten" -#: ../../include/nav.php:127 +#: ../../include/nav.php:134 msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:131 ../../boot.php:940 +#: ../../include/nav.php:138 ../../boot.php:1002 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:131 ../../boot.php:940 +#: ../../include/nav.php:138 ../../boot.php:1002 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" -#: ../../include/nav.php:132 +#: ../../include/nav.php:139 msgid "Manage/edit friends and contacts" msgstr "Freunde und Kontakte verwalten/editieren" -#: ../../include/nav.php:139 +#: ../../include/nav.php:146 msgid "Admin" msgstr "Administration" -#: ../../include/nav.php:139 +#: ../../include/nav.php:146 msgid "Site setup and configuration" msgstr "Einstellungen der Seite und Konfiguration" -#: ../../include/nav.php:162 +#: ../../include/nav.php:169 msgid "Nothing new here" msgstr "Keine Neuigkeiten." @@ -5492,49 +6026,63 @@ msgstr "Adresse oder Web-Link eingeben" msgid "Example: bob@example.com, http://example.com/barbara" msgstr "Beispiel: bob@example.com, http://example.com/barbara" -#: ../../include/contact_widgets.php:18 -msgid "Invite Friends" -msgstr "Freunde einladen" - -#: ../../include/contact_widgets.php:24 +#: ../../include/contact_widgets.php:22 #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "%d Einladung verfügbar" msgstr[1] "%d Einladungen verfügbar" -#: ../../include/contact_widgets.php:30 +#: ../../include/contact_widgets.php:28 msgid "Find People" msgstr "Leute finden" -#: ../../include/contact_widgets.php:31 +#: ../../include/contact_widgets.php:29 msgid "Enter name or interest" msgstr "Name oder Interessen eingeben" -#: ../../include/contact_widgets.php:32 +#: ../../include/contact_widgets.php:30 msgid "Connect/Follow" msgstr "Verbinden/Folgen" -#: ../../include/contact_widgets.php:33 +#: ../../include/contact_widgets.php:31 msgid "Examples: Robert Morgenstein, Fishing" msgstr "Beispiel: Robert Morgenstein, Angeln" -#: ../../include/contact_widgets.php:36 -msgid "Similar Interests" -msgstr "Ähnliche Interessen" - -#: ../../include/contact_widgets.php:68 +#: ../../include/contact_widgets.php:66 msgid "Networks" msgstr "Netzwerke" -#: ../../include/contact_widgets.php:71 +#: ../../include/contact_widgets.php:69 msgid "All Networks" msgstr "Alle Netzwerke" +#: ../../include/contact_widgets.php:96 +msgid "Saved Folders" +msgstr "Gespeicherte Ordner" + +#: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:127 +msgid "Everything" +msgstr "Alles" + +#: ../../include/contact_widgets.php:124 +msgid "Categories" +msgstr "Kategorien" + #: ../../include/auth.php:29 msgid "Logged out." msgstr "Abgemeldet." +#: ../../include/auth.php:106 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast." + +#: ../../include/auth.php:106 +msgid "The error message was:" +msgstr "Die Fehlermeldung lautete:" + #: ../../include/datetime.php:43 ../../include/datetime.php:45 msgid "Miscellaneous" msgstr "Verschiedenes" @@ -5608,232 +6156,232 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: ../../include/poller.php:513 +#: ../../include/poller.php:533 msgid "From: " msgstr "Von: " -#: ../../include/bbcode.php:202 +#: ../../include/bbcode.php:203 ../../include/bbcode.php:223 msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: ../../include/bbcode.php:216 ../../include/bbcode.php:282 +#: ../../include/bbcode.php:237 ../../include/bbcode.php:303 msgid "Image/photo" msgstr "Bild/Foto" -#: ../../include/dba.php:39 +#: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln." -#: ../../include/message.php:14 +#: ../../include/message.php:15 ../../include/message.php:171 msgid "[no subject]" msgstr "[kein Betreff]" -#: ../../include/acl_selectors.php:284 +#: ../../include/acl_selectors.php:286 msgid "Visible to everybody" msgstr "Für jeden sichtbar" -#: ../../include/acl_selectors.php:285 +#: ../../include/acl_selectors.php:287 msgid "show" msgstr "zeigen" -#: ../../include/acl_selectors.php:286 +#: ../../include/acl_selectors.php:288 msgid "don't show" msgstr "nicht zeigen" -#: ../../include/enotify.php:8 +#: ../../include/enotify.php:14 msgid "Friendica Notification" msgstr "Friendica-Benachrichtigung" -#: ../../include/enotify.php:11 +#: ../../include/enotify.php:17 msgid "Thank You," msgstr "Danke," -#: ../../include/enotify.php:13 +#: ../../include/enotify.php:19 #, php-format msgid "%s Administrator" msgstr "der Administrator von %s" -#: ../../include/enotify.php:29 +#: ../../include/enotify.php:35 #, php-format msgid "%s <!item_type!>" msgstr "%s <!item_type!>" -#: ../../include/enotify.php:33 +#: ../../include/enotify.php:39 #, php-format msgid "[Friendica:Notify] New mail received at %s" msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s" -#: ../../include/enotify.php:35 +#: ../../include/enotify.php:41 #, php-format msgid "%s sent you a new private message at %s." msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben." -#: ../../include/enotify.php:36 +#: ../../include/enotify.php:42 #, php-format msgid "%s sent you %s." msgstr "%s hat Dir geschickt %s" -#: ../../include/enotify.php:36 +#: ../../include/enotify.php:42 msgid "a private message" msgstr "eine private Nachricht" -#: ../../include/enotify.php:37 +#: ../../include/enotify.php:43 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten." -#: ../../include/enotify.php:67 +#: ../../include/enotify.php:73 #, php-format msgid "%s's" msgstr "%s's" -#: ../../include/enotify.php:71 +#: ../../include/enotify.php:77 msgid "your" msgstr "Dein" -#: ../../include/enotify.php:78 +#: ../../include/enotify.php:84 #, php-format msgid "[Friendica:Notify] Comment to conversation #%d by %s" msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d von %s" -#: ../../include/enotify.php:79 +#: ../../include/enotify.php:85 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "%s hat einen Beitrag kommentiert, dem du folgst." -#: ../../include/enotify.php:80 +#: ../../include/enotify.php:86 #, php-format msgid "%s commented on %s." msgstr "%s kommentierte %s." -#: ../../include/enotify.php:82 ../../include/enotify.php:95 -#: ../../include/enotify.php:106 ../../include/enotify.php:117 +#: ../../include/enotify.php:88 ../../include/enotify.php:101 +#: ../../include/enotify.php:112 ../../include/enotify.php:123 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren." -#: ../../include/enotify.php:89 +#: ../../include/enotify.php:95 #, php-format msgid "[Friendica:Notify] %s posted to your profile wall" msgstr "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben" -#: ../../include/enotify.php:91 +#: ../../include/enotify.php:97 #, php-format msgid "%s posted to your profile wall at %s" msgstr "%s hat auf deine Pinnwand bei %s gepostet" -#: ../../include/enotify.php:93 +#: ../../include/enotify.php:99 #, php-format msgid "%s posted to %s" msgstr "%s schrieb an %s" -#: ../../include/enotify.php:93 +#: ../../include/enotify.php:99 msgid "your profile wall." msgstr "Deine Pinnwand" -#: ../../include/enotify.php:102 +#: ../../include/enotify.php:108 #, php-format msgid "[Friendica:Notify] %s tagged you" msgstr "[Friendica Meldung] %s hat Dich erwähnt" -#: ../../include/enotify.php:103 +#: ../../include/enotify.php:109 #, php-format msgid "%s tagged you at %s" msgstr "%s hat dich auf %s erwähnt" -#: ../../include/enotify.php:104 +#: ../../include/enotify.php:110 #, php-format msgid "%s %s." msgstr "%s %s." -#: ../../include/enotify.php:104 +#: ../../include/enotify.php:110 msgid "tagged you" msgstr "erwähnte Dich" -#: ../../include/enotify.php:113 +#: ../../include/enotify.php:119 #, php-format msgid "[Friendica:Notify] %s tagged your post" msgstr "[Friendica Meldung] %s markierte Deinen Beitrag" -#: ../../include/enotify.php:114 +#: ../../include/enotify.php:120 #, php-format msgid "%s tagged your post at %s" msgstr "%s hat deinen Beitrag auf %s getaggt" -#: ../../include/enotify.php:115 +#: ../../include/enotify.php:121 #, php-format msgid "%s tagged %s" msgstr "%s markierte %s" -#: ../../include/enotify.php:115 +#: ../../include/enotify.php:121 msgid "your post" msgstr "Dein Beitrag" -#: ../../include/enotify.php:124 +#: ../../include/enotify.php:130 msgid "[Friendica:Notify] Introduction received" msgstr "[Friendica Meldung] Kontaktanfrage erhalten" -#: ../../include/enotify.php:125 +#: ../../include/enotify.php:131 #, php-format msgid "You've received an introduction from '%s' at %s" msgstr "Du hast eine Kontaktanfrage von '%s' auf %s erhalten" -#: ../../include/enotify.php:126 +#: ../../include/enotify.php:132 #, php-format msgid "You've received %s from %s." msgstr "Du hast %s von %s erhalten." -#: ../../include/enotify.php:126 +#: ../../include/enotify.php:132 msgid "an introduction" -msgstr "eine Einführung" +msgstr "eine Kontaktanfrage" -#: ../../include/enotify.php:127 ../../include/enotify.php:144 +#: ../../include/enotify.php:133 ../../include/enotify.php:150 #, php-format msgid "You may visit their profile at %s" msgstr "Hier kannst du das Profil betrachten: %s" -#: ../../include/enotify.php:129 +#: ../../include/enotify.php:135 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen." -#: ../../include/enotify.php:136 +#: ../../include/enotify.php:142 msgid "[Friendica:Notify] Friend suggestion received" msgstr "[Friendica Meldung] Kontaktvorschlag erhalten" -#: ../../include/enotify.php:137 +#: ../../include/enotify.php:143 #, php-format msgid "You've received a friend suggestion from '%s' at %s" msgstr "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s" -#: ../../include/enotify.php:138 +#: ../../include/enotify.php:144 #, php-format msgid "You've received %s for %s from %s." msgstr "Du hast %s für %s von %s erhalten." -#: ../../include/enotify.php:139 +#: ../../include/enotify.php:145 msgid "a friend suggestion" msgstr "ein Freunde Vorschlag" -#: ../../include/enotify.php:142 +#: ../../include/enotify.php:148 msgid "Name:" msgstr "Name:" -#: ../../include/enotify.php:143 +#: ../../include/enotify.php:149 msgid "Photo:" msgstr "Foto:" -#: ../../include/enotify.php:146 +#: ../../include/enotify.php:152 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen." -#: ../../include/items.php:2573 +#: ../../include/items.php:2656 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:2573 +#: ../../include/items.php:2656 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " @@ -5842,37 +6390,43 @@ msgstr "Du hast einen neuen Kontakt auf " msgid "image/photo" msgstr "Bild/Foto" -#: ../../include/security.php:20 +#: ../../include/security.php:21 msgid "Welcome " msgstr "Willkommen " -#: ../../include/security.php:21 +#: ../../include/security.php:22 msgid "Please upload a profile photo." msgstr "Bitte lade ein Profilbild hoch." -#: ../../include/security.php:24 +#: ../../include/security.php:25 msgid "Welcome back " msgstr "Willkommen zurück " -#: ../../include/Contact.php:131 ../../include/conversation.php:788 +#: ../../include/security.php:329 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before subitting it." +msgstr "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde." + +#: ../../include/Contact.php:137 ../../include/conversation.php:813 msgid "View status" msgstr "Status anzeigen" -#: ../../include/Contact.php:132 ../../include/conversation.php:789 +#: ../../include/Contact.php:138 ../../include/conversation.php:814 msgid "View profile" msgstr "Profil anzeigen" -#: ../../include/Contact.php:133 ../../include/conversation.php:790 +#: ../../include/Contact.php:139 ../../include/conversation.php:815 msgid "View photos" msgstr "Fotos ansehen" -#: ../../include/Contact.php:134 ../../include/Contact.php:147 -#: ../../include/conversation.php:791 +#: ../../include/Contact.php:140 ../../include/Contact.php:153 +#: ../../include/conversation.php:816 msgid "View recent" msgstr "Neueste anzeigen" -#: ../../include/Contact.php:136 ../../include/Contact.php:147 -#: ../../include/conversation.php:793 +#: ../../include/Contact.php:142 ../../include/Contact.php:153 +#: ../../include/conversation.php:818 msgid "Send PM" msgstr "Private Nachricht senden" @@ -5885,36 +6439,32 @@ 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:303 ../../include/conversation.php:572 +#: ../../include/conversation.php:317 ../../include/conversation.php:575 msgid "Select" msgstr "Auswählen" -#: ../../include/conversation.php:320 ../../include/conversation.php:665 -#: ../../include/conversation.php:666 +#: ../../include/conversation.php:334 ../../include/conversation.php:672 +#: ../../include/conversation.php:673 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." -#: ../../include/conversation.php:330 ../../include/conversation.php:677 +#: ../../include/conversation.php:344 ../../include/conversation.php:684 #, php-format msgid "%s from %s" msgstr "%s von %s" -#: ../../include/conversation.php:346 +#: ../../include/conversation.php:360 msgid "View in context" msgstr "Im Zusammenhang betrachten" -#: ../../include/conversation.php:467 +#: ../../include/conversation.php:465 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d Kommentar" msgstr[1] "%d Kommentare" -#: ../../include/conversation.php:468 ../../boot.php:448 -msgid "show more" -msgstr "mehr anzeigen" - #: ../../include/conversation.php:529 msgid "like" msgstr "mag ich" @@ -5931,205 +6481,209 @@ msgstr "Teile dieses" msgid "share" msgstr "Teilen" -#: ../../include/conversation.php:582 +#: ../../include/conversation.php:588 msgid "add star" msgstr "markieren" -#: ../../include/conversation.php:583 +#: ../../include/conversation.php:589 msgid "remove star" msgstr "Markierung entfernen" -#: ../../include/conversation.php:584 +#: ../../include/conversation.php:590 msgid "toggle star status" msgstr "Markierung umschalten" -#: ../../include/conversation.php:587 +#: ../../include/conversation.php:593 msgid "starred" msgstr "markiert" -#: ../../include/conversation.php:588 +#: ../../include/conversation.php:594 msgid "add tag" msgstr "Tag hinzufügen" -#: ../../include/conversation.php:667 +#: ../../include/conversation.php:598 +msgid "save to folder" +msgstr "In Ordner speichern" + +#: ../../include/conversation.php:674 msgid "to" msgstr "zu" -#: ../../include/conversation.php:668 +#: ../../include/conversation.php:675 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:676 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" -#: ../../include/conversation.php:713 +#: ../../include/conversation.php:721 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:872 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:872 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:849 +#: ../../include/conversation.php:876 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "<span %1$s>%2$d Leute</span> mögen das." -#: ../../include/conversation.php:851 +#: ../../include/conversation.php:878 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "<span %1$s>%2$d Leute</span> mögen das nicht." -#: ../../include/conversation.php:857 +#: ../../include/conversation.php:884 msgid "and" msgstr "und" -#: ../../include/conversation.php:860 +#: ../../include/conversation.php:887 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:861 +#: ../../include/conversation.php:888 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:861 +#: ../../include/conversation.php:888 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:886 +#: ../../include/conversation.php:913 msgid "Visible to <strong>everybody</strong>" msgstr "Für <strong>jedermann</strong> sichtbar" -#: ../../include/conversation.php:888 +#: ../../include/conversation.php:915 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:889 +#: ../../include/conversation.php:916 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:890 +#: ../../include/conversation.php:917 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:891 +#: ../../include/conversation.php:919 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:892 -msgid "Enter a title for this item" -msgstr "Gib den Titel für diesen Beitrag ein" - -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:962 msgid "upload photo" msgstr "Bild hochladen" -#: ../../include/conversation.php:937 +#: ../../include/conversation.php:964 msgid "attach file" msgstr "Datei anhängen" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:966 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:940 +#: ../../include/conversation.php:967 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:968 msgid "video link" msgstr "Video-Link" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:969 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:970 msgid "audio link" msgstr "Audio-Link" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:972 msgid "set location" msgstr "Ort setzen" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:974 msgid "clear location" msgstr "Ort löschen" -#: ../../include/conversation.php:952 +#: ../../include/conversation.php:981 msgid "permissions" msgstr "Zugriffsrechte" -#: ../../boot.php:446 +#: ../../boot.php:493 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:449 +#: ../../boot.php:496 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:692 +#: ../../boot.php:744 msgid "Create a New Account" msgstr "Neuen Account erstellen" -#: ../../boot.php:712 +#: ../../boot.php:768 msgid "Nickname or Email address: " msgstr "Spitzname oder Email-Adresse: " -#: ../../boot.php:713 +#: ../../boot.php:769 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:716 +#: ../../boot.php:772 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:722 +#: ../../boot.php:778 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:879 +#: ../../boot.php:935 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1046 ../../boot.php:1117 +#: ../../boot.php:994 +msgid "Message" +msgstr "Nachricht" + +#: ../../boot.php:1109 ../../boot.php:1180 msgid "g A l F d" msgstr "l. d, F G \\U\\h\\\\r" -#: ../../boot.php:1047 ../../boot.php:1118 +#: ../../boot.php:1110 ../../boot.php:1181 msgid "F d" msgstr "d. F" -#: ../../boot.php:1072 +#: ../../boot.php:1135 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1073 +#: ../../boot.php:1136 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1096 ../../boot.php:1160 +#: ../../boot.php:1159 ../../boot.php:1223 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1141 +#: ../../boot.php:1204 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1142 +#: ../../boot.php:1205 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1154 +#: ../../boot.php:1217 msgid "[No description]" msgstr "[keine Beschreibung]" diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl index d5e8d9048..d5e8d9048 100755..100644 --- a/view/de/passchanged_eml.tpl +++ b/view/de/passchanged_eml.tpl diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl index d27c3c743..d27c3c743 100755..100644 --- a/view/de/register_open_eml.tpl +++ b/view/de/register_open_eml.tpl diff --git a/view/de/register_verify_eml.tpl b/view/de/register_verify_eml.tpl index 7ae432d61..7ae432d61 100755..100644 --- a/view/de/register_verify_eml.tpl +++ b/view/de/register_verify_eml.tpl diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl index 55fa98e96..55fa98e96 100755..100644 --- a/view/de/request_notify_eml.tpl +++ b/view/de/request_notify_eml.tpl diff --git a/view/de/strings.php b/view/de/strings.php index c9cd91138..28567396b 100755..100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -26,7 +26,6 @@ $a->strings["New photo from this URL"] = "Neues Foto von dieser URL"; $a->strings["Submit"] = "Senden"; $a->strings["Help:"] = "Hilfe:"; $a->strings["Help"] = "Hilfe"; -$a->strings["Help or @NewHere ?"] = "Hilfe oder @NeuHier"; $a->strings["Not Found"] = "Nicht gefunden"; $a->strings["Page not found."] = "Seite nicht gefunden."; $a->strings["File exceeds size limit of %d"] = "Die Datei ist größer als das erlaubte Limit von %d"; @@ -121,18 +120,15 @@ $a->strings["running at web location"] = "die unter folgender Webadresse zu find $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren."; $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche"; $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com"; -$a->strings["Installed plugins/addons/apps"] = "Installierte Plugins/Erweiterungen/Apps"; +$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Erweiterungen/Apps"; $a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/Apps installiert"; $a->strings["Item not found"] = "Beitrag nicht gefunden"; $a->strings["Edit post"] = "Beitrag bearbeiten"; $a->strings["Post to Email"] = "An E-Mail senden"; -$a->strings["PostIt to Friendica"] = "Teile mit Friendica"; -$a->strings["Post to Friendica"] = "Teile mit Friendica"; -$a->strings[" from anywhere by bookmarking this Link."] = " von überall her, indem du diesen Link zu deinen Lesezeichen hinzufügst."; $a->strings["Edit"] = "Bearbeiten"; $a->strings["Upload photo"] = "Foto hochladen"; $a->strings["Attach file"] = "Datei anhängen"; -$a->strings["Insert web link"] = "Weblink einfügen"; +$a->strings["Insert web link"] = "eine Kontaktanfrage"; $a->strings["Insert YouTube video"] = "YouTube-Video einfügen"; $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen"; $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen"; @@ -142,6 +138,7 @@ $a->strings["Permission settings"] = "Berechtigungseinstellungen"; $a->strings["CC: email addresses"] = "Cc:-E-Mail-Addressen"; $a->strings["Public post"] = "Öffentlicher Beitrag"; $a->strings["Set title"] = "Titel setzen"; +$a->strings["Categories (comma-separated list)"] = "Kategorien (mit Komma separierte Liste)"; $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; $a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung."; @@ -171,8 +168,9 @@ $a->strings["Welcome home %s."] = "Willkommen zurück %s."; $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s."; $a->strings["Confirm"] = "Bestätigen"; $a->strings["[Name Withheld]"] = "[Name unterdrückt]"; -$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "Diaspora-User: Bitte nicht dieses Formular benutzen! Gebt statt dessen \"%s\" in der Diaspora-Suchleiste ein."; -$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"; +$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:"; +$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "<strike>Als E-Mail-Kontakt verbinden</strike> (In Kürze verfügbar)"; +$a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"http://dir.friendica.com/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten."; $a->strings["Friend/Connection Request"] = "Freundschafts-/Kontaktanfrage"; $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; $a->strings["Please answer the following:"] = "Bitte beantworte Folgendes:"; @@ -181,7 +179,7 @@ $a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:"; $a->strings["Friendica"] = "Friendica"; $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; $a->strings["Diaspora"] = "Diaspora"; -$a->strings["- please share from your own site as noted above"] = "- bitte fange von Deiner eigenen Seite aus zu teilen an"; +$a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste."; $a->strings["Your Identity Address:"] = "Adresse deines Profils:"; $a->strings["Submit Request"] = "Anfrage abschicken"; $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; @@ -214,7 +212,7 @@ $a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Exec $a->strings["Command line PHP"] = "Kommandozeilen-PHP"; $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["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"; @@ -248,7 +246,6 @@ $a->strings["Profile Match"] = "Profilübereinstimmungen"; $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Standardprofil hinzu."; $a->strings["is interested in:"] = "ist interessiert an:"; $a->strings["Connect"] = "Verbinden"; -$a->strings["Connect Services"] = "Verbinde Dienste"; $a->strings["No matches"] = "Keine Ãœbereinstimmungen"; $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar."; $a->strings["Visible to:"] = "Sichtbar für:"; @@ -339,6 +336,7 @@ $a->strings["Update now"] = "Jetzt aktualisieren"; $a->strings["Currently blocked"] = "Derzeit geblockt"; $a->strings["Currently ignored"] = "Derzeit ignoriert"; $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["Suggestions"] = "Kontaktvorschläge"; $a->strings["All Contacts"] = "Alle Kontakte"; $a->strings["Unblocked Contacts"] = "Nicht blockierte Kontakte"; $a->strings["Blocked Contacts"] = "Blockierte Kontakte"; @@ -381,6 +379,7 @@ $a->strings[" Not valid email."] = " Keine gültige E-Mail."; $a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. "; $a->strings["Settings updated."] = "Einstellungen aktualisiert."; $a->strings["Account settings"] = "Account Einstellungen"; +$a->strings["Display settings"] = "Anzeige Einstellungen"; $a->strings["Connector settings"] = "Connector-Einstellungen"; $a->strings["Plugin settings"] = "Plugin-Einstellungen"; $a->strings["Connections"] = "Verbindungen"; @@ -418,6 +417,13 @@ $a->strings["Action after import:"] = "Aktion nach Import:"; $a->strings["Mark as seen"] = "Als gelesen markieren"; $a->strings["Move to folder"] = "In einen Ordner verschieben"; $a->strings["Move to folder:"] = "In diesen Ordner verschieben:"; +$a->strings["Display Settings"] = "Anzeige Einstellungen"; +$a->strings["Display Theme:"] = "Theme:"; +$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; +$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum"; +$a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: "; +$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge"; +$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen"; $a->strings["Normal Account"] = "Normaler Account"; $a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil"; $a->strings["Soapbox Account"] = "Sandkasten-Account"; @@ -435,6 +441,7 @@ $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details $a->strings["Allow friends to post to your profile page?"] = "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?"; $a->strings["Allow friends to tag your posts?"] = "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?"; $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?"; +$a->strings["Permit unknown people to send you private mail?"] = "Erlaube es Unbekannten dir private Nachrichten zu schicken?"; $a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>."; $a->strings["or"] = "oder"; $a->strings["Your Identity Address is"] = "Die Adresse deines Profils lautet:"; @@ -457,14 +464,12 @@ $a->strings["Email Address:"] = "Emailadresse:"; $a->strings["Your Timezone:"] = "Deine Zeitzone:"; $a->strings["Default Post Location:"] = "Standardstandort:"; $a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:"; -$a->strings["Display Theme:"] = "Theme:"; -$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; -$a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum"; $a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen"; $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Freundschaftsanfragen/Tag:"; $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["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"; $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:"; $a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst"; @@ -473,7 +478,7 @@ $a->strings["Someone writes on your profile wall"] = "- jemand etwas auf deine P $a->strings["Someone writes a followup comment"] = "- jemand auch einen Kommentar verfasst"; $a->strings["You receive a private message"] = "- du eine private Nachricht erhältst"; $a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst"; -$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest"; +$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag erwähnt."; $a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen"; $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten"; $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast."; @@ -486,7 +491,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare"; $a->strings["Posted Order"] = "Neueste Beiträge"; $a->strings["New"] = "Neue"; $a->strings["Starred"] = "Markierte"; -$a->strings["Bookmarks"] = "Lesezeichen"; +$a->strings["Shared Links"] = "Geteilte Links"; $a->strings["Warning: This group contains %s member from an insecure network."] = array( 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem unsicheren Netzwerk.", 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.", @@ -500,9 +505,23 @@ $a->strings["Private messages to this person are at risk of public disclosure."] $a->strings["Invalid contact."] = "Ungültiger Kontakt."; $a->strings["Personal Notes"] = "Persönliche Notizen"; $a->strings["Save"] = "Speichern"; +$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."; +$a->strings["No recipient selected."] = "Kein Empfänger gewählt."; +$a->strings["Unable to check your home location."] = "Konnte deinen Heimatort nicht bestimmen."; +$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden."; +$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen."; +$a->strings["Message sent."] = "Nachricht gesendet."; +$a->strings["No recipient."] = "Kein Empfänger."; +$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:"; +$a->strings["Send Private Message"] = "Private Nachricht senden"; +$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."; +$a->strings["To:"] = "An:"; +$a->strings["Subject:"] = "Betreff:"; +$a->strings["Your message:"] = "Deine Nachricht:"; $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica"; $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder"; $a->strings["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."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."; +$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst."; $a->strings["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."] = "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen."; $a->strings["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."] = "Ãœberprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."; $a->strings["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."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."; @@ -549,6 +568,7 @@ $a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse."; $a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden."; $a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen."; $a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; +$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; $a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; @@ -606,26 +626,23 @@ $a->strings["No profile"] = "Kein Profil"; $a->strings["Remove My Account"] = "Account löschen"; $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit, ihn wiederherzustellen."; $a->strings["Please enter your password for verification:"] = "Bitte gib dein Passwort zur Verifikation ein:"; -$a->strings["No recipient selected."] = "Kein Empfänger gewählt."; -$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; -$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden."; -$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen."; -$a->strings["Message sent."] = "Nachricht gesendet."; -$a->strings["Inbox"] = "Eingang"; -$a->strings["Outbox"] = "Ausgang"; $a->strings["New Message"] = "Neue Nachricht"; +$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; $a->strings["Message deleted."] = "Nachricht gelöscht."; $a->strings["Conversation removed."] = "Unterhaltung gelöscht."; -$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:"; -$a->strings["Send Private Message"] = "Private Nachricht senden"; -$a->strings["To:"] = "An:"; -$a->strings["Subject:"] = "Betreff:"; -$a->strings["Your message:"] = "Deine Nachricht:"; $a->strings["No messages."] = "Keine Nachrichten."; +$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s"; +$a->strings["You and %s"] = "Du und %s"; +$a->strings["%s and You"] = "%s und Du"; $a->strings["Delete conversation"] = "Unterhaltung löschen"; $a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A"; +$a->strings["%d message"] = array( + 0 => "%d Nachricht", + 1 => "%d Nachrichten", +); $a->strings["Message not available."] = "Nachricht nicht verfügbar."; $a->strings["Delete message"] = "Nachricht löschen"; +$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst du auf der Profilseite des Absenders antworten."; $a->strings["Send Reply"] = "Antwort senden"; $a->strings["Friends of %s"] = "Freunde von %s"; $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen."; @@ -645,6 +662,9 @@ $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert."; $a->strings["Closed"] = "Geschlossen"; $a->strings["Requires approval"] = "Bedarf der Zustimmung"; $a->strings["Open"] = "Offen"; +$a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"; +$a->strings["Force all links to use SSL"] = "SSL für alle Links erzwingen"; +$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"; $a->strings["File upload"] = "Datei hochladen"; $a->strings["Policies"] = "Regeln"; $a->strings["Advanced"] = "Erweitert"; @@ -653,6 +673,8 @@ $a->strings["Banner/Logo"] = "Banner/Logo"; $a->strings["System language"] = "Systemsprache"; $a->strings["System theme"] = "Systemweites Thema"; $a->strings["Default system theme - may be over-ridden by user profiles"] = "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden."; +$a->strings["SSL link policy"] = "Regeln für SSL Links"; +$a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen"; $a->strings["Maximum image size"] = "Maximale Größe von Bildern"; $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."; $a->strings["Register policy"] = "Registrierungsmethode"; @@ -681,7 +703,6 @@ $a->strings["Force users to register with a space between firstname and lastname $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke"; $a->strings["Use PHP UTF8 regular expressions"] = "PHP UTF8 Ausdrücke verwenden"; $a->strings["Show Community Page"] = "Gemeinschaftsseite anzeigen"; -$a->strings["Community Pages"] = "Foren"; $a->strings["Display a Community page showing all recent public postings on this site."] = "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server."; $a->strings["Enable OStatus support"] = "OStatus Unterstützung aktivieren"; $a->strings["Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt."; @@ -727,6 +748,7 @@ $a->strings["Settings"] = "Einstellungen"; $a->strings["Author: "] = "Autor:"; $a->strings["Maintainer: "] = "Betreuer:"; $a->strings["No themes found."] = "Keine Themen gefunden."; +$a->strings["Screenshot"] = "Bildschirmfoto"; $a->strings["[Experimental]"] = "[Experimentell]"; $a->strings["[Unsupported]"] = "[Nicht unterstützt]"; $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert."; @@ -753,6 +775,8 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet"; $a->strings["{0} posted"] = "{0} hat etwas veröffentlicht"; $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"; $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt"; +$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben."; +$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet."; $a->strings["Login failed."] = "Annmeldung fehlgeschlagen."; $a->strings["Connect URL missing."] = "Connect-URL fehlt"; $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; @@ -823,6 +847,8 @@ $a->strings["Create New Profile"] = "Neues Profil anlegen"; $a->strings["Profile Image"] = "Profilbild"; $a->strings["visible to everybody"] = "sichtbar für jeden"; $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; +$a->strings["Save to Folder:"] = "In diesen Ordner verschieben:"; +$a->strings["- select -"] = "- auswählen -"; $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt"; $a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden."; $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; @@ -836,27 +862,28 @@ $a->strings["Friend Suggestions"] = "Kontaktvorschläge"; $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen"; $a->strings["Global Directory"] = "Weltweites Verzeichnis"; -$a->strings["Local Directory"] = "Lokales Verzeichnis"; -$a->strings["Normal site view"] = "Normale Seitenansicht"; -$a->strings["Admin - View all site entries"] = "Admin: Alle Einträge dieses Servers anzeigen"; $a->strings["Find on this site"] = "Auf diesem Server suchen"; $a->strings["Site Directory"] = "Verzeichnis"; $a->strings["Gender: "] = "Geschlecht:"; $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein)."; $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse."; -$a->strings["Please join my network on %s"] = "Bitte trete meinem Netzwerk auf %s bei"; +$a->strings["Please join us on Friendica"] = "Bitte trete uns auf Friendica bei"; $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen."; $a->strings["%d message sent."] = array( 0 => "%d Nachricht gesendet.", 1 => "%d Nachrichten gesendet.", ); $a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen"; +$a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."; +$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Freundschaftsanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website."; +$a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst."; +$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."; $a->strings["Send invitations"] = "Einladungen senden"; $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:"; -$a->strings["Please join my social network on %s"] = "Bitte trete meinem Sozialen Netzwerk auf %s bei"; -$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen besuche bitte:"; +$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."; $a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code"; $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"; +$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendica.com"; $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."; $a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich."; $a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: "; @@ -891,13 +918,30 @@ $a->strings["On this website your Facebook profile wall conversations will only $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren"; $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."; $a->strings["Comma separated applications to ignore"] = "Komma separiert Anwendungen, die ignoriert werden sollen"; +$a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates"; $a->strings["Facebook"] = "Facebook"; $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen"; +$a->strings["Facebook API Key"] = "Facebook API Schlüssel"; +$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>"; +$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."; +$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."; +$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; +$a->strings["App-ID / API-Key"] = "App-ID / API-Key"; +$a->strings["Application secret"] = "Anwendungs-Geheimnis"; +$a->strings["Polling Interval (min. %1\$s minutes)"] = "Abrufintervall (min. %1\$s Minuten)"; +$a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen"; +$a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert."; +$a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren"; +$a->strings["Real-Time Updates not activated."] = "Echtzeit-Updates nicht aktiviert."; +$a->strings["Activate Real-Time Updates"] = "Echtzeit-Updates aktivieren"; +$a->strings["The new values have been saved."] = "Die neuen Einstellungen wurden gespeichert."; $a->strings["Post to Facebook"] = "Bei Facebook veröffentlichen"; $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen."; -$a->strings["Image: "] = "Bild: "; $a->strings["View on Friendica"] = "In Friendica betrachten"; $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."; +$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."; +$a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden"; +$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3\$sden Facebook-Connector neu Authentifizieren%4\$s."; $a->strings["link"] = "Verweis"; $a->strings["%d person likes this"] = array( 0 => "%d Person mag das", @@ -923,20 +967,21 @@ $a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivie $a->strings["LiveJournal username"] = "LiveJournal Benutzername"; $a->strings["LiveJournal password"] = "LiveJournal Passwort"; $a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen"; -$a->strings["\"Not Safe For Work\" Settings"] = "\"Not Safe For Work\"-Einstellungen"; -$a->strings["Enable NSFW filter"] = "NSFW Filter aktivieren"; -$a->strings["Comma separated words to treat as NSFW"] = "Wörter, die gefiltert werden sollen (durch Kommas getrennt)"; +$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:"; +$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."; +$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter"; +$a->strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen"; $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden"; $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert"; $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken"; +$a->strings["Forums"] = "Foren"; $a->strings["Login"] = "Anmeldung"; $a->strings["OpenID"] = "OpenID"; -$a->strings["Last users"] = "Letzte Nutzer"; +$a->strings["Latest users"] = "Letzte Benutzer"; $a->strings["Most active users"] = "Aktivste Nutzer"; -$a->strings["Last photos"] = "Letzte Fotos"; -$a->strings["Last likes"] = "Zuletzt gemocht"; +$a->strings["Latest photos"] = "Neueste Fotos"; +$a->strings["Latest likes"] = "Neueste Favoriten"; $a->strings["event"] = "Veranstaltung"; -$a->strings["Latest users"] = "Letzte Benutzer"; $a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"; $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})"; $a->strings["OAuth end-point"] = "OAuth end-point"; @@ -1016,6 +1061,12 @@ $a->strings["Editplain Settings"] = "Editplain Einstellungen"; $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren"; $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen"; $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert."; +$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten."; +$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen"; +$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren"; +$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername"; +$a->strings["InsaneJournal password"] = "InsaneJournal Passwort"; +$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten."; $a->strings["View Source"] = "Quelle ansehen"; $a->strings["Post to StatusNet"] = "Bei StatusNet veröffentlichen"; $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Bitte kontaktiere den Administrator des Servers.<br />Die angegebene API-URL ist nicht gültig."; @@ -1040,6 +1091,7 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben"; $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"; +$a->strings["Send #tag links to StatusNet"] = "#Tags nach StatusNet senden"; $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; $a->strings["API URL"] = "API-URL"; $a->strings["Post to Tumblr"] = "Bei Tumblr veröffentlichen"; @@ -1067,7 +1119,7 @@ $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen"; $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\""; $a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"; $a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert."; -$a->strings["Show More"] = "\"Mehr zeigen\""; +$a->strings["show more"] = "mehr anzeigen"; $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."; $a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out)."; $a->strings["Piwik Base URL"] = "Piwik Basis URL"; @@ -1086,19 +1138,43 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; +$a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden"; $a->strings["Consumer key"] = "Consumer Key"; $a->strings["Consumer secret"] = "Consumer Secret"; -$a->strings["irc Chatroom"] = "irc Chatroom"; +$a->strings["IRC Chatroom"] = "IRC Chatraum"; +$a->strings["Popular Channels"] = "Beliebte Räume"; $a->strings["Post to Posterous"] = "Nach Posterous senden"; $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen"; $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren"; $a->strings["Posterous login"] = "Posterous-Anmeldename"; $a->strings["Posterous password"] = "Posterous-Passwort"; $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"; +$a->strings["Last users"] = "Letzte Nutzer"; +$a->strings["Last likes"] = "Zuletzt gemocht"; +$a->strings["Last photos"] = "Letzte Fotos"; +$a->strings["Find Friends"] = "Freunde finden"; +$a->strings["Local Directory"] = "Lokales Verzeichnis"; +$a->strings["Similar Interests"] = "Ähnliche Interessen"; +$a->strings["Invite Friends"] = "Freunde einladen"; +$a->strings["Community Pages"] = "Foren"; +$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere"; +$a->strings["Connect Services"] = "Verbinde Dienste"; +$a->strings["PostIt to Friendica"] = "PostIt nach Friendica"; +$a->strings["Post to Friendica"] = "Bei Friendica veröffentlichen"; +$a->strings[" from anywhere by bookmarking this Link."] = " von überall her indem du diesen Link zu deinen Lesezeichen hinzufügst."; +$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; +$a->strings["Your profile page"] = "Deine Profilseite"; +$a->strings["Your contacts"] = "Deine Kontakte"; +$a->strings["Photos"] = "Bilder"; +$a->strings["Your photos"] = "Deine Fotos"; +$a->strings["Your events"] = "Deine Ereignisse"; +$a->strings["Personal notes"] = "Persönliche Notizen"; +$a->strings["Your personal photos"] = "Deine privaten Fotos"; $a->strings["Theme settings"] = "Themen Einstellungen"; $a->strings["Alignment"] = "Ausrichtung"; $a->strings["Left"] = "Links"; $a->strings["Center"] = "Mitte"; +$a->strings["Color scheme"] = "Farbschema"; $a->strings["Gender:"] = "Geschlecht:"; $a->strings["j F, Y"] = "j F, Y"; $a->strings["j F"] = "j F"; @@ -1171,7 +1247,6 @@ $a->strings["Dating"] = "Dating"; $a->strings["Unfaithful"] = "Untreu"; $a->strings["Sex Addict"] = "Sexbesessen"; $a->strings["Friends"] = "Freunde"; -$a->strings["Find Friends"] = "Freunde finden"; $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen"; $a->strings["Casual"] = "Casual"; $a->strings["Engaged"] = "Verlobt"; @@ -1224,11 +1299,17 @@ $a->strings["October"] = "Oktober"; $a->strings["November"] = "November"; $a->strings["December"] = "Dezember"; $a->strings["bytes"] = "Byte"; +$a->strings["Categories:"] = "Kategorien:"; +$a->strings["remove"] = "löschen"; +$a->strings["[remove]"] = "[löschen]"; +$a->strings["Filed under:"] = "Abgelegt unter:"; +$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken"; $a->strings["Select an alternate language"] = "Alternative Sprache auswählen"; $a->strings["default"] = "standard"; $a->strings["activity"] = "Aktivität"; $a->strings["comment"] = "Kommentar"; $a->strings["post"] = "Beitrag"; +$a->strings["Item filed"] = "Beitrag abgelegt"; $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; $a->strings["Attachments:"] = "Anhänge:"; $a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"; @@ -1244,13 +1325,6 @@ $a->strings["Create a new group"] = "Neue Gruppe erstellen"; $a->strings["Logout"] = "Abmelden"; $a->strings["End this session"] = "Diese Sitzung beenden"; $a->strings["Status"] = "Status"; -$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; -$a->strings["Your profile page"] = "Deine Profilseite"; -$a->strings["Photos"] = "Bilder"; -$a->strings["Your photos"] = "Deine Fotos"; -$a->strings["Your events"] = "Deine Ereignisse"; -$a->strings["Personal notes"] = "Persönliche Notizen"; -$a->strings["Your personal photos"] = "Deine privaten Fotos"; $a->strings["Sign in"] = "Anmelden"; $a->strings["Home Page"] = "Homepage"; $a->strings["Create an account"] = "Account erstellen"; @@ -1266,6 +1340,8 @@ $a->strings["Friend Requests"] = "Kontaktanfragen"; $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; $a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gelesen"; $a->strings["Private mail"] = "Private Email"; +$a->strings["Inbox"] = "Eingang"; +$a->strings["Outbox"] = "Ausgang"; $a->strings["Manage"] = "Verwalten"; $a->strings["Manage other pages"] = "Andere Seiten verwalten"; $a->strings["Profiles"] = "Profile"; @@ -1277,7 +1353,6 @@ $a->strings["Nothing new here"] = "Keine Neuigkeiten."; $a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen"; $a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben"; $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara"; -$a->strings["Invite Friends"] = "Freunde einladen"; $a->strings["%d invitation available"] = array( 0 => "%d Einladung verfügbar", 1 => "%d Einladungen verfügbar", @@ -1286,10 +1361,14 @@ $a->strings["Find People"] = "Leute finden"; $a->strings["Enter name or interest"] = "Name oder Interessen eingeben"; $a->strings["Connect/Follow"] = "Verbinden/Folgen"; $a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln"; -$a->strings["Similar Interests"] = "Ähnliche Interessen"; $a->strings["Networks"] = "Netzwerke"; $a->strings["All Networks"] = "Alle Netzwerke"; +$a->strings["Saved Folders"] = "Gespeicherte Ordner"; +$a->strings["Everything"] = "Alles"; +$a->strings["Categories"] = "Kategorien"; $a->strings["Logged out."] = "Abgemeldet."; +$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."; +$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; $a->strings["Miscellaneous"] = "Verschiedenes"; $a->strings["year"] = "Jahr"; $a->strings["month"] = "Monat"; @@ -1346,7 +1425,7 @@ $a->strings["your post"] = "Dein Beitrag"; $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten"; $a->strings["You've received an introduction from '%s' at %s"] = "Du hast eine Kontaktanfrage von '%s' auf %s erhalten"; $a->strings["You've received %s from %s."] = "Du hast %s von %s erhalten."; -$a->strings["an introduction"] = "eine Einführung"; +$a->strings["an introduction"] = "eine Kontaktanfrage"; $a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s"; $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."; $a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten"; @@ -1362,6 +1441,7 @@ $a->strings["image/photo"] = "Bild/Foto"; $a->strings["Welcome "] = "Willkommen "; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Welcome back "] = "Willkommen zurück "; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."; $a->strings["View status"] = "Status anzeigen"; $a->strings["View profile"] = "Profil anzeigen"; $a->strings["View photos"] = "Fotos ansehen"; @@ -1377,7 +1457,6 @@ $a->strings["%d comment"] = array( 0 => "%d Kommentar", 1 => "%d Kommentare", ); -$a->strings["show more"] = "mehr anzeigen"; $a->strings["like"] = "mag ich"; $a->strings["dislike"] = "mag ich nicht"; $a->strings["Share this"] = "Teile dieses"; @@ -1387,6 +1466,7 @@ $a->strings["remove star"] = "Markierung entfernen"; $a->strings["toggle star status"] = "Markierung umschalten"; $a->strings["starred"] = "markiert"; $a->strings["add tag"] = "Tag hinzufügen"; +$a->strings["save to folder"] = "In Ordner speichern"; $a->strings["to"] = "zu"; $a->strings["Wall-to-Wall"] = "Wall-to-Wall"; $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:"; @@ -1404,7 +1484,6 @@ $a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfü $a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:"; $a->strings["Tag term:"] = "Tag:"; $a->strings["Where are you right now?"] = "Wo hältst du dich jetzt gerade auf?"; -$a->strings["Enter a title for this item"] = "Gib den Titel für diesen Beitrag ein"; $a->strings["upload photo"] = "Bild hochladen"; $a->strings["attach file"] = "Datei anhängen"; $a->strings["web link"] = "Weblink"; @@ -1423,6 +1502,7 @@ $a->strings["Password: "] = "Passwort: "; $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: "; $a->strings["Forgot your password?"] = "Passwort vergessen?"; $a->strings["Edit profile"] = "Profil bearbeiten"; +$a->strings["Message"] = "Nachricht"; $a->strings["g A l F d"] = "l. d, F G \\U\\h\\\\r"; $a->strings["F d"] = "d. F"; $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; diff --git a/view/de/wall_received_eml.tpl b/view/de/wall_received_eml.tpl index b0ca45b24..b0ca45b24 100755..100644 --- a/view/de/wall_received_eml.tpl +++ b/view/de/wall_received_eml.tpl diff --git a/view/de/wall_received_html_body_eml.tpl b/view/de/wall_received_html_body_eml.tpl index 407e4fdce..407e4fdce 100755..100644 --- a/view/de/wall_received_html_body_eml.tpl +++ b/view/de/wall_received_html_body_eml.tpl diff --git a/view/de/wall_received_text_body_eml.tpl b/view/de/wall_received_text_body_eml.tpl index c627b0c7e..c627b0c7e 100755..100644 --- a/view/de/wall_received_text_body_eml.tpl +++ b/view/de/wall_received_text_body_eml.tpl diff --git a/view/default.php b/view/default.php index 61f5f6863..61f5f6863 100755..100644 --- a/view/default.php +++ b/view/default.php diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl index 58e9233aa..58e9233aa 100755..100644 --- a/view/dfrn_req_confirm.tpl +++ b/view/dfrn_req_confirm.tpl diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index d8aa8b181..d8aa8b181 100755..100644 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl diff --git a/view/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl index e87c61888..e87c61888 100755..100644 --- a/view/diasp_dec_hdr.tpl +++ b/view/diasp_dec_hdr.tpl diff --git a/view/diaspora_comment.tpl b/view/diaspora_comment.tpl index 6ef4ab664..6ef4ab664 100755..100644 --- a/view/diaspora_comment.tpl +++ b/view/diaspora_comment.tpl diff --git a/view/diaspora_comment_relay.tpl b/view/diaspora_comment_relay.tpl index e82de1171..e82de1171 100755..100644 --- a/view/diaspora_comment_relay.tpl +++ b/view/diaspora_comment_relay.tpl diff --git a/view/diaspora_conversation.tpl b/view/diaspora_conversation.tpl index 12807ba59..12807ba59 100755..100644 --- a/view/diaspora_conversation.tpl +++ b/view/diaspora_conversation.tpl diff --git a/view/diaspora_like.tpl b/view/diaspora_like.tpl index a777aeebe..a777aeebe 100755..100644 --- a/view/diaspora_like.tpl +++ b/view/diaspora_like.tpl diff --git a/view/diaspora_like_relay.tpl b/view/diaspora_like_relay.tpl index 65559b05b..65559b05b 100755..100644 --- a/view/diaspora_like_relay.tpl +++ b/view/diaspora_like_relay.tpl diff --git a/view/diaspora_message.tpl b/view/diaspora_message.tpl index 667b8d53f..667b8d53f 100755..100644 --- a/view/diaspora_message.tpl +++ b/view/diaspora_message.tpl diff --git a/view/diaspora_photo.tpl b/view/diaspora_photo.tpl index 75ca7f15c..75ca7f15c 100755..100644 --- a/view/diaspora_photo.tpl +++ b/view/diaspora_photo.tpl diff --git a/view/diaspora_post.tpl b/view/diaspora_post.tpl index 1ba3ebb1f..1ba3ebb1f 100755..100644 --- a/view/diaspora_post.tpl +++ b/view/diaspora_post.tpl diff --git a/view/diaspora_profile.tpl b/view/diaspora_profile.tpl index e5c3d3cad..e5c3d3cad 100755..100644 --- a/view/diaspora_profile.tpl +++ b/view/diaspora_profile.tpl diff --git a/view/diaspora_retract.tpl b/view/diaspora_retract.tpl index 6d5b6e22b..6d5b6e22b 100755..100644 --- a/view/diaspora_retract.tpl +++ b/view/diaspora_retract.tpl diff --git a/view/diaspora_share.tpl b/view/diaspora_share.tpl index c16341b1e..c16341b1e 100755..100644 --- a/view/diaspora_share.tpl +++ b/view/diaspora_share.tpl diff --git a/view/diaspora_signed_retract.tpl b/view/diaspora_signed_retract.tpl index 22120e287..22120e287 100755..100644 --- a/view/diaspora_signed_retract.tpl +++ b/view/diaspora_signed_retract.tpl diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl index de3981a94..de3981a94 100755..100644 --- a/view/diaspora_vcard.tpl +++ b/view/diaspora_vcard.tpl diff --git a/view/directory_header.tpl b/view/directory_header.tpl index 1f03540f2..1f03540f2 100755..100644 --- a/view/directory_header.tpl +++ b/view/directory_header.tpl diff --git a/view/directory_item.tpl b/view/directory_item.tpl index b45da4465..b45da4465 100755..100644 --- a/view/directory_item.tpl +++ b/view/directory_item.tpl diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl index 43f72f15c..43f72f15c 100755..100644 --- a/view/email_notify_html.tpl +++ b/view/email_notify_html.tpl diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl index 018bb6078..018bb6078 100755..100644 --- a/view/email_notify_text.tpl +++ b/view/email_notify_text.tpl diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl index ae758c9a8..ae758c9a8 100755..100644 --- a/view/en/follow_notify_eml.tpl +++ b/view/en/follow_notify_eml.tpl diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl index ab12fcb6b..ab12fcb6b 100755..100644 --- a/view/en/friend_complete_eml.tpl +++ b/view/en/friend_complete_eml.tpl diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 9e39eeb59..9e39eeb59 100755..100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl index a60745ec5..a60745ec5 100755..100644 --- a/view/en/intro_complete_eml.tpl +++ b/view/en/intro_complete_eml.tpl diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl index c350236a4..c350236a4 100755..100644 --- a/view/en/lostpass_eml.tpl +++ b/view/en/lostpass_eml.tpl diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl index 9692159e1..9692159e1 100755..100644 --- a/view/en/passchanged_eml.tpl +++ b/view/en/passchanged_eml.tpl diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl index 221e6ec74..221e6ec74 100755..100644 --- a/view/en/register_open_eml.tpl +++ b/view/en/register_open_eml.tpl diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl index 60c38d800..60c38d800 100755..100644 --- a/view/en/register_verify_eml.tpl +++ b/view/en/register_verify_eml.tpl diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl index 9eef7a61e..9eef7a61e 100755..100644 --- a/view/en/request_notify_eml.tpl +++ b/view/en/request_notify_eml.tpl diff --git a/view/es/cmnt_received_eml.tpl b/view/es/cmnt_received_eml.tpl index abf2d95df..abf2d95df 100755..100644 --- a/view/es/cmnt_received_eml.tpl +++ b/view/es/cmnt_received_eml.tpl diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl index 17bd2c01c..17bd2c01c 100755..100644 --- a/view/es/follow_notify_eml.tpl +++ b/view/es/follow_notify_eml.tpl diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl index 0dc867efd..0dc867efd 100755..100644 --- a/view/es/friend_complete_eml.tpl +++ b/view/es/friend_complete_eml.tpl diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl index 6158f6a33..6158f6a33 100755..100644 --- a/view/es/htconfig.tpl +++ b/view/es/htconfig.tpl diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl index a2964808c..a2964808c 100755..100644 --- a/view/es/intro_complete_eml.tpl +++ b/view/es/intro_complete_eml.tpl diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl index 607744bfe..607744bfe 100755..100644 --- a/view/es/lostpass_eml.tpl +++ b/view/es/lostpass_eml.tpl diff --git a/view/es/mail_received_html_body_eml.tpl b/view/es/mail_received_html_body_eml.tpl index 5086ec246..5086ec246 100755..100644 --- a/view/es/mail_received_html_body_eml.tpl +++ b/view/es/mail_received_html_body_eml.tpl diff --git a/view/es/mail_received_text_body_eml.tpl b/view/es/mail_received_text_body_eml.tpl index 8400b9d01..8400b9d01 100755..100644 --- a/view/es/mail_received_text_body_eml.tpl +++ b/view/es/mail_received_text_body_eml.tpl diff --git a/view/es/messages.po b/view/es/messages.po index d3f8557e9..d3f8557e9 100755..100644 --- a/view/es/messages.po +++ b/view/es/messages.po diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl index 7959846b7..7959846b7 100755..100644 --- a/view/es/passchanged_eml.tpl +++ b/view/es/passchanged_eml.tpl diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl index 7c7a90b40..7c7a90b40 100755..100644 --- a/view/es/register_open_eml.tpl +++ b/view/es/register_open_eml.tpl diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl index 9f2cc4d9b..9f2cc4d9b 100755..100644 --- a/view/es/register_verify_eml.tpl +++ b/view/es/register_verify_eml.tpl diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl index 6161c45c1..6161c45c1 100755..100644 --- a/view/es/request_notify_eml.tpl +++ b/view/es/request_notify_eml.tpl diff --git a/view/es/strings.php b/view/es/strings.php index ac53a45a9..ac53a45a9 100755..100644 --- a/view/es/strings.php +++ b/view/es/strings.php diff --git a/view/es/wall_received_eml.tpl b/view/es/wall_received_eml.tpl index 4cd253c72..4cd253c72 100755..100644 --- a/view/es/wall_received_eml.tpl +++ b/view/es/wall_received_eml.tpl diff --git a/view/event_form.tpl b/view/event_form.tpl index 7d5f8cf4a..7d5f8cf4a 100755..100644 --- a/view/event_form.tpl +++ b/view/event_form.tpl diff --git a/view/event_head.tpl b/view/event_head.tpl index 97201e722..97201e722 100755..100644 --- a/view/event_head.tpl +++ b/view/event_head.tpl diff --git a/view/fake_feed.tpl b/view/fake_feed.tpl index c37071cf4..c37071cf4 100755..100644 --- a/view/fake_feed.tpl +++ b/view/fake_feed.tpl diff --git a/view/field.tpl b/view/field.tpl index 35f5afd39..35f5afd39 100755..100644 --- a/view/field.tpl +++ b/view/field.tpl diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl index 725df4cdf..725df4cdf 100755..100644 --- a/view/field_checkbox.tpl +++ b/view/field_checkbox.tpl diff --git a/view/field_custom.tpl b/view/field_custom.tpl index be15d3f60..be15d3f60 100755..100644 --- a/view/field_custom.tpl +++ b/view/field_custom.tpl diff --git a/view/field_input.tpl b/view/field_input.tpl index 748d93f3e..748d93f3e 100755..100644 --- a/view/field_input.tpl +++ b/view/field_input.tpl diff --git a/view/field_intcheckbox.tpl b/view/field_intcheckbox.tpl index 47a513a55..47a513a55 100755..100644 --- a/view/field_intcheckbox.tpl +++ b/view/field_intcheckbox.tpl diff --git a/view/field_openid.tpl b/view/field_openid.tpl index acd93ff62..acd93ff62 100755..100644 --- a/view/field_openid.tpl +++ b/view/field_openid.tpl diff --git a/view/field_password.tpl b/view/field_password.tpl index e604b7f5d..e604b7f5d 100755..100644 --- a/view/field_password.tpl +++ b/view/field_password.tpl diff --git a/view/field_radio.tpl b/view/field_radio.tpl index a915e8eb3..a915e8eb3 100755..100644 --- a/view/field_radio.tpl +++ b/view/field_radio.tpl diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl index c124ee000..c124ee000 100755..100644 --- a/view/field_richtext.tpl +++ b/view/field_richtext.tpl diff --git a/view/field_select.tpl b/view/field_select.tpl index d79eb48e0..d79eb48e0 100755..100644 --- a/view/field_select.tpl +++ b/view/field_select.tpl diff --git a/view/field_select_raw.tpl b/view/field_select_raw.tpl index 765b285d9..765b285d9 100755..100644 --- a/view/field_select_raw.tpl +++ b/view/field_select_raw.tpl diff --git a/view/field_textarea.tpl b/view/field_textarea.tpl index 2425cdd3b..2425cdd3b 100755..100644 --- a/view/field_textarea.tpl +++ b/view/field_textarea.tpl diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl index f9f99492c..f9f99492c 100755..100644 --- a/view/field_themeselect.tpl +++ b/view/field_themeselect.tpl diff --git a/view/field_yesno.tpl b/view/field_yesno.tpl index 5d4a775c2..5d4a775c2 100755..100644 --- a/view/field_yesno.tpl +++ b/view/field_yesno.tpl diff --git a/view/fileas_widget.tpl b/view/fileas_widget.tpl index 54fba7435..54fba7435 100755..100644 --- a/view/fileas_widget.tpl +++ b/view/fileas_widget.tpl diff --git a/view/follow.tpl b/view/follow.tpl index 259e74a93..259e74a93 100755..100644 --- a/view/follow.tpl +++ b/view/follow.tpl diff --git a/view/follow_slap.tpl b/view/follow_slap.tpl index 0d0889f7d..0d0889f7d 100755..100644 --- a/view/follow_slap.tpl +++ b/view/follow_slap.tpl diff --git a/view/fr/cmnt_received_eml.tpl b/view/fr/cmnt_received_eml.tpl index ee98d98de..ee98d98de 100755..100644 --- a/view/fr/cmnt_received_eml.tpl +++ b/view/fr/cmnt_received_eml.tpl diff --git a/view/fr/cmnt_received_html_body_eml.tpl b/view/fr/cmnt_received_html_body_eml.tpl index 1d904c53c..1d904c53c 100755..100644 --- a/view/fr/cmnt_received_html_body_eml.tpl +++ b/view/fr/cmnt_received_html_body_eml.tpl diff --git a/view/fr/cmnt_received_text_body_eml.tpl b/view/fr/cmnt_received_text_body_eml.tpl index d46632138..d46632138 100755..100644 --- a/view/fr/cmnt_received_text_body_eml.tpl +++ b/view/fr/cmnt_received_text_body_eml.tpl diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl index c77a3e427..c77a3e427 100755..100644 --- a/view/fr/follow_notify_eml.tpl +++ b/view/fr/follow_notify_eml.tpl diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl index 9b9c551fe..9b9c551fe 100755..100644 --- a/view/fr/friend_complete_eml.tpl +++ b/view/fr/friend_complete_eml.tpl diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index 76709ea75..76709ea75 100755..100644 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl index b8a7a3457..b8a7a3457 100755..100644 --- a/view/fr/intro_complete_eml.tpl +++ b/view/fr/intro_complete_eml.tpl diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl index 168e9a5e2..168e9a5e2 100755..100644 --- a/view/fr/lostpass_eml.tpl +++ b/view/fr/lostpass_eml.tpl diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl index 55e8b8a73..55e8b8a73 100755..100644 --- a/view/fr/mail_received_html_body_eml.tpl +++ b/view/fr/mail_received_html_body_eml.tpl diff --git a/view/fr/mail_received_text_body_eml.tpl b/view/fr/mail_received_text_body_eml.tpl index c877344e0..c877344e0 100755..100644 --- a/view/fr/mail_received_text_body_eml.tpl +++ b/view/fr/mail_received_text_body_eml.tpl diff --git a/view/fr/messages.po b/view/fr/messages.po index 345405760..345405760 100755..100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl index c1881b13e..c1881b13e 100755..100644 --- a/view/fr/passchanged_eml.tpl +++ b/view/fr/passchanged_eml.tpl diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl index d61a5996d..d61a5996d 100755..100644 --- a/view/fr/register_open_eml.tpl +++ b/view/fr/register_open_eml.tpl diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl index 54362ce18..54362ce18 100755..100644 --- a/view/fr/register_verify_eml.tpl +++ b/view/fr/register_verify_eml.tpl diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl index afbb2ab7e..afbb2ab7e 100755..100644 --- a/view/fr/request_notify_eml.tpl +++ b/view/fr/request_notify_eml.tpl diff --git a/view/fr/strings.php b/view/fr/strings.php index dda24d3be..dda24d3be 100755..100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php diff --git a/view/fr/wall_received_eml.tpl b/view/fr/wall_received_eml.tpl index adfb91dd8..adfb91dd8 100755..100644 --- a/view/fr/wall_received_eml.tpl +++ b/view/fr/wall_received_eml.tpl diff --git a/view/group_drop.tpl b/view/group_drop.tpl index 2cbebbb8e..2cbebbb8e 100755..100644 --- a/view/group_drop.tpl +++ b/view/group_drop.tpl diff --git a/view/group_edit.tpl b/view/group_edit.tpl index 2fa2b1a55..2fa2b1a55 100755..100644 --- a/view/group_edit.tpl +++ b/view/group_edit.tpl diff --git a/view/group_side.tpl b/view/group_side.tpl index 0353b1d2c..0353b1d2c 100755..100644 --- a/view/group_side.tpl +++ b/view/group_side.tpl diff --git a/view/head.tpl b/view/head.tpl index cd6f5ca97..cd6f5ca97 100755..100644 --- a/view/head.tpl +++ b/view/head.tpl diff --git a/view/hide_comments.tpl b/view/hide_comments.tpl index 55ee9dd7b..55ee9dd7b 100755..100644 --- a/view/hide_comments.tpl +++ b/view/hide_comments.tpl diff --git a/view/install.tpl b/view/install.tpl index b3a5f46ff..b3a5f46ff 100755..100644 --- a/view/install.tpl +++ b/view/install.tpl diff --git a/view/install_checks.tpl b/view/install_checks.tpl index a1a75ade6..a1a75ade6 100755..100644 --- a/view/install_checks.tpl +++ b/view/install_checks.tpl diff --git a/view/install_db.tpl b/view/install_db.tpl index 1302b5a70..1302b5a70 100755..100644 --- a/view/install_db.tpl +++ b/view/install_db.tpl diff --git a/view/install_settings.tpl b/view/install_settings.tpl index 05b87f904..05b87f904 100755..100644 --- a/view/install_settings.tpl +++ b/view/install_settings.tpl diff --git a/view/intros.tpl b/view/intros.tpl index e7fd53ca4..e7fd53ca4 100755..100644 --- a/view/intros.tpl +++ b/view/intros.tpl diff --git a/view/invite.tpl b/view/invite.tpl index 01a45c774..01a45c774 100755..100644 --- a/view/invite.tpl +++ b/view/invite.tpl diff --git a/view/it/cmnt_received_eml.tpl b/view/it/cmnt_received_eml.tpl index 1991d29ae..1991d29ae 100755..100644 --- a/view/it/cmnt_received_eml.tpl +++ b/view/it/cmnt_received_eml.tpl diff --git a/view/it/cmnt_received_html_body_eml.tpl b/view/it/cmnt_received_html_body_eml.tpl index 5f2edb84b..5f2edb84b 100755..100644 --- a/view/it/cmnt_received_html_body_eml.tpl +++ b/view/it/cmnt_received_html_body_eml.tpl diff --git a/view/it/cmnt_received_text_body_eml.tpl b/view/it/cmnt_received_text_body_eml.tpl index 1991d29ae..1991d29ae 100755..100644 --- a/view/it/cmnt_received_text_body_eml.tpl +++ b/view/it/cmnt_received_text_body_eml.tpl diff --git a/view/it/follow_notify_eml.tpl b/view/it/follow_notify_eml.tpl index 635dbbc29..635dbbc29 100755..100644 --- a/view/it/follow_notify_eml.tpl +++ b/view/it/follow_notify_eml.tpl diff --git a/view/it/friend_complete_eml.tpl b/view/it/friend_complete_eml.tpl index 67ad67b05..67ad67b05 100755..100644 --- a/view/it/friend_complete_eml.tpl +++ b/view/it/friend_complete_eml.tpl diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl index 6158f6a33..6158f6a33 100755..100644 --- a/view/it/htconfig.tpl +++ b/view/it/htconfig.tpl diff --git a/view/it/intro_complete_eml.tpl b/view/it/intro_complete_eml.tpl index 9da946a56..9da946a56 100755..100644 --- a/view/it/intro_complete_eml.tpl +++ b/view/it/intro_complete_eml.tpl diff --git a/view/it/lostpass_eml.tpl b/view/it/lostpass_eml.tpl index 7349717ea..7349717ea 100755..100644 --- a/view/it/lostpass_eml.tpl +++ b/view/it/lostpass_eml.tpl diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl index 847954550..847954550 100755..100644 --- a/view/it/mail_received_html_body_eml.tpl +++ b/view/it/mail_received_html_body_eml.tpl diff --git a/view/it/mail_received_text_body_eml.tpl b/view/it/mail_received_text_body_eml.tpl index c7da9533f..c7da9533f 100755..100644 --- a/view/it/mail_received_text_body_eml.tpl +++ b/view/it/mail_received_text_body_eml.tpl diff --git a/view/it/messages.po b/view/it/messages.po index e0375764f..e0375764f 100755..100644 --- a/view/it/messages.po +++ b/view/it/messages.po diff --git a/view/it/passchanged_eml.tpl b/view/it/passchanged_eml.tpl index 290e4db94..290e4db94 100755..100644 --- a/view/it/passchanged_eml.tpl +++ b/view/it/passchanged_eml.tpl diff --git a/view/it/register_open_eml.tpl b/view/it/register_open_eml.tpl index e5f5af80c..e5f5af80c 100755..100644 --- a/view/it/register_open_eml.tpl +++ b/view/it/register_open_eml.tpl diff --git a/view/it/register_verify_eml.tpl b/view/it/register_verify_eml.tpl index f1a34dbf4..f1a34dbf4 100755..100644 --- a/view/it/register_verify_eml.tpl +++ b/view/it/register_verify_eml.tpl diff --git a/view/it/request_notify_eml.tpl b/view/it/request_notify_eml.tpl index 50532cbd4..50532cbd4 100755..100644 --- a/view/it/request_notify_eml.tpl +++ b/view/it/request_notify_eml.tpl diff --git a/view/it/strings.php b/view/it/strings.php index 5fd187f7a..5fd187f7a 100755..100644 --- a/view/it/strings.php +++ b/view/it/strings.php diff --git a/view/it/wall_received_eml.tpl b/view/it/wall_received_eml.tpl index ba9e25901..ba9e25901 100755..100644 --- a/view/it/wall_received_eml.tpl +++ b/view/it/wall_received_eml.tpl diff --git a/view/it/wall_received_html_body_eml.tpl b/view/it/wall_received_html_body_eml.tpl index cdc05cfa3..cdc05cfa3 100755..100644 --- a/view/it/wall_received_html_body_eml.tpl +++ b/view/it/wall_received_html_body_eml.tpl diff --git a/view/it/wall_received_text_body_eml.tpl b/view/it/wall_received_text_body_eml.tpl index 327557ea1..327557ea1 100755..100644 --- a/view/it/wall_received_text_body_eml.tpl +++ b/view/it/wall_received_text_body_eml.tpl diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 67e5eb681..67e5eb681 100755..100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl diff --git a/view/jot.tpl b/view/jot.tpl index 91de628ac..91de628ac 100755..100644 --- a/view/jot.tpl +++ b/view/jot.tpl diff --git a/view/jot_geotag.tpl b/view/jot_geotag.tpl index b0f71e73b..b0f71e73b 100755..100644 --- a/view/jot_geotag.tpl +++ b/view/jot_geotag.tpl diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl index 2651ea1f8..2651ea1f8 100755..100644 --- a/view/like_noshare.tpl +++ b/view/like_noshare.tpl diff --git a/view/login.tpl b/view/login.tpl index 4cbbb1624..4cbbb1624 100755..100644 --- a/view/login.tpl +++ b/view/login.tpl diff --git a/view/logout.tpl b/view/logout.tpl index efc971df8..efc971df8 100755..100644 --- a/view/logout.tpl +++ b/view/logout.tpl diff --git a/view/lostpass.tpl b/view/lostpass.tpl index cd3644157..cd3644157 100755..100644 --- a/view/lostpass.tpl +++ b/view/lostpass.tpl diff --git a/view/magicsig.tpl b/view/magicsig.tpl index 75f9bc475..75f9bc475 100755..100644 --- a/view/magicsig.tpl +++ b/view/magicsig.tpl diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl index 75a4506f6..75a4506f6 100755..100644 --- a/view/mail_conv.tpl +++ b/view/mail_conv.tpl diff --git a/view/mail_head.tpl b/view/mail_head.tpl index afb65f537..afb65f537 100755..100644 --- a/view/mail_head.tpl +++ b/view/mail_head.tpl diff --git a/view/match.tpl b/view/match.tpl index 5f2fc7a30..5f2fc7a30 100755..100644 --- a/view/match.tpl +++ b/view/match.tpl diff --git a/view/minimal.php b/view/minimal.php index a8c693985..a8c693985 100755..100644 --- a/view/minimal.php +++ b/view/minimal.php diff --git a/view/msg-header.tpl b/view/msg-header.tpl index 2d1ea7a61..2d1ea7a61 100755..100644 --- a/view/msg-header.tpl +++ b/view/msg-header.tpl diff --git a/view/nav.tpl b/view/nav.tpl index 4675c3e5c..4675c3e5c 100755..100644 --- a/view/nav.tpl +++ b/view/nav.tpl diff --git a/view/netfriend.tpl b/view/netfriend.tpl index c2a92ce9e..c2a92ce9e 100755..100644 --- a/view/netfriend.tpl +++ b/view/netfriend.tpl diff --git a/view/nets.tpl b/view/nets.tpl index b0cb8890c..b0cb8890c 100755..100644 --- a/view/nets.tpl +++ b/view/nets.tpl diff --git a/view/notifications.tpl b/view/notifications.tpl index 1a13b68b9..1a13b68b9 100755..100644 --- a/view/notifications.tpl +++ b/view/notifications.tpl diff --git a/view/notifications_comments_item.tpl b/view/notifications_comments_item.tpl index 73cc9f948..73cc9f948 100755..100644 --- a/view/notifications_comments_item.tpl +++ b/view/notifications_comments_item.tpl diff --git a/view/notifications_dislikes_item.tpl b/view/notifications_dislikes_item.tpl index 73cc9f948..73cc9f948 100755..100644 --- a/view/notifications_dislikes_item.tpl +++ b/view/notifications_dislikes_item.tpl diff --git a/view/notifications_friends_item.tpl b/view/notifications_friends_item.tpl index 73cc9f948..73cc9f948 100755..100644 --- a/view/notifications_friends_item.tpl +++ b/view/notifications_friends_item.tpl diff --git a/view/notifications_likes_item.tpl b/view/notifications_likes_item.tpl index 389144d9b..389144d9b 100755..100644 --- a/view/notifications_likes_item.tpl +++ b/view/notifications_likes_item.tpl diff --git a/view/notifications_network_item.tpl b/view/notifications_network_item.tpl index bd86548fc..bd86548fc 100755..100644 --- a/view/notifications_network_item.tpl +++ b/view/notifications_network_item.tpl diff --git a/view/notifications_posts_item.tpl b/view/notifications_posts_item.tpl index 73cc9f948..73cc9f948 100755..100644 --- a/view/notifications_posts_item.tpl +++ b/view/notifications_posts_item.tpl diff --git a/view/notify.tpl b/view/notify.tpl index 73cc9f948..73cc9f948 100755..100644 --- a/view/notify.tpl +++ b/view/notify.tpl diff --git a/view/oauth_authorize.tpl b/view/oauth_authorize.tpl index 31f02ac50..31f02ac50 100755..100644 --- a/view/oauth_authorize.tpl +++ b/view/oauth_authorize.tpl diff --git a/view/oauth_authorize_done.tpl b/view/oauth_authorize_done.tpl index 51eaea248..51eaea248 100755..100644 --- a/view/oauth_authorize_done.tpl +++ b/view/oauth_authorize_done.tpl diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl index 5824d8d4e..5824d8d4e 100755..100644 --- a/view/oembed_video.tpl +++ b/view/oembed_video.tpl diff --git a/view/oexchange_xrd.tpl b/view/oexchange_xrd.tpl index c7e6df498..c7e6df498 100755..100644 --- a/view/oexchange_xrd.tpl +++ b/view/oexchange_xrd.tpl diff --git a/view/opensearch.tpl b/view/opensearch.tpl index 374fcaac9..374fcaac9 100755..100644 --- a/view/opensearch.tpl +++ b/view/opensearch.tpl diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl index d9f873ea0..d9f873ea0 100755..100644 --- a/view/pagetypes.tpl +++ b/view/pagetypes.tpl diff --git a/view/peoplefind.tpl b/view/peoplefind.tpl index eeae2a29a..eeae2a29a 100755..100644 --- a/view/peoplefind.tpl +++ b/view/peoplefind.tpl diff --git a/view/photo_album.tpl b/view/photo_album.tpl index 3ab9fe723..3ab9fe723 100755..100644 --- a/view/photo_album.tpl +++ b/view/photo_album.tpl diff --git a/view/photo_drop.tpl b/view/photo_drop.tpl index b4ea62b45..b4ea62b45 100755..100644 --- a/view/photo_drop.tpl +++ b/view/photo_drop.tpl diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index 9950cc4ac..9950cc4ac 100755..100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl diff --git a/view/photo_item.tpl b/view/photo_item.tpl index 22884e848..22884e848 100755..100644 --- a/view/photo_item.tpl +++ b/view/photo_item.tpl diff --git a/view/photo_top.tpl b/view/photo_top.tpl index 04a054b52..04a054b52 100755..100644 --- a/view/photo_top.tpl +++ b/view/photo_top.tpl diff --git a/view/photo_view.tpl b/view/photo_view.tpl index 732caf690..732caf690 100755..100644 --- a/view/photo_view.tpl +++ b/view/photo_view.tpl diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl index b8cb924b7..b8cb924b7 100755..100644 --- a/view/photos_recent.tpl +++ b/view/photos_recent.tpl diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl index 318a92427..318a92427 100755..100644 --- a/view/photos_upload.tpl +++ b/view/photos_upload.tpl diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl index 4d84cee41..4d84cee41 100755..100644 --- a/view/poco_entry_xml.tpl +++ b/view/poco_entry_xml.tpl diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl index 9549b695d..9549b695d 100755..100644 --- a/view/poco_xml.tpl +++ b/view/poco_xml.tpl diff --git a/view/profed_head.tpl b/view/profed_head.tpl index a3267d591..a3267d591 100755..100644 --- a/view/profed_head.tpl +++ b/view/profed_head.tpl diff --git a/view/profile-hide-friends.tpl b/view/profile-hide-friends.tpl index 9ecacfbe0..9ecacfbe0 100755..100644 --- a/view/profile-hide-friends.tpl +++ b/view/profile-hide-friends.tpl diff --git a/view/profile-hide-wall.tpl b/view/profile-hide-wall.tpl index 10185e243..10185e243 100755..100644 --- a/view/profile-hide-wall.tpl +++ b/view/profile-hide-wall.tpl diff --git a/view/profile-in-directory.tpl b/view/profile-in-directory.tpl index 56b28d37e..56b28d37e 100755..100644 --- a/view/profile-in-directory.tpl +++ b/view/profile-in-directory.tpl diff --git a/view/profile-in-netdir.tpl b/view/profile-in-netdir.tpl index 882ad2d17..882ad2d17 100755..100644 --- a/view/profile-in-netdir.tpl +++ b/view/profile-in-netdir.tpl diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl index 470404fc3..470404fc3 100755..100644 --- a/view/profile_advanced.tpl +++ b/view/profile_advanced.tpl diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl index e5c7162d0..e5c7162d0 100755..100644 --- a/view/profile_edit.tpl +++ b/view/profile_edit.tpl diff --git a/view/profile_edlink.tpl b/view/profile_edlink.tpl index ea787b9f5..ea787b9f5 100755..100644 --- a/view/profile_edlink.tpl +++ b/view/profile_edlink.tpl diff --git a/view/profile_entry.tpl b/view/profile_entry.tpl index 7ff6d685b..7ff6d685b 100755..100644 --- a/view/profile_entry.tpl +++ b/view/profile_entry.tpl diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl index 61a273792..61a273792 100755..100644 --- a/view/profile_listing_header.tpl +++ b/view/profile_listing_header.tpl diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl index 0b3a1cac1..0b3a1cac1 100755..100644 --- a/view/profile_photo.tpl +++ b/view/profile_photo.tpl diff --git a/view/profile_publish.tpl b/view/profile_publish.tpl index 8fd0bc913..8fd0bc913 100755..100644 --- a/view/profile_publish.tpl +++ b/view/profile_publish.tpl diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index d1e684795..d1e684795 100755..100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl diff --git a/view/prv_message.tpl b/view/prv_message.tpl index 2ce07ce6f..2ce07ce6f 100755..100644 --- a/view/prv_message.tpl +++ b/view/prv_message.tpl diff --git a/view/pt-br/messages.po b/view/pt-br/messages.po index c6aca3dd9..c6aca3dd9 100755..100644 --- a/view/pt-br/messages.po +++ b/view/pt-br/messages.po diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php index 0cf143db4..0cf143db4 100755..100644 --- a/view/pt-br/strings.php +++ b/view/pt-br/strings.php diff --git a/view/pwdreset.tpl b/view/pwdreset.tpl index 497b93396..497b93396 100755..100644 --- a/view/pwdreset.tpl +++ b/view/pwdreset.tpl diff --git a/view/register.tpl b/view/register.tpl index 8ce1d20ac..8ce1d20ac 100755..100644 --- a/view/register.tpl +++ b/view/register.tpl diff --git a/view/removeme.tpl b/view/removeme.tpl index a3ca8d4cf..a3ca8d4cf 100755..100644 --- a/view/removeme.tpl +++ b/view/removeme.tpl diff --git a/view/ru/messages.po b/view/ru/messages.po index 31a830935..31a830935 100755..100644 --- a/view/ru/messages.po +++ b/view/ru/messages.po diff --git a/view/ru/strings.php b/view/ru/strings.php index 4578c37e8..4578c37e8 100755..100644 --- a/view/ru/strings.php +++ b/view/ru/strings.php diff --git a/view/saved_searches_aside.tpl b/view/saved_searches_aside.tpl index e6a0d6278..e6a0d6278 100755..100644 --- a/view/saved_searches_aside.tpl +++ b/view/saved_searches_aside.tpl diff --git a/view/search_item.tpl b/view/search_item.tpl index bfad1b7b7..bfad1b7b7 100755..100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl diff --git a/view/settings.tpl b/view/settings.tpl index 8753474af..8753474af 100755..100644 --- a/view/settings.tpl +++ b/view/settings.tpl diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl index 28fca5362..28fca5362 100755..100644 --- a/view/settings_addons.tpl +++ b/view/settings_addons.tpl diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl index 43c0346bb..43c0346bb 100755..100644 --- a/view/settings_connectors.tpl +++ b/view/settings_connectors.tpl diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl index eb4721d50..eb4721d50 100755..100644 --- a/view/settings_nick_set.tpl +++ b/view/settings_nick_set.tpl diff --git a/view/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl index 303c24df7..303c24df7 100755..100644 --- a/view/settings_nick_subdir.tpl +++ b/view/settings_nick_subdir.tpl diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl index da1398ab9..da1398ab9 100755..100644 --- a/view/settings_oauth.tpl +++ b/view/settings_oauth.tpl diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl index d29341386..d29341386 100755..100644 --- a/view/settings_oauth_edit.tpl +++ b/view/settings_oauth_edit.tpl diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl index e97b5e8cc..e97b5e8cc 100755..100644 --- a/view/suggest_friends.tpl +++ b/view/suggest_friends.tpl diff --git a/view/suggestions.tpl b/view/suggestions.tpl index 656336496..656336496 100755..100644 --- a/view/suggestions.tpl +++ b/view/suggestions.tpl diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl index d87c7a1d1..d87c7a1d1 100755..100644 --- a/view/sv/cmnt_received_eml.tpl +++ b/view/sv/cmnt_received_eml.tpl diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl index fee08bdca..fee08bdca 100755..100644 --- a/view/sv/follow_notify_eml.tpl +++ b/view/sv/follow_notify_eml.tpl diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl index 2b8b0238e..2b8b0238e 100755..100644 --- a/view/sv/friend_complete_eml.tpl +++ b/view/sv/friend_complete_eml.tpl diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index 76709ea75..76709ea75 100755..100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl index 1f24af25f..1f24af25f 100755..100644 --- a/view/sv/intro_complete_eml.tpl +++ b/view/sv/intro_complete_eml.tpl diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl index df338fa69..df338fa69 100755..100644 --- a/view/sv/lostpass_eml.tpl +++ b/view/sv/lostpass_eml.tpl diff --git a/view/sv/mail_received_html_body_eml.tpl b/view/sv/mail_received_html_body_eml.tpl index a9a34c23a..a9a34c23a 100755..100644 --- a/view/sv/mail_received_html_body_eml.tpl +++ b/view/sv/mail_received_html_body_eml.tpl diff --git a/view/sv/mail_received_text_body_eml.tpl b/view/sv/mail_received_text_body_eml.tpl index ac2857b58..ac2857b58 100755..100644 --- a/view/sv/mail_received_text_body_eml.tpl +++ b/view/sv/mail_received_text_body_eml.tpl diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl index 590462468..590462468 100755..100644 --- a/view/sv/passchanged_eml.tpl +++ b/view/sv/passchanged_eml.tpl diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl index 1471c9b98..1471c9b98 100755..100644 --- a/view/sv/register_open_eml.tpl +++ b/view/sv/register_open_eml.tpl diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl index aa72bc9aa..aa72bc9aa 100755..100644 --- a/view/sv/register_verify_eml.tpl +++ b/view/sv/register_verify_eml.tpl diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl index 893bce17c..893bce17c 100755..100644 --- a/view/sv/request_notify_eml.tpl +++ b/view/sv/request_notify_eml.tpl diff --git a/view/sv/strings.php b/view/sv/strings.php index eb434df66..eb434df66 100755..100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php diff --git a/view/sv/wall_received_eml.tpl b/view/sv/wall_received_eml.tpl index fc450a06d..fc450a06d 100755..100644 --- a/view/sv/wall_received_eml.tpl +++ b/view/sv/wall_received_eml.tpl diff --git a/view/tag_slap.tpl b/view/tag_slap.tpl index 6449df496..6449df496 100755..100644 --- a/view/tag_slap.tpl +++ b/view/tag_slap.tpl diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl index 9c3facaff..9c3facaff 100755..100644 --- a/view/theme/comix-plain/comment_item.tpl +++ b/view/theme/comix-plain/comment_item.tpl diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl index dba289031..dba289031 100755..100644 --- a/view/theme/comix-plain/search_item.tpl +++ b/view/theme/comix-plain/search_item.tpl diff --git a/view/theme/comix-plain/style.css b/view/theme/comix-plain/style.css index 1a89cae7c..1a89cae7c 100755..100644 --- a/view/theme/comix-plain/style.css +++ b/view/theme/comix-plain/style.css diff --git a/view/theme/comix-plain/theme.php b/view/theme/comix-plain/theme.php index be3180dc9..be3180dc9 100755..100644 --- a/view/theme/comix-plain/theme.php +++ b/view/theme/comix-plain/theme.php diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl index dfcd8ca96..dfcd8ca96 100755..100644 --- a/view/theme/comix-plain/wall_item.tpl +++ b/view/theme/comix-plain/wall_item.tpl diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl index abd5967b2..abd5967b2 100755..100644 --- a/view/theme/comix-plain/wallwall_item.tpl +++ b/view/theme/comix-plain/wallwall_item.tpl diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl index 9c3facaff..9c3facaff 100755..100644 --- a/view/theme/comix/comment_item.tpl +++ b/view/theme/comix/comment_item.tpl diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl index dba289031..dba289031 100755..100644 --- a/view/theme/comix/search_item.tpl +++ b/view/theme/comix/search_item.tpl diff --git a/view/theme/comix/style.css b/view/theme/comix/style.css index 534e79cf4..534e79cf4 100755..100644 --- a/view/theme/comix/style.css +++ b/view/theme/comix/style.css diff --git a/view/theme/comix/theme.php b/view/theme/comix/theme.php index e2f7f4db3..e2f7f4db3 100755..100644 --- a/view/theme/comix/theme.php +++ b/view/theme/comix/theme.php diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl index dfcd8ca96..dfcd8ca96 100755..100644 --- a/view/theme/comix/wall_item.tpl +++ b/view/theme/comix/wall_item.tpl diff --git a/view/theme/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl index abd5967b2..abd5967b2 100755..100644 --- a/view/theme/comix/wallwall_item.tpl +++ b/view/theme/comix/wallwall_item.tpl diff --git a/view/theme/darkbubble/dbicons.png b/view/theme/darkbubble/dbicons.png Binary files differindex 696ef779c..696ef779c 100755..100644 --- a/view/theme/darkbubble/dbicons.png +++ b/view/theme/darkbubble/dbicons.png diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css index 9336dc01b..9336dc01b 100755..100644 --- a/view/theme/darkbubble/style.css +++ b/view/theme/darkbubble/style.css diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php index 053730c21..053730c21 100755..100644 --- a/view/theme/darkbubble/theme.php +++ b/view/theme/darkbubble/theme.php diff --git a/view/theme/darkzero-NS/border.jpg b/view/theme/darkzero-NS/border.jpg Binary files differindex 4967412bf..4967412bf 100755..100644 --- a/view/theme/darkzero-NS/border.jpg +++ b/view/theme/darkzero-NS/border.jpg diff --git a/view/theme/darkzero-NS/head.jpg b/view/theme/darkzero-NS/head.jpg Binary files differindex 67e852140..67e852140 100755..100644 --- a/view/theme/darkzero-NS/head.jpg +++ b/view/theme/darkzero-NS/head.jpg diff --git a/view/theme/darkzero-NS/sectionend.jpg b/view/theme/darkzero-NS/sectionend.jpg Binary files differindex 9d5d5c8f3..9d5d5c8f3 100755..100644 --- a/view/theme/darkzero-NS/sectionend.jpg +++ b/view/theme/darkzero-NS/sectionend.jpg diff --git a/view/theme/darkzero-NS/shiny.png b/view/theme/darkzero-NS/shiny.png Binary files differindex 994c0d05d..994c0d05d 100755..100644 --- a/view/theme/darkzero-NS/shiny.png +++ b/view/theme/darkzero-NS/shiny.png diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css index 047381a92..047381a92 100755..100644 --- a/view/theme/darkzero-NS/style.css +++ b/view/theme/darkzero-NS/style.css diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php index 2d3e4fd56..2d3e4fd56 100755..100644 --- a/view/theme/darkzero-NS/theme.php +++ b/view/theme/darkzero-NS/theme.php diff --git a/view/theme/darkzero/border.jpg b/view/theme/darkzero/border.jpg Binary files differindex 4967412bf..4967412bf 100755..100644 --- a/view/theme/darkzero/border.jpg +++ b/view/theme/darkzero/border.jpg diff --git a/view/theme/darkzero/head.jpg b/view/theme/darkzero/head.jpg Binary files differindex 67e852140..67e852140 100755..100644 --- a/view/theme/darkzero/head.jpg +++ b/view/theme/darkzero/head.jpg diff --git a/view/theme/darkzero/sectionend.jpg b/view/theme/darkzero/sectionend.jpg Binary files differindex 9d5d5c8f3..9d5d5c8f3 100755..100644 --- a/view/theme/darkzero/sectionend.jpg +++ b/view/theme/darkzero/sectionend.jpg diff --git a/view/theme/darkzero/shiny.png b/view/theme/darkzero/shiny.png Binary files differindex 994c0d05d..994c0d05d 100755..100644 --- a/view/theme/darkzero/shiny.png +++ b/view/theme/darkzero/shiny.png diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index 12c7d3c25..12c7d3c25 100755..100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php index 8c4d3e9ac..8c4d3e9ac 100755..100644 --- a/view/theme/darkzero/theme.php +++ b/view/theme/darkzero/theme.php diff --git a/view/theme/diabook-aerith/js/README b/view/theme/diabook-aerith/js/README new file mode 100644 index 000000000..c93b2118e --- /dev/null +++ b/view/theme/diabook-aerith/js/README @@ -0,0 +1,22 @@ +jQuery Resize Plugin Demo + +Version: v2.1.1 +Author: Adeel Ejaz (http://adeelejaz.com/) +License: Dual licensed under MIT and GPL licenses. + +Introduction +aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. + +Usage: +.aeImageResize( height, width ) + +height +An integer representing the maximum height for the image. + +width +An integer representing the maximum width for the image. + +Example +$(function() { + $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); +});
\ No newline at end of file diff --git a/view/theme/diabook-aerith/js/jquery.ae.image.resize.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js new file mode 100644 index 000000000..bac09cd45 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.js @@ -0,0 +1,69 @@ +(function( $ ) { + + $.fn.aeImageResize = function( params ) { + + var aspectRatio = 0 + // Nasty I know but it's done only once, so not too bad I guess + // Alternate suggestions welcome :) + , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) + ; + + // We cannot do much unless we have one of these + if ( !params.height && !params.width ) { + return this; + } + + // Calculate aspect ratio now, if possible + if ( params.height && params.width ) { + aspectRatio = params.width / params.height; + } + + // Attach handler to load + // Handler is executed just once per element + // Load event required for Webkit browsers + return this.one( "load", function() { + + // Remove all attributes and CSS rules + this.removeAttribute( "height" ); + this.removeAttribute( "width" ); + this.style.height = this.style.width = ""; + + var imgHeight = this.height + , imgWidth = this.width + , imgAspectRatio = imgWidth / imgHeight + , bxHeight = params.height + , bxWidth = params.width + , bxAspectRatio = aspectRatio; + + // Work the magic! + // If one parameter is missing, we just force calculate it + if ( !bxAspectRatio ) { + if ( bxHeight ) { + bxAspectRatio = imgAspectRatio + 1; + } else { + bxAspectRatio = imgAspectRatio - 1; + } + } + + // Only resize the images that need resizing + if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { + + if ( imgAspectRatio > bxAspectRatio ) { + bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); + } else { + bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); + } + + this.height = bxHeight; + this.width = bxWidth; + } + }) + .each(function() { + + // Trigger load event (for Gecko and MSIE) + if ( this.complete || isIE6 ) { + $( this ).trigger( "load" ); + } + }); + }; +})( jQuery );
\ No newline at end of file diff --git a/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js new file mode 100644 index 000000000..16c30b123 --- /dev/null +++ b/view/theme/diabook-aerith/js/jquery.ae.image.resize.min.js @@ -0,0 +1 @@ +(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl index f84b902d5..6fab83afc 100644 --- a/view/theme/diabook-aerith/nav.tpl +++ b/view/theme/diabook-aerith/nav.tpl @@ -22,7 +22,7 @@ <span class="icon contacts">$nav.contacts.1</span> <span id="intro-update" class="nav-notify"></span></a> <ul id="nav-contacts-menu" class="menu-popup"> - <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li> + <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -35,7 +35,7 @@ <span id="mail-update" class="nav-notify"></span></a> <ul id="nav-messages-menu" class="menu-popup"> <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li> - <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li> <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li> <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li> </ul> diff --git a/view/theme/diabook-aerith/photo_item.tpl b/view/theme/diabook-aerith/photo_item.tpl new file mode 100644 index 000000000..5d65a89b7 --- /dev/null +++ b/view/theme/diabook-aerith/photo_item.tpl @@ -0,0 +1,65 @@ +{{ if $indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> +</div> +{{ endif }} + +<div class="wall-item-photo-container $indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" > + <a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id"> + <img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id"> + $photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> + <span class="wall-item-ago">- + {{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }} + {{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }} + $body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + + <div class="wall-item-bottom" style="display: table-row;"> + <div class="wall-item-actions"> + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-tools"> + + {{ if $drop.dropping }} + <input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" /> + <a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a> + {{ endif }} + {{ if $edpost }} + <a class="icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + </div> + + </div> + </div> + <div class="wall-item-bottom"> + + </div> +</div> + diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl index 511fc73ac..071972e0c 100755 --- a/view/theme/diabook-aerith/photo_view.tpl +++ b/view/theme/diabook-aerith/photo_view.tpl @@ -24,4 +24,12 @@ {{ endif }} {{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }} -{{ if $edit }}$edit{{ endif }}
\ No newline at end of file +{{ if $edit }}$edit{{ endif }} + +<div style="margin-top:20px"> +</div> +<div id="wall-photo-container"> +$comments +</div> + +$paginate diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl index e28ec2909..6fcffcc9b 100644 --- a/view/theme/diabook-aerith/profile_vcard.tpl +++ b/view/theme/diabook-aerith/profile_vcard.tpl @@ -22,7 +22,7 @@ - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index 6e3b3f822..c1309313b 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1233,7 +1233,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1369,6 +1368,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1469,9 +1469,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1707,7 +1707,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2093,9 +2093,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2168,6 +2169,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index f41c4a98a..48134e124 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1228,7 +1228,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1362,6 +1361,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1459,9 +1459,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1697,7 +1697,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2082,10 +2082,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2158,6 +2158,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 3d53115df..f82652154 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -1290,7 +1308,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1329,6 +1346,122 @@ body .pageheader{ display: table; width: 780px; } +.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-photo-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-photo-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-photo-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-photo-container .wall-item-content { + font-size: 12.5px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.2; + margin-bottom: 14px; +} +.wall-item-photo-container .wall-item-content img { + max-width: 700px; +} +.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-name { + font-weight: bold; +} +.wall-item-photo-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-photo-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-photo-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-tools a { + float: right; +} +.wall-item-photo-container .wall-item-actions-tools input { + float: right; +} +.wall-item-photo-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 40px; + width: 650px; + border-bottom: 1px solid #D2D2D2; +} +.wall-item-photo-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-photo-container { + display: table; + width: 780px; +} +.my-comment-photo { + width: 48px; + margin-left: 40px; + margin-right: 32px; + } +.comment-edit-preview { + width: 500px; + margin-top: 10px; +} +.comment-edit-text-empty { + width: 500px; + border: 1px solid #D2D2D2; + height: 3.2em; + color: #2d2d2d; +} +.comment-edit-text-full { + font-size: 12.5px; + height: 3.3em; + + border: 1px solid #D2D2D2; + width: 500px; +} +.comment-edit-photo { + margin: 10px 0 0; + display: table-cell; +} .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -1382,6 +1515,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1479,9 +1613,9 @@ body .pageheader{ border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1717,7 +1851,7 @@ body .pageheader{ height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2111,10 +2245,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2187,6 +2321,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index e56f0ab74..a1ea51e82 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -3,11 +3,16 @@ /* * Name: Diabook-aerith * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.014) * Author: */ +//print diabook-version for debugging +$diabook_version = "Diabook-aerith (Version: 1.014)"; +$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); + + //change css on network and profilepages $cssFile = null; @@ -333,8 +338,24 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +<script> + $(function(){ + + $(".comment-edit-form").css("display","table"); + + }); + </script>'; + +} $a->page['htmlhead'] .= ' @@ -350,6 +371,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' <script> + $(function() { + $(".oembed.photo img").aeImageResize({height: 400, width: 400}); + }); + $("right_aside").ready(function(){ if($.cookie("close_pages") == "1") diff --git a/view/theme/diabook-blue/js/README b/view/theme/diabook-blue/js/README new file mode 100644 index 000000000..c93b2118e --- /dev/null +++ b/view/theme/diabook-blue/js/README @@ -0,0 +1,22 @@ +jQuery Resize Plugin Demo + +Version: v2.1.1 +Author: Adeel Ejaz (http://adeelejaz.com/) +License: Dual licensed under MIT and GPL licenses. + +Introduction +aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. + +Usage: +.aeImageResize( height, width ) + +height +An integer representing the maximum height for the image. + +width +An integer representing the maximum width for the image. + +Example +$(function() { + $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); +});
\ No newline at end of file diff --git a/view/theme/diabook-blue/js/jquery.ae.image.resize.js b/view/theme/diabook-blue/js/jquery.ae.image.resize.js new file mode 100644 index 000000000..bac09cd45 --- /dev/null +++ b/view/theme/diabook-blue/js/jquery.ae.image.resize.js @@ -0,0 +1,69 @@ +(function( $ ) { + + $.fn.aeImageResize = function( params ) { + + var aspectRatio = 0 + // Nasty I know but it's done only once, so not too bad I guess + // Alternate suggestions welcome :) + , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) + ; + + // We cannot do much unless we have one of these + if ( !params.height && !params.width ) { + return this; + } + + // Calculate aspect ratio now, if possible + if ( params.height && params.width ) { + aspectRatio = params.width / params.height; + } + + // Attach handler to load + // Handler is executed just once per element + // Load event required for Webkit browsers + return this.one( "load", function() { + + // Remove all attributes and CSS rules + this.removeAttribute( "height" ); + this.removeAttribute( "width" ); + this.style.height = this.style.width = ""; + + var imgHeight = this.height + , imgWidth = this.width + , imgAspectRatio = imgWidth / imgHeight + , bxHeight = params.height + , bxWidth = params.width + , bxAspectRatio = aspectRatio; + + // Work the magic! + // If one parameter is missing, we just force calculate it + if ( !bxAspectRatio ) { + if ( bxHeight ) { + bxAspectRatio = imgAspectRatio + 1; + } else { + bxAspectRatio = imgAspectRatio - 1; + } + } + + // Only resize the images that need resizing + if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { + + if ( imgAspectRatio > bxAspectRatio ) { + bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); + } else { + bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); + } + + this.height = bxHeight; + this.width = bxWidth; + } + }) + .each(function() { + + // Trigger load event (for Gecko and MSIE) + if ( this.complete || isIE6 ) { + $( this ).trigger( "load" ); + } + }); + }; +})( jQuery );
\ No newline at end of file diff --git a/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js b/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js new file mode 100644 index 000000000..16c30b123 --- /dev/null +++ b/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js @@ -0,0 +1 @@ +(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index 3b78b5995..fd29d9309 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -22,7 +22,7 @@ <span class="icon contacts">$nav.contacts.1</span> <span id="intro-update" class="nav-notify"></span></a> <ul id="nav-contacts-menu" class="menu-popup"> - <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li> + <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -35,7 +35,7 @@ <span id="mail-update" class="nav-notify"></span></a> <ul id="nav-messages-menu" class="menu-popup"> <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li> - <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li> <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li> <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li> </ul> diff --git a/view/theme/diabook-blue/photo_item.tpl b/view/theme/diabook-blue/photo_item.tpl new file mode 100644 index 000000000..5d65a89b7 --- /dev/null +++ b/view/theme/diabook-blue/photo_item.tpl @@ -0,0 +1,65 @@ +{{ if $indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> +</div> +{{ endif }} + +<div class="wall-item-photo-container $indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" > + <a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id"> + <img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id"> + $photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> + <span class="wall-item-ago">- + {{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }} + {{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }} + $body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + + <div class="wall-item-bottom" style="display: table-row;"> + <div class="wall-item-actions"> + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-tools"> + + {{ if $drop.dropping }} + <input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" /> + <a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a> + {{ endif }} + {{ if $edpost }} + <a class="icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + </div> + + </div> + </div> + <div class="wall-item-bottom"> + + </div> +</div> + diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl index 20926656a..93b01d623 100755 --- a/view/theme/diabook-blue/photo_view.tpl +++ b/view/theme/diabook-blue/photo_view.tpl @@ -26,3 +26,12 @@ {{ if $edit }}$edit{{ endif }} +<div style="margin-top:20px"> +</div> +<div id="wall-photo-container"> +$comments +</div> + +$paginate + + diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl index e28ec2909..6fcffcc9b 100644 --- a/view/theme/diabook-blue/profile_vcard.tpl +++ b/view/theme/diabook-blue/profile_vcard.tpl @@ -22,7 +22,7 @@ - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 991b19849..cba4c3f48 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1199,7 +1199,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1331,6 +1330,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1431,9 +1431,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1669,7 +1669,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2054,9 +2054,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2129,6 +2130,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index fca29d088..3e9a47e68 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1198,7 +1198,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1329,6 +1328,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1426,9 +1426,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1664,7 +1664,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2049,10 +2049,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2125,6 +2125,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 8a05fc4c4..ebf684708 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -1250,7 +1268,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1286,6 +1303,123 @@ body .pageheader{ display: table; width: 780px; } +.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-photo-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-photo-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-photo-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-photo-container .wall-item-content { + font-size: 12.5px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.2; + margin-bottom: 14px; +} +.wall-item-photo-container .wall-item-content img { + max-width: 700px; +} +.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-name { + font-weight: bold; +} +.wall-item-photo-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-photo-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-photo-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-tools a { + float: right; +} +.wall-item-photo-container .wall-item-actions-tools input { + float: right; +} +.wall-item-photo-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 40px; + width: 650px; + border-bottom: 1px solid #D2D2D2; +} +.wall-item-photo-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-photo-container { + display: table; + width: 780px; +} +.my-comment-photo { + width: 48px; + margin-left: 40px; + margin-right: 32px; + } +.comment-edit-preview { + width: 500px; + margin-top: 10px; +} +.comment-edit-text-empty { + width: 500px; + border: 1px solid #D2D2D2; + height: 3.2em; + color: #2d2d2d; +} +.comment-edit-text-full { + font-size: 12.5px; + height: 3.3em; + + border: 1px solid #D2D2D2; + width: 500px; +} +.comment-edit-photo { + margin: 10px 0 0; + display: table-cell; +} + .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -1339,6 +1473,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1436,9 +1571,9 @@ body .pageheader{ border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1674,7 +1809,7 @@ body .pageheader{ height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2067,10 +2202,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2143,6 +2278,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 2e7aca92a..a8b4fcd6c 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -3,11 +3,15 @@ /* * Name: Diabook-blue * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.014) * Author: */ +//print diabook-version for debugging +$diabook_version = "Diabook-blue (Version: 1.014)"; +$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); + //change css on network and profilepages $cssFile = null; @@ -333,8 +337,25 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +<script> + $(function(){ + + $(".comment-edit-form").css("display","table"); + + }); + </script>'; + +} + $a->page['htmlhead'] .= ' @@ -350,6 +371,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' <script> +$(function() { + $(".oembed.photo img").aeImageResize({height: 400, width: 400}); + }); + $("right_aside").ready(function(){ if($.cookie("close_pages") == "1") diff --git a/view/theme/diabook-red/js/README b/view/theme/diabook-red/js/README new file mode 100644 index 000000000..c93b2118e --- /dev/null +++ b/view/theme/diabook-red/js/README @@ -0,0 +1,22 @@ +jQuery Resize Plugin Demo + +Version: v2.1.1 +Author: Adeel Ejaz (http://adeelejaz.com/) +License: Dual licensed under MIT and GPL licenses. + +Introduction +aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. + +Usage: +.aeImageResize( height, width ) + +height +An integer representing the maximum height for the image. + +width +An integer representing the maximum width for the image. + +Example +$(function() { + $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); +});
\ No newline at end of file diff --git a/view/theme/diabook-red/js/jquery.ae.image.resize.js b/view/theme/diabook-red/js/jquery.ae.image.resize.js new file mode 100644 index 000000000..bac09cd45 --- /dev/null +++ b/view/theme/diabook-red/js/jquery.ae.image.resize.js @@ -0,0 +1,69 @@ +(function( $ ) { + + $.fn.aeImageResize = function( params ) { + + var aspectRatio = 0 + // Nasty I know but it's done only once, so not too bad I guess + // Alternate suggestions welcome :) + , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) + ; + + // We cannot do much unless we have one of these + if ( !params.height && !params.width ) { + return this; + } + + // Calculate aspect ratio now, if possible + if ( params.height && params.width ) { + aspectRatio = params.width / params.height; + } + + // Attach handler to load + // Handler is executed just once per element + // Load event required for Webkit browsers + return this.one( "load", function() { + + // Remove all attributes and CSS rules + this.removeAttribute( "height" ); + this.removeAttribute( "width" ); + this.style.height = this.style.width = ""; + + var imgHeight = this.height + , imgWidth = this.width + , imgAspectRatio = imgWidth / imgHeight + , bxHeight = params.height + , bxWidth = params.width + , bxAspectRatio = aspectRatio; + + // Work the magic! + // If one parameter is missing, we just force calculate it + if ( !bxAspectRatio ) { + if ( bxHeight ) { + bxAspectRatio = imgAspectRatio + 1; + } else { + bxAspectRatio = imgAspectRatio - 1; + } + } + + // Only resize the images that need resizing + if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { + + if ( imgAspectRatio > bxAspectRatio ) { + bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); + } else { + bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); + } + + this.height = bxHeight; + this.width = bxWidth; + } + }) + .each(function() { + + // Trigger load event (for Gecko and MSIE) + if ( this.complete || isIE6 ) { + $( this ).trigger( "load" ); + } + }); + }; +})( jQuery );
\ No newline at end of file diff --git a/view/theme/diabook-red/js/jquery.ae.image.resize.min.js b/view/theme/diabook-red/js/jquery.ae.image.resize.min.js new file mode 100644 index 000000000..16c30b123 --- /dev/null +++ b/view/theme/diabook-red/js/jquery.ae.image.resize.min.js @@ -0,0 +1 @@ +(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl index fdf748cb2..dc3fd0cde 100644 --- a/view/theme/diabook-red/nav.tpl +++ b/view/theme/diabook-red/nav.tpl @@ -22,7 +22,7 @@ <span class="icon contacts">$nav.contacts.1</span> <span id="intro-update" class="nav-notify"></span></a> <ul id="nav-contacts-menu" class="menu-popup"> - <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li> + <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -35,7 +35,7 @@ <span id="mail-update" class="nav-notify"></span></a> <ul id="nav-messages-menu" class="menu-popup"> <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li> - <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li> <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li> <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li> </ul> diff --git a/view/theme/diabook-red/photo_item.tpl b/view/theme/diabook-red/photo_item.tpl new file mode 100644 index 000000000..5d65a89b7 --- /dev/null +++ b/view/theme/diabook-red/photo_item.tpl @@ -0,0 +1,65 @@ +{{ if $indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> +</div> +{{ endif }} + +<div class="wall-item-photo-container $indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" > + <a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id"> + <img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id"> + $photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> + <span class="wall-item-ago">- + {{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }} + {{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }} + $body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + + <div class="wall-item-bottom" style="display: table-row;"> + <div class="wall-item-actions"> + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-tools"> + + {{ if $drop.dropping }} + <input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" /> + <a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a> + {{ endif }} + {{ if $edpost }} + <a class="icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + </div> + + </div> + </div> + <div class="wall-item-bottom"> + + </div> +</div> + diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl index 511fc73ac..09dfb2aae 100755 --- a/view/theme/diabook-red/photo_view.tpl +++ b/view/theme/diabook-red/photo_view.tpl @@ -24,4 +24,13 @@ {{ endif }} {{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }} -{{ if $edit }}$edit{{ endif }}
\ No newline at end of file +{{ if $edit }}$edit{{ endif }} + +<div style="margin-top:20px"> +</div> +<div id="wall-photo-container"> +$comments +</div> + +$paginate + diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 863ad87ad..c91e1ff09 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -529,6 +529,7 @@ background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 6 background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%); +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f'); background-image: -webkit-gradient( linear, @@ -1233,7 +1234,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1365,6 +1365,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1465,9 +1466,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1703,7 +1704,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2090,9 +2091,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2165,6 +2167,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index dcd0092c9..4fd0803bd 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1211,7 +1211,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1342,6 +1341,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1439,9 +1439,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1677,7 +1677,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2063,10 +2063,10 @@ ul.tabs li .active { /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2139,6 +2139,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index b1061f035..ef06ef5ca 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -447,6 +447,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -1280,7 +1298,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1316,6 +1333,122 @@ body .pageheader{ display: table; width: 780px; } +.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-photo-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-photo-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} +.wall-item-photo-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-photo-container .wall-item-content { + font-size: 12.5px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.2; + margin-bottom: 14px; +} +.wall-item-photo-container .wall-item-content img { + max-width: 700px; +} +.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-photo-container .wall-item-name { + font-weight: bold; +} +.wall-item-photo-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-photo-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-photo-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} +.wall-item-photo-container .wall-item-actions-tools a { + float: right; +} +.wall-item-photo-container .wall-item-actions-tools input { + float: right; +} +.wall-item-photo-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 40px; + width: 650px; + border-bottom: 1px solid #D2D2D2; +} +.wall-item-photo-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-photo-container { + display: table; + width: 780px; +} +.my-comment-photo { + width: 48px; + margin-left: 40px; + margin-right: 32px; + } +.comment-edit-preview { + width: 500px; + margin-top: 10px; +} +.comment-edit-text-empty { + width: 500px; + border: 1px solid #D2D2D2; + height: 3.2em; + color: #2d2d2d; +} +.comment-edit-text-full { + font-size: 12.5px; + height: 3.3em; + + border: 1px solid #D2D2D2; + width: 500px; +} +.comment-edit-photo { + margin: 10px 0 0; + display: table-cell; +} .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -1369,6 +1502,7 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1466,9 +1600,9 @@ body .pageheader{ border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1704,7 +1838,7 @@ body .pageheader{ height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2097,10 +2231,10 @@ height: 350px; /* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 2px 5px 2px 5px; -max-height: 85%; -max-width: 85%; +margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2173,6 +2307,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 0db9818e4..fae26ae70 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,11 +3,15 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.014) * Author: */ +//print diabook-version for debugging +$diabook_version = "Diabook-red (Version: 1.014)"; +$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); + //change css on network and profilepages $cssFile = null; @@ -334,8 +338,25 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" $cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.cookie.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); + //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +<script> + $(function(){ + + $(".comment-edit-form").css("display","table"); + + }); + </script>'; + +} $a->page['htmlhead'] .= ' @@ -351,6 +372,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] == $a->page['htmlhead'] .= ' <script> +$(function() { + $(".oembed.photo img").aeImageResize({height: 400, width: 400}); + }); + $("right_aside").ready(function(){ if($.cookie("close_pages") == "1") diff --git a/view/theme/diabook/js/README b/view/theme/diabook/js/README new file mode 100644 index 000000000..c93b2118e --- /dev/null +++ b/view/theme/diabook/js/README @@ -0,0 +1,22 @@ +jQuery Resize Plugin Demo + +Version: v2.1.1 +Author: Adeel Ejaz (http://adeelejaz.com/) +License: Dual licensed under MIT and GPL licenses. + +Introduction +aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions. + +Usage: +.aeImageResize( height, width ) + +height +An integer representing the maximum height for the image. + +width +An integer representing the maximum width for the image. + +Example +$(function() { + $( ".resizeme" ).aeImageResize({ height: 250, width: 250 }); +});
\ No newline at end of file diff --git a/view/theme/diabook/js/jquery.ae.image.resize.js b/view/theme/diabook/js/jquery.ae.image.resize.js new file mode 100644 index 000000000..bac09cd45 --- /dev/null +++ b/view/theme/diabook/js/jquery.ae.image.resize.js @@ -0,0 +1,69 @@ +(function( $ ) { + + $.fn.aeImageResize = function( params ) { + + var aspectRatio = 0 + // Nasty I know but it's done only once, so not too bad I guess + // Alternate suggestions welcome :) + , isIE6 = $.browser.msie && (6 == ~~ $.browser.version) + ; + + // We cannot do much unless we have one of these + if ( !params.height && !params.width ) { + return this; + } + + // Calculate aspect ratio now, if possible + if ( params.height && params.width ) { + aspectRatio = params.width / params.height; + } + + // Attach handler to load + // Handler is executed just once per element + // Load event required for Webkit browsers + return this.one( "load", function() { + + // Remove all attributes and CSS rules + this.removeAttribute( "height" ); + this.removeAttribute( "width" ); + this.style.height = this.style.width = ""; + + var imgHeight = this.height + , imgWidth = this.width + , imgAspectRatio = imgWidth / imgHeight + , bxHeight = params.height + , bxWidth = params.width + , bxAspectRatio = aspectRatio; + + // Work the magic! + // If one parameter is missing, we just force calculate it + if ( !bxAspectRatio ) { + if ( bxHeight ) { + bxAspectRatio = imgAspectRatio + 1; + } else { + bxAspectRatio = imgAspectRatio - 1; + } + } + + // Only resize the images that need resizing + if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) { + + if ( imgAspectRatio > bxAspectRatio ) { + bxHeight = ~~ ( imgHeight / imgWidth * bxWidth ); + } else { + bxWidth = ~~ ( imgWidth / imgHeight * bxHeight ); + } + + this.height = bxHeight; + this.width = bxWidth; + } + }) + .each(function() { + + // Trigger load event (for Gecko and MSIE) + if ( this.complete || isIE6 ) { + $( this ).trigger( "load" ); + } + }); + }; +})( jQuery );
\ No newline at end of file diff --git a/view/theme/diabook/js/jquery.ae.image.resize.min.js b/view/theme/diabook/js/jquery.ae.image.resize.min.js new file mode 100644 index 000000000..16c30b123 --- /dev/null +++ b/view/theme/diabook/js/jquery.ae.image.resize.min.js @@ -0,0 +1 @@ +(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);
\ No newline at end of file diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 78eb34197..522fb22b4 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -22,7 +22,7 @@ <span class="icon contacts">$nav.contacts.1</span> <span id="intro-update" class="nav-notify"></span></a> <ul id="nav-contacts-menu" class="menu-popup"> - <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li> + <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -36,7 +36,7 @@ <span id="mail-update" class="nav-notify"></span></a> <ul id="nav-messages-menu" class="menu-popup"> <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li> - <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li> + <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li> <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li> <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li> </ul> diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl new file mode 100644 index 000000000..026007271 --- /dev/null +++ b/view/theme/diabook/oembed_video.tpl @@ -0,0 +1,4 @@ +<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'> + <img width='$tw' height='$th' src='$turl' > + <div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div> +</a> diff --git a/view/theme/diabook/photo_item.tpl b/view/theme/diabook/photo_item.tpl new file mode 100644 index 000000000..5d65a89b7 --- /dev/null +++ b/view/theme/diabook/photo_item.tpl @@ -0,0 +1,65 @@ +{{ if $indent }}{{ else }} +<div class="wall-item-decor"> + <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> +</div> +{{ endif }} + +<div class="wall-item-photo-container $indent"> + <div class="wall-item-item"> + <div class="wall-item-info"> + <div class="contact-photo-wrapper" > + <a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id"> + <img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" /> + </a> + <a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a> + <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id"> + $photo_menu + </ul> + + </div> + </div> + <div class="wall-item-actions-author"> + <a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> + <span class="wall-item-ago">- + {{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }} + {{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }} + </span> + </div> + <div class="wall-item-content"> + {{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }} + $body + </div> + </div> + <div class="wall-item-bottom"> + <div class="wall-item-links"> + </div> + <div class="wall-item-tags"> + {{ for $tags as $tag }} + <span class='tag'>$tag</span> + {{ endfor }} + </div> + </div> + + <div class="wall-item-bottom" style="display: table-row;"> + <div class="wall-item-actions"> + </div> + <div class="wall-item-actions"> + + <div class="wall-item-actions-tools"> + + {{ if $drop.dropping }} + <input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" /> + <a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a> + {{ endif }} + {{ if $edpost }} + <a class="icon pencil" href="$edpost.0" title="$edpost.1"></a> + {{ endif }} + </div> + + </div> + </div> + <div class="wall-item-bottom"> + + </div> +</div> + diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl index 511fc73ac..272b67048 100755..100644 --- a/view/theme/diabook/photo_view.tpl +++ b/view/theme/diabook/photo_view.tpl @@ -4,24 +4,30 @@ <div id="photo-edit-link-wrap"> {{ if $tools }} <a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a> -- +| <a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a> {{ endif }} -{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }} -</div> - -<div id="photo-photo"> - {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} - <a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a> - {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} +{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }} </div> +{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} +<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div> +{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} <div id="photo-photo-end"></div> -<div id="photo-caption" >$desc</div> +<div id="photo-caption">$desc</div> {{ if $tags }} <div id="in-this-photo-text">$tags.0</div> <div id="in-this-photo">$tags.1</div> {{ endif }} {{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }} -{{ if $edit }}$edit{{ endif }}
\ No newline at end of file +{{ if $edit }}$edit{{ endif }} + +<div style="margin-top:20px"> +</div> +<div id="wall-photo-container"> +$comments +</div> + +$paginate + diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl index e28ec2909..b982a2069 100644 --- a/view/theme/diabook/profile_vcard.tpl +++ b/view/theme/diabook/profile_vcard.tpl @@ -22,7 +22,7 @@ - <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index c40a9bf50..ef30cd07b 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1183,7 +1183,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1308,6 +1307,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1405,9 +1405,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1643,7 +1643,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2099,6 +2099,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index a34ee4cc9..9d6542ac2 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1176,7 +1176,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1302,6 +1301,7 @@ transition: all 0.2s ease-in-out; max-width: 420px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; } .wall-item-container .wall-item-content img { @@ -1399,9 +1399,9 @@ transition: all 0.2s ease-in-out; border: 1px solid #2d2d2d; } .comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; + width: 500px; margin-top: 10px; + background-color: #fff797; } .comment-edit-preview .contact-photo { width: 32px; @@ -1637,7 +1637,7 @@ transition: all 0.2s ease-in-out; height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2023,6 +2023,8 @@ ul.tabs li .active { /* photo */ .photo { border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2094,6 +2096,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c097545e5..e99aa5644 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -449,6 +449,24 @@ a:hover { /*color: #005c94; */ text-decoration: underline; } +.intro-end { + border-bottom: 1px solid black; + clear: both; + margin-bottom: 25px; + padding-bottom: 25px; + width: 75%; + } +.intro-form-end { + clear: both; + } +.intro-fullname { + padding-bottom: 5px; + padding-top: 5px; + } +.intro-wrapper-end { + clear: both; + padding-bottom: 5px; + } code { font-family: Courier, monospace; white-space: pre; @@ -1232,7 +1250,6 @@ body .pageheader{ padding: 0; } .tab.button { - margin-right: 5px; margin-left: 5px; /*background: none repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CCCCCC; @@ -1269,6 +1286,9 @@ body .pageheader{ .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { display: table-row; } +.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} .wall-item-bottom { font-size: 13px; } @@ -1294,16 +1314,32 @@ body .pageheader{ text-align: left; width: 80px; } +.wall-item-photo-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} .wall-item-container .wall-item-location { padding-right: 40px; display: table-cell; } +.wall-item-photo-container .wall-item-location { + padding-right: 40px; + display: table-cell; +} .wall-item-container .wall-item-ago { word-wrap: break-word; width: 50px; margin-left: 10px; color: #999; } +.wall-item-photo-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} .wall-item-location { clear: both; @@ -1317,15 +1353,29 @@ body .pageheader{ max-width: 720px; word-wrap: break-word; line-height: 1.2; + margin-bottom: 14px; +} +.wall-item-photo-container .wall-item-content { + font-size: 12.5px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.2; + margin-bottom: 14px; } - .wall-item-container .wall-item-content img { max-width: 700px; } +.wall-item-photo-container .wall-item-content img { + max-width: 700px; +} .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; vertical-align: middle; } +.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} .wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { opacity: 0.5; -webkit-transition: all 0.2s ease-in-out; @@ -1334,6 +1384,14 @@ body .pageheader{ -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } +.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} .wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { opacity: 1; -webkit-transition: all 0.2s ease-in-out; @@ -1342,14 +1400,22 @@ body .pageheader{ -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -.wall-item-container .wall-item-name { +.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover { + opacity: 1; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container .wall-item-name, .wall-item-photo-container .wall-item-name { font-weight: bold; } -.wall-item-container .wall-item-actions-author { +.wall-item-container .wall-item-actions-author, .wall-item-photo-container .wall-item-actions-author { width: 100%; margin-bottom: 0.3em; } -.wall-item-container .wall-item-actions-social { +.wall-item-container .wall-item-actions-social, .wall-item-photo-container .wall-item-actions-social { float: left; margin-bottom: 1px; display: table-cell; @@ -1357,20 +1423,35 @@ body .pageheader{ .wall-item-container .wall-item-actions-social a { margin-right: 1em; } +.wall-item-photo-container .wall-item-actions-social a { + margin-right: 1em; +} .wall-item-actions-social a { float: left; } + .wall-item-container .wall-item-actions-tools { float: right; width: 80px; display: table-cell; } +.wall-item-photo-container .wall-item-actions-tools { + float: right; + width: 80px; + display: table-cell; +} .wall-item-container .wall-item-actions-tools a { float: right; } +.wall-item-photo-container .wall-item-actions-tools a { + float: right; +} .wall-item-container .wall-item-actions-tools input { float: right; } +.wall-item-photo-container .wall-item-actions-tools input { + float: right; +} .wall-item-container.comment { margin-top: 5px; margin-bottom: 5px; @@ -1378,6 +1459,48 @@ body .pageheader{ width: 700px; border-bottom: 1px solid hsl(198, 21%, 79%); } +.wall-item-photo-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 40px; + width: 650px; + border-bottom: 1px solid #D2D2D2; +} +.wall-item-photo-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-photo-container { + display: table; + width: 780px; +} + +.my-comment-photo { + width: 48px; + margin-left: 40px; + margin-right: 32px; + } +.comment-edit-preview { + width: 500px; + margin-top: 10px; +} +.comment-edit-text-empty { + width: 500px; + border: 1px solid #D2D2D2; + height: 3.2em; + color: #2d2d2d; +} +.comment-edit-text-full { + font-size: 12.5px; + height: 3.3em; + + border: 1px solid #D2D2D2; + width: 500px; +} +.comment-edit-photo { + margin: 10px 0 0; + display: table-cell; +} .wall-item-container.comment .contact-photo { width: 32px; height: 32px; @@ -1413,11 +1536,7 @@ body .pageheader{ color: #2d2d2d; border: 1px solid #2d2d2d; } -.comment-edit-preview { - width: 710px; - border: 1px solid #2d2d2d; - margin-top: 10px; -} + .comment-edit-preview .contact-photo { width: 32px; height: 32px; @@ -1429,6 +1548,11 @@ body .pageheader{ top: 15px !important; left: 15px !important; } +.comment-edit-preview { + width: 500px; + margin-top: 10px; + background-color: #fff797; +} .comment-edit-preview .wall-item-links { padding-left: 12px; } @@ -1652,7 +1776,7 @@ body .pageheader{ height: 20px; margin: 0 0 5px; width: 60%; - border: 1px solid #ffffff; + border: 1px solid #d2d2d2; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -2046,6 +2170,8 @@ height: 350px; /* photo */ .photo { border-radius: 10px; +height: 145px !important; +width: 145px !important; } .lframe { float: left; @@ -2117,6 +2243,11 @@ blockquote { border-left: 1px solid #D2D2D2; padding-left: 9px; margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + font-size: large; + font-weight: bold; } .aprofile dt{ box-shadow: 1px 1px 5px 0; @@ -2377,13 +2508,8 @@ a.mail-list-link { margin-right: 5px; margin-top: 30px; } -.comment-edit-text-empty { - margin: 10px 0 0; - width: 85%; -} -.comment-edit-photo { - margin: 10px 0 0; -} + + .wall-item-like-buttons .icon.like { float: left; } diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 50a7c6974..fbe42a304 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,11 +3,14 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.012) + * Version: (Version: 1.014) * Author: */ +//print diabook-version for debugging +$diabook_version = "Diabook (Version: 1.014)"; +$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); //change css on network and profilepages $cssFile = null; @@ -285,6 +288,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ } } + + //tabs at aside on settings page if ($a->argv[0] === "settings"){ @@ -339,10 +344,28 @@ if ($a->argv[0] === "settings"){ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); //load jquery.cookie.js -$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js"; -$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS); +$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS); + +//load jquery.ae.image.resize.js +$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js"; +$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); + //js scripts +//comment-edit-wrapper on photo_view +if ($a->argv[0].$a->argv[2] === "photos"."image"){ + +$a->page['htmlhead'] .= ' +<script> + $(function(){ + + $(".comment-edit-form").css("display","table"); + + }); + </script>'; + +} $a->page['htmlhead'] .= ' @@ -350,20 +373,37 @@ $a->page['htmlhead'] .= ' $(function() { $("a.lightbox").fancybox(); // Select all links with lightbox class }); + + </script>'; + +$a->page['htmlhead'] .= ' + <script> - $(document).ready(function (){ - $("iframe").each(function(){ - var url = $(this).attr("src"); - $(this).attr("src",url+"?wmode=transparent"); }); +$(document).ready(function() { + $(".embed_yt iframe").each(function(){ + var ifr_source = $(this).attr("src"); + var wmode = "wmode=transparent"; + if(ifr_source.indexOf("?") != -1) { + var getQString = ifr_source.split("?"); + var oldString = getQString[1]; + var newString = getQString[0]; + $(this).attr("src",newString+"?"+wmode+"&"+oldString); + } + else $(this).attr("src",ifr_source+"?"+wmode); }); +}); </script>'; - + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' <script> + $(function() { + $(".oembed.photo img").aeImageResize({height: 400, width: 400}); + }); + $("right_aside").ready(function(){ if($.cookie("close_pages") == "1") diff --git a/view/theme/dispy-dark/fpostit/fpostit.js b/view/theme/dispy-dark/fpostit/fpostit.js index eb593d838..eb593d838 100755..100644 --- a/view/theme/dispy-dark/fpostit/fpostit.js +++ b/view/theme/dispy-dark/fpostit/fpostit.js diff --git a/view/theme/dispy/connect.png b/view/theme/dispy/connect.png Binary files differindex b76fc13dc..b76fc13dc 100755..100644 --- a/view/theme/dispy/connect.png +++ b/view/theme/dispy/connect.png diff --git a/view/theme/dispy/fpostit/fpostit.js b/view/theme/dispy/fpostit/fpostit.js index d18f5d345..d18f5d345 100755..100644 --- a/view/theme/dispy/fpostit/fpostit.js +++ b/view/theme/dispy/fpostit/fpostit.js diff --git a/view/theme/dispy/login-bg.gif b/view/theme/dispy/login-bg.gif Binary files differindex cde836c89..cde836c89 100755..100644 --- a/view/theme/dispy/login-bg.gif +++ b/view/theme/dispy/login-bg.gif diff --git a/view/theme/dispy/menu-user-pin.jpg b/view/theme/dispy/menu-user-pin.jpg Binary files differindex 26449569f..26449569f 100755..100644 --- a/view/theme/dispy/menu-user-pin.jpg +++ b/view/theme/dispy/menu-user-pin.jpg diff --git a/view/theme/dispy/photo-menu.jpg b/view/theme/dispy/photo-menu.jpg Binary files differindex fde5eb535..fde5eb535 100755..100644 --- a/view/theme/dispy/photo-menu.jpg +++ b/view/theme/dispy/photo-menu.jpg diff --git a/view/theme/dispy/star.png b/view/theme/dispy/star.png Binary files differindex a327ba14e..a327ba14e 100755..100644 --- a/view/theme/dispy/star.png +++ b/view/theme/dispy/star.png diff --git a/view/theme/duepuntozero/border.jpg b/view/theme/duepuntozero/border.jpg Binary files differindex 034a1cb63..034a1cb63 100755..100644 --- a/view/theme/duepuntozero/border.jpg +++ b/view/theme/duepuntozero/border.jpg diff --git a/view/theme/duepuntozero/ff-16.jpg b/view/theme/duepuntozero/ff-16.jpg Binary files differindex 3621f5914..3621f5914 100755..100644 --- a/view/theme/duepuntozero/ff-16.jpg +++ b/view/theme/duepuntozero/ff-16.jpg diff --git a/view/theme/duepuntozero/friendika-16.png b/view/theme/duepuntozero/friendika-16.png Binary files differindex 1a742ecdc..1a742ecdc 100755..100644 --- a/view/theme/duepuntozero/friendika-16.png +++ b/view/theme/duepuntozero/friendika-16.png diff --git a/view/theme/duepuntozero/head.jpg b/view/theme/duepuntozero/head.jpg Binary files differindex 6210b76be..6210b76be 100755..100644 --- a/view/theme/duepuntozero/head.jpg +++ b/view/theme/duepuntozero/head.jpg diff --git a/view/theme/duepuntozero/lock.cur b/view/theme/duepuntozero/lock.cur Binary files differindex 892c5e851..892c5e851 100755..100644 --- a/view/theme/duepuntozero/lock.cur +++ b/view/theme/duepuntozero/lock.cur diff --git a/view/theme/duepuntozero/login-bg.gif b/view/theme/duepuntozero/login-bg.gif Binary files differindex cde836c89..cde836c89 100755..100644 --- a/view/theme/duepuntozero/login-bg.gif +++ b/view/theme/duepuntozero/login-bg.gif diff --git a/view/theme/duepuntozero/photo-menu.jpg b/view/theme/duepuntozero/photo-menu.jpg Binary files differindex fde5eb535..fde5eb535 100755..100644 --- a/view/theme/duepuntozero/photo-menu.jpg +++ b/view/theme/duepuntozero/photo-menu.jpg diff --git a/view/theme/duepuntozero/shiny.png b/view/theme/duepuntozero/shiny.png Binary files differindex 994c0d05d..994c0d05d 100755..100644 --- a/view/theme/duepuntozero/shiny.png +++ b/view/theme/duepuntozero/shiny.png diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index c30e643ce..c30e643ce 100755..100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php index 701fb1349..701fb1349 100755..100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php diff --git a/view/theme/easterbunny/border.jpg b/view/theme/easterbunny/border.jpg Binary files differindex 66c7a6fcc..66c7a6fcc 100755..100644 --- a/view/theme/easterbunny/border.jpg +++ b/view/theme/easterbunny/border.jpg diff --git a/view/theme/easterbunny/head.jpg b/view/theme/easterbunny/head.jpg Binary files differindex 1acd2ddb8..1acd2ddb8 100755..100644 --- a/view/theme/easterbunny/head.jpg +++ b/view/theme/easterbunny/head.jpg diff --git a/view/theme/easterbunny/shiny.png b/view/theme/easterbunny/shiny.png Binary files differindex d3f71ee1d..d3f71ee1d 100755..100644 --- a/view/theme/easterbunny/shiny.png +++ b/view/theme/easterbunny/shiny.png diff --git a/view/theme/easterbunny/style.css b/view/theme/easterbunny/style.css index ab2e07053..ab2e07053 100755..100644 --- a/view/theme/easterbunny/style.css +++ b/view/theme/easterbunny/style.css diff --git a/view/theme/easterbunny/theme.php b/view/theme/easterbunny/theme.php index 338f40cbf..338f40cbf 100755..100644 --- a/view/theme/easterbunny/theme.php +++ b/view/theme/easterbunny/theme.php diff --git a/view/theme/facepark/border.jpg b/view/theme/facepark/border.jpg Binary files differindex 034a1cb63..034a1cb63 100755..100644 --- a/view/theme/facepark/border.jpg +++ b/view/theme/facepark/border.jpg diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl index 3503c3843..3503c3843 100755..100644 --- a/view/theme/facepark/comment_item.tpl +++ b/view/theme/facepark/comment_item.tpl diff --git a/view/theme/facepark/contact_template.tpl b/view/theme/facepark/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/theme/facepark/contact_template.tpl +++ b/view/theme/facepark/contact_template.tpl diff --git a/view/theme/facepark/conversation.tpl b/view/theme/facepark/conversation.tpl index 43bb1dd47..43bb1dd47 100755..100644 --- a/view/theme/facepark/conversation.tpl +++ b/view/theme/facepark/conversation.tpl diff --git a/view/theme/facepark/ff-16.jpg b/view/theme/facepark/ff-16.jpg Binary files differindex 3621f5914..3621f5914 100755..100644 --- a/view/theme/facepark/ff-16.jpg +++ b/view/theme/facepark/ff-16.jpg diff --git a/view/theme/facepark/friendika-16.png b/view/theme/facepark/friendika-16.png Binary files differindex 1a742ecdc..1a742ecdc 100755..100644 --- a/view/theme/facepark/friendika-16.png +++ b/view/theme/facepark/friendika-16.png diff --git a/view/theme/facepark/group_side.tpl b/view/theme/facepark/group_side.tpl index 0353b1d2c..0353b1d2c 100755..100644 --- a/view/theme/facepark/group_side.tpl +++ b/view/theme/facepark/group_side.tpl diff --git a/view/theme/facepark/head.jpg b/view/theme/facepark/head.jpg Binary files differindex 6210b76be..6210b76be 100755..100644 --- a/view/theme/facepark/head.jpg +++ b/view/theme/facepark/head.jpg diff --git a/view/theme/facepark/jot.tpl b/view/theme/facepark/jot.tpl index 5fe1f954e..5fe1f954e 100755..100644 --- a/view/theme/facepark/jot.tpl +++ b/view/theme/facepark/jot.tpl diff --git a/view/theme/facepark/lock.cur b/view/theme/facepark/lock.cur Binary files differindex 892c5e851..892c5e851 100755..100644 --- a/view/theme/facepark/lock.cur +++ b/view/theme/facepark/lock.cur diff --git a/view/theme/facepark/login-bg.gif b/view/theme/facepark/login-bg.gif Binary files differindex cde836c89..cde836c89 100755..100644 --- a/view/theme/facepark/login-bg.gif +++ b/view/theme/facepark/login-bg.gif diff --git a/view/theme/facepark/nav.tpl b/view/theme/facepark/nav.tpl index 4675c3e5c..4675c3e5c 100755..100644 --- a/view/theme/facepark/nav.tpl +++ b/view/theme/facepark/nav.tpl diff --git a/view/theme/facepark/nets.tpl b/view/theme/facepark/nets.tpl index b0cb8890c..b0cb8890c 100755..100644 --- a/view/theme/facepark/nets.tpl +++ b/view/theme/facepark/nets.tpl diff --git a/view/theme/facepark/photo-menu.jpg b/view/theme/facepark/photo-menu.jpg Binary files differindex fde5eb535..fde5eb535 100755..100644 --- a/view/theme/facepark/photo-menu.jpg +++ b/view/theme/facepark/photo-menu.jpg diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl index 154f22363..154f22363 100755..100644 --- a/view/theme/facepark/profile_vcard.tpl +++ b/view/theme/facepark/profile_vcard.tpl diff --git a/view/theme/facepark/saved_searches_aside.tpl b/view/theme/facepark/saved_searches_aside.tpl index e6a0d6278..e6a0d6278 100755..100644 --- a/view/theme/facepark/saved_searches_aside.tpl +++ b/view/theme/facepark/saved_searches_aside.tpl diff --git a/view/theme/facepark/search_item.tpl b/view/theme/facepark/search_item.tpl index bfad1b7b7..bfad1b7b7 100755..100644 --- a/view/theme/facepark/search_item.tpl +++ b/view/theme/facepark/search_item.tpl diff --git a/view/theme/facepark/shiny.png b/view/theme/facepark/shiny.png Binary files differindex 994c0d05d..994c0d05d 100755..100644 --- a/view/theme/facepark/shiny.png +++ b/view/theme/facepark/shiny.png diff --git a/view/theme/facepark/theme.php b/view/theme/facepark/theme.php index 701fb1349..701fb1349 100755..100644 --- a/view/theme/facepark/theme.php +++ b/view/theme/facepark/theme.php diff --git a/view/theme/facepark/wall_item.tpl b/view/theme/facepark/wall_item.tpl index 2c88fc598..2c88fc598 100755..100644 --- a/view/theme/facepark/wall_item.tpl +++ b/view/theme/facepark/wall_item.tpl diff --git a/view/theme/facepark/wallwall_item.tpl b/view/theme/facepark/wallwall_item.tpl index 211906c93..211906c93 100755..100644 --- a/view/theme/facepark/wallwall_item.tpl +++ b/view/theme/facepark/wallwall_item.tpl diff --git a/view/theme/greenzero/border.jpg b/view/theme/greenzero/border.jpg Binary files differindex 034a1cb63..034a1cb63 100755..100644 --- a/view/theme/greenzero/border.jpg +++ b/view/theme/greenzero/border.jpg diff --git a/view/theme/greenzero/greenicons.png b/view/theme/greenzero/greenicons.png Binary files differindex 2644e4284..2644e4284 100755..100644 --- a/view/theme/greenzero/greenicons.png +++ b/view/theme/greenzero/greenicons.png diff --git a/view/theme/greenzero/head.jpg b/view/theme/greenzero/head.jpg Binary files differindex c69776214..c69776214 100755..100644 --- a/view/theme/greenzero/head.jpg +++ b/view/theme/greenzero/head.jpg diff --git a/view/theme/greenzero/shiny.png b/view/theme/greenzero/shiny.png Binary files differindex 994c0d05d..994c0d05d 100755..100644 --- a/view/theme/greenzero/shiny.png +++ b/view/theme/greenzero/shiny.png diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css index 355e7829a..355e7829a 100755..100644 --- a/view/theme/greenzero/style.css +++ b/view/theme/greenzero/style.css diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php index ceec4dd97..ceec4dd97 100755..100644 --- a/view/theme/greenzero/theme.php +++ b/view/theme/greenzero/theme.php diff --git a/view/theme/purplezero/border.jpg b/view/theme/purplezero/border.jpg Binary files differindex 66c7a6fcc..66c7a6fcc 100755..100644 --- a/view/theme/purplezero/border.jpg +++ b/view/theme/purplezero/border.jpg diff --git a/view/theme/purplezero/head.jpg b/view/theme/purplezero/head.jpg Binary files differindex 1acd2ddb8..1acd2ddb8 100755..100644 --- a/view/theme/purplezero/head.jpg +++ b/view/theme/purplezero/head.jpg diff --git a/view/theme/purplezero/shiny.png b/view/theme/purplezero/shiny.png Binary files differindex d3f71ee1d..d3f71ee1d 100755..100644 --- a/view/theme/purplezero/shiny.png +++ b/view/theme/purplezero/shiny.png diff --git a/view/theme/purplezero/style.css b/view/theme/purplezero/style.css index f0d5b96b9..f0d5b96b9 100755..100644 --- a/view/theme/purplezero/style.css +++ b/view/theme/purplezero/style.css diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php index ceec4dd97..ceec4dd97 100755..100644 --- a/view/theme/purplezero/theme.php +++ b/view/theme/purplezero/theme.php diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl index cde4ca3ca..cde4ca3ca 100755..100644 --- a/view/theme/quattro/comment_item.tpl +++ b/view/theme/quattro/comment_item.tpl diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl index b826acc65..b826acc65 100755..100644 --- a/view/theme/quattro/contact_template.tpl +++ b/view/theme/quattro/contact_template.tpl diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index ff202bbe4..ff202bbe4 100755..100644 --- a/view/theme/quattro/conversation.tpl +++ b/view/theme/quattro/conversation.tpl diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less index b6d487f92..b6d487f92 100755..100644 --- a/view/theme/quattro/dark/colors.less +++ b/view/theme/quattro/dark/colors.less diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 1d951aba8..1d951aba8 100755..100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css diff --git a/view/theme/quattro/dark/style.less b/view/theme/quattro/dark/style.less index 7d81e788a..7d81e788a 100755..100644 --- a/view/theme/quattro/dark/style.less +++ b/view/theme/quattro/dark/style.less diff --git a/view/theme/quattro/experimental b/view/theme/quattro/experimental index e69de29bb..e69de29bb 100755..100644 --- a/view/theme/quattro/experimental +++ b/view/theme/quattro/experimental diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less index bc78c3fda..bc78c3fda 100755..100644 --- a/view/theme/quattro/green/colors.less +++ b/view/theme/quattro/green/colors.less diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index e7cc549d0..e7cc549d0 100755..100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css diff --git a/view/theme/quattro/green/style.less b/view/theme/quattro/green/style.less index 7d81e788a..7d81e788a 100755..100644 --- a/view/theme/quattro/green/style.less +++ b/view/theme/quattro/green/style.less diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl index 596a8d13f..596a8d13f 100755..100644 --- a/view/theme/quattro/group_side.tpl +++ b/view/theme/quattro/group_side.tpl diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less index e314fba1f..e314fba1f 100755..100644 --- a/view/theme/quattro/icons.less +++ b/view/theme/quattro/icons.less diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 2f89d4372..2f89d4372 100755..100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl index 989f17878..989f17878 100755..100644 --- a/view/theme/quattro/mail_conv.tpl +++ b/view/theme/quattro/mail_conv.tpl diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl index 2d1ea7a61..2d1ea7a61 100755..100644 --- a/view/theme/quattro/msg-header.tpl +++ b/view/theme/quattro/msg-header.tpl diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl index 8c872864c..8c872864c 100755..100644 --- a/view/theme/quattro/nav.tpl +++ b/view/theme/quattro/nav.tpl diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/nets.tpl index cbadf1361..cbadf1361 100755..100644 --- a/view/theme/quattro/nets.tpl +++ b/view/theme/quattro/nets.tpl diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl index 7cd02f164..7cd02f164 100755..100644 --- a/view/theme/quattro/profile_vcard.tpl +++ b/view/theme/quattro/profile_vcard.tpl diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index c6352cfe9..c6352cfe9 100755..100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less diff --git a/view/theme/quattro/saved_searches_aside.tpl b/view/theme/quattro/saved_searches_aside.tpl index 9c10a26de..9c10a26de 100755..100644 --- a/view/theme/quattro/saved_searches_aside.tpl +++ b/view/theme/quattro/saved_searches_aside.tpl diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl index 80d6678fb..80d6678fb 100755..100644 --- a/view/theme/quattro/search_item.tpl +++ b/view/theme/quattro/search_item.tpl diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl index e771db068..e771db068 100755..100644 --- a/view/theme/quattro/wall_item.tpl +++ b/view/theme/quattro/wall_item.tpl diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl index 693ebaba6..693ebaba6 100755..100644 --- a/view/theme/quattro/wallwall_item.tpl +++ b/view/theme/quattro/wallwall_item.tpl diff --git a/view/theme/slack-NS/style.css b/view/theme/slack-NS/style.css index 82bceeac8..82bceeac8 100755..100644 --- a/view/theme/slack-NS/style.css +++ b/view/theme/slack-NS/style.css diff --git a/view/theme/slack-NS/theme.php b/view/theme/slack-NS/theme.php index ceec4dd97..ceec4dd97 100755..100644 --- a/view/theme/slack-NS/theme.php +++ b/view/theme/slack-NS/theme.php diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index ed3b413fb..ed3b413fb 100755..100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index ceec4dd97..ceec4dd97 100755..100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php diff --git a/view/theme/testbubble/calendar.png b/view/theme/testbubble/calendar.png Binary files differindex 705a75b8a..705a75b8a 100755..100644 --- a/view/theme/testbubble/calendar.png +++ b/view/theme/testbubble/calendar.png diff --git a/view/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl index 6d9230dbf..6d9230dbf 100755..100644 --- a/view/theme/testbubble/comment_item.tpl +++ b/view/theme/testbubble/comment_item.tpl diff --git a/view/theme/testbubble/connect.png b/view/theme/testbubble/connect.png Binary files differindex b76fc13dc..b76fc13dc 100755..100644 --- a/view/theme/testbubble/connect.png +++ b/view/theme/testbubble/connect.png diff --git a/view/theme/testbubble/contact_template.tpl b/view/theme/testbubble/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/theme/testbubble/contact_template.tpl +++ b/view/theme/testbubble/contact_template.tpl diff --git a/view/theme/testbubble/conversation.tpl b/view/theme/testbubble/conversation.tpl index 43bb1dd47..43bb1dd47 100755..100644 --- a/view/theme/testbubble/conversation.tpl +++ b/view/theme/testbubble/conversation.tpl diff --git a/view/theme/testbubble/group_drop.tpl b/view/theme/testbubble/group_drop.tpl index f088fc06f..f088fc06f 100755..100644 --- a/view/theme/testbubble/group_drop.tpl +++ b/view/theme/testbubble/group_drop.tpl diff --git a/view/theme/testbubble/group_edit.tpl b/view/theme/testbubble/group_edit.tpl index a8b3f92a0..a8b3f92a0 100755..100644 --- a/view/theme/testbubble/group_edit.tpl +++ b/view/theme/testbubble/group_edit.tpl diff --git a/view/theme/testbubble/group_side.tpl b/view/theme/testbubble/group_side.tpl index a1fc70a22..a1fc70a22 100755..100644 --- a/view/theme/testbubble/group_side.tpl +++ b/view/theme/testbubble/group_side.tpl diff --git a/view/theme/testbubble/groups.png b/view/theme/testbubble/groups.png Binary files differindex a65a7218c..a65a7218c 100755..100644 --- a/view/theme/testbubble/groups.png +++ b/view/theme/testbubble/groups.png diff --git a/view/theme/testbubble/icons.png b/view/theme/testbubble/icons.png Binary files differindex d21640eae..d21640eae 100755..100644 --- a/view/theme/testbubble/icons.png +++ b/view/theme/testbubble/icons.png diff --git a/view/theme/testbubble/icons.svg b/view/theme/testbubble/icons.svg index 91bb2ff38..91bb2ff38 100755..100644 --- a/view/theme/testbubble/icons.svg +++ b/view/theme/testbubble/icons.svg diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl index 0d11da271..0d11da271 100755..100644 --- a/view/theme/testbubble/jot-header.tpl +++ b/view/theme/testbubble/jot-header.tpl diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl index 45d206d57..45d206d57 100755..100644 --- a/view/theme/testbubble/jot.tpl +++ b/view/theme/testbubble/jot.tpl diff --git a/view/theme/testbubble/login-bg.gif b/view/theme/testbubble/login-bg.gif Binary files differindex cde836c89..cde836c89 100755..100644 --- a/view/theme/testbubble/login-bg.gif +++ b/view/theme/testbubble/login-bg.gif diff --git a/view/theme/testbubble/lrarrow.gif b/view/theme/testbubble/lrarrow.gif Binary files differindex fa2676944..fa2676944 100755..100644 --- a/view/theme/testbubble/lrarrow.gif +++ b/view/theme/testbubble/lrarrow.gif diff --git a/view/theme/testbubble/mail_head.tpl b/view/theme/testbubble/mail_head.tpl index afb65f537..afb65f537 100755..100644 --- a/view/theme/testbubble/mail_head.tpl +++ b/view/theme/testbubble/mail_head.tpl diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl index 244b243ec..244b243ec 100755..100644 --- a/view/theme/testbubble/match.tpl +++ b/view/theme/testbubble/match.tpl diff --git a/view/theme/testbubble/menu-user-pin.jpg b/view/theme/testbubble/menu-user-pin.jpg Binary files differindex 26449569f..26449569f 100755..100644 --- a/view/theme/testbubble/menu-user-pin.jpg +++ b/view/theme/testbubble/menu-user-pin.jpg diff --git a/view/theme/testbubble/menu-user-pin.png b/view/theme/testbubble/menu-user-pin.png Binary files differindex 6becfbb66..6becfbb66 100755..100644 --- a/view/theme/testbubble/menu-user-pin.png +++ b/view/theme/testbubble/menu-user-pin.png diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl index 43cc7bca0..43cc7bca0 100755..100644 --- a/view/theme/testbubble/nav.tpl +++ b/view/theme/testbubble/nav.tpl diff --git a/view/theme/testbubble/nets.tpl b/view/theme/testbubble/nets.tpl index b0cb8890c..b0cb8890c 100755..100644 --- a/view/theme/testbubble/nets.tpl +++ b/view/theme/testbubble/nets.tpl diff --git a/view/theme/testbubble/next.png b/view/theme/testbubble/next.png Binary files differindex 353e2e72a..353e2e72a 100755..100644 --- a/view/theme/testbubble/next.png +++ b/view/theme/testbubble/next.png diff --git a/view/theme/testbubble/notifications.png b/view/theme/testbubble/notifications.png Binary files differindex f0e24a15b..f0e24a15b 100755..100644 --- a/view/theme/testbubble/notifications.png +++ b/view/theme/testbubble/notifications.png diff --git a/view/theme/testbubble/photo-menu.jpg b/view/theme/testbubble/photo-menu.jpg Binary files differindex b96a96fa1..b96a96fa1 100755..100644 --- a/view/theme/testbubble/photo-menu.jpg +++ b/view/theme/testbubble/photo-menu.jpg diff --git a/view/theme/testbubble/photo_album.tpl b/view/theme/testbubble/photo_album.tpl index a0e3f46c4..a0e3f46c4 100755..100644 --- a/view/theme/testbubble/photo_album.tpl +++ b/view/theme/testbubble/photo_album.tpl diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl index 48a546a16..48a546a16 100755..100644 --- a/view/theme/testbubble/photo_top.tpl +++ b/view/theme/testbubble/photo_top.tpl diff --git a/view/theme/testbubble/photo_view.tpl b/view/theme/testbubble/photo_view.tpl index 4c754f597..4c754f597 100755..100644 --- a/view/theme/testbubble/photo_view.tpl +++ b/view/theme/testbubble/photo_view.tpl diff --git a/view/theme/testbubble/photography.png b/view/theme/testbubble/photography.png Binary files differindex 7ec919f2b..7ec919f2b 100755..100644 --- a/view/theme/testbubble/photography.png +++ b/view/theme/testbubble/photography.png diff --git a/view/theme/testbubble/premium.png b/view/theme/testbubble/premium.png Binary files differindex 1ad601c0f..1ad601c0f 100755..100644 --- a/view/theme/testbubble/premium.png +++ b/view/theme/testbubble/premium.png diff --git a/view/theme/testbubble/prev.png b/view/theme/testbubble/prev.png Binary files differindex 0ae6022af..0ae6022af 100755..100644 --- a/view/theme/testbubble/prev.png +++ b/view/theme/testbubble/prev.png diff --git a/view/theme/testbubble/profile_entry.tpl b/view/theme/testbubble/profile_entry.tpl index 5bea298ac..5bea298ac 100755..100644 --- a/view/theme/testbubble/profile_entry.tpl +++ b/view/theme/testbubble/profile_entry.tpl diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl index 0ee6919bc..0ee6919bc 100755..100644 --- a/view/theme/testbubble/profile_vcard.tpl +++ b/view/theme/testbubble/profile_vcard.tpl diff --git a/view/theme/testbubble/saved_searches_aside.tpl b/view/theme/testbubble/saved_searches_aside.tpl index e2aae1e77..e2aae1e77 100755..100644 --- a/view/theme/testbubble/saved_searches_aside.tpl +++ b/view/theme/testbubble/saved_searches_aside.tpl diff --git a/view/theme/testbubble/search.png b/view/theme/testbubble/search.png Binary files differindex 51c428594..51c428594 100755..100644 --- a/view/theme/testbubble/search.png +++ b/view/theme/testbubble/search.png diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl index a0a4ef393..a0a4ef393 100755..100644 --- a/view/theme/testbubble/search_item.tpl +++ b/view/theme/testbubble/search_item.tpl diff --git a/view/theme/testbubble/star.png b/view/theme/testbubble/star.png Binary files differindex a327ba14e..a327ba14e 100755..100644 --- a/view/theme/testbubble/star.png +++ b/view/theme/testbubble/star.png diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 1e63c7ef6..1e63c7ef6 100755..100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css diff --git a/view/theme/testbubble/user.png b/view/theme/testbubble/user.png Binary files differindex df899e7e0..df899e7e0 100755..100644 --- a/view/theme/testbubble/user.png +++ b/view/theme/testbubble/user.png diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl index 44491d967..44491d967 100755..100644 --- a/view/theme/testbubble/wall_item.tpl +++ b/view/theme/testbubble/wall_item.tpl diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl index eb7c3ddba..eb7c3ddba 100755..100644 --- a/view/theme/testbubble/wallwall_item.tpl +++ b/view/theme/testbubble/wallwall_item.tpl diff --git a/view/theme/vier/calendar.png b/view/theme/vier/calendar.png Binary files differindex 705a75b8a..705a75b8a 100755..100644 --- a/view/theme/vier/calendar.png +++ b/view/theme/vier/calendar.png diff --git a/view/theme/vier/contact_template.tpl b/view/theme/vier/contact_template.tpl index 48930b48a..48930b48a 100755..100644 --- a/view/theme/vier/contact_template.tpl +++ b/view/theme/vier/contact_template.tpl diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl index fb87d7661..fb87d7661 100755..100644 --- a/view/theme/vier/search_item.tpl +++ b/view/theme/vier/search_item.tpl diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl index d6f01643e..d6f01643e 100755..100644 --- a/view/viewcontact_template.tpl +++ b/view/viewcontact_template.tpl diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 9d1dd7d70..9d1dd7d70 100755..100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl diff --git a/view/wallmessage.tpl b/view/wallmessage.tpl index 66b2bc3a0..66b2bc3a0 100755..100644 --- a/view/wallmessage.tpl +++ b/view/wallmessage.tpl diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl index cb3922572..cb3922572 100755..100644 --- a/view/wallmsg-header.tpl +++ b/view/wallmsg-header.tpl diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index bad5680c7..bad5680c7 100755..100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl diff --git a/view/xrd_diaspora.tpl b/view/xrd_diaspora.tpl index 25cda533c..25cda533c 100755..100644 --- a/view/xrd_diaspora.tpl +++ b/view/xrd_diaspora.tpl diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl index dbb20256f..dbb20256f 100755..100644 --- a/view/xrd_host.tpl +++ b/view/xrd_host.tpl diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl index a4b921fe1..a4b921fe1 100755..100644 --- a/view/xrd_person.tpl +++ b/view/xrd_person.tpl |
