diff --git a/boot.php b/boot.php index f69f6fe820..354c243203 100644 --- a/boot.php +++ b/boot.php @@ -9,11 +9,12 @@ require_once('include/pgettext.php'); require_once('include/nav.php'); require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); +require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1527' ); +define ( 'FRIENDICA_VERSION', '3.0.1545' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1156 ); +define ( 'DB_UPDATE_VERSION', 1157 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -359,6 +360,7 @@ if(! class_exists('App')) { public $category; + // Allow themes to control internal parameters // by changing App values in theme.php @@ -437,8 +439,9 @@ if(! class_exists('App')) { if(isset($path) && strlen($path) && ($path != $this->path)) $this->path = $path; } - if (is_array($argv) && $argc>1 && !x($_SERVER,'SERVER_NAME') && substr(end($argv), 0, 4)=="http" ) { + if (is_array($argv) && $argc>1 && substr(end($argv), 0, 4)=="http" ) { $this->set_baseurl(array_pop($argv) ); + $argc --; } set_include_path( @@ -1231,7 +1234,7 @@ if(! function_exists('profile_sidebar')) { // show edit profile to yourself - if ($profile['uid'] == local_user()) { + if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles')); $r = q("SELECT * FROM `profile` WHERE `uid` = %d", diff --git a/database.sql b/database.sql index 0f82616f7b..369637fe60 100644 --- a/database.sql +++ b/database.sql @@ -777,6 +777,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( `type` CHAR(128) NOT NULL DEFAULT 'image/jpeg', `height` smallint(6) NOT NULL, `width` smallint(6) NOT NULL, + `datasize` int(10) unsigned NOT NULL DEFAULT '0', `data` mediumblob NOT NULL, `scale` tinyint(3) NOT NULL, `profile` tinyint(1) NOT NULL DEFAULT '0', @@ -789,6 +790,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( KEY `resource-id` (`resource-id`), KEY `album` (`album`), KEY `scale` (`scale`), + KEY `datasize` (`datasize`), KEY `profile` (`profile`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/doc/Forums.md b/doc/Forums.md new file mode 100644 index 0000000000..56f47b350b --- /dev/null +++ b/doc/Forums.md @@ -0,0 +1,36 @@ +Forums +===== + +* [Home](help) + + +Friendica also lets you create forums and/or celebrity accounts. + +Every page in Friendica has a nickname and these must all be unique. This applies to all forums, whether they are normal profiles or forum profiles. + +Therefore the first thing you need to do to create a new forum is to register a new account for the forum. Please note that the site administrator can restrict and/or regulate the registration of new accounts. + +If you create a second account on a system and use the same email address or OpenID account as an existing account, you will no longer be able to use the email address (or OpenID) to login to the account. You should login using the account nickname instead. + +On the new account, visit the 'Settings' page. Towards the end of the page are "Advanced Account/Page Type Settings". Typically you would use "Normal Account" for a normal personal account. This is the default selection. Community Forum/Celebrity Accounts provide the ability for people to become friends/fans of the forum without requiring approval. + +The exact setting you would use depends on how you wish to interact with people who join the page. The "Soapbox" setting let's the page owner control all communications. Everything you post will go out to the forum members, but there will be no opportunity for interaction. This setting would typically be used for announcements or corporate communications. + +The most common setting is the "Community Forum". This creates a forum page where all members can freely interact. + +The "Automatic Friend Account" is typically used for personal profile forums where you wish to automatically approve any friendship/connection requests. + +**Managing Multiple forums** + +We recommend that you create group forums with the same email address and password as your normal account. If you do this, you will find a new "Manage" tab on the menu bar which lets you toggle identities easily and manage your forums. You are not required to do this, but the alternative is to logout and log back into the other account to manage alternate forums - and this could get cumbersome if you manage several different forums/identities. + +You may also appoint a delegate to manage your forum. Do this by visiting the [Delegation Setup Page](delegate). This will provide you with a list of contacts on this system under "Potential Delegates". Selecting one or more persons will give them access to manage your forum. They will be able to edit contacts, profiles, and all content for this account/page. Please use this facility wisely. Delegated managers will not be able to alter basic account settings such as passwords or page types and/or remove the account. + + +**Posting to Community forums** + +If you are a member of a community forum, you may post to the forum by including an @-tag in the post mentioning the forum. For example @bicycle would send my post to all members of the group "bicycle" in addition to the normal recipients. If your post is private you must also explicitly include the group in the post permissions (to allow the forum "contact" to see the post) **and** mention it in a tag (which redistributes the post to the forum members). + +You may also post to a community forum by posting a "wall-to-wall" post using secure cross-site authentication. + +Comments which are relayed to community forums will be relayed back to the original post creator. Mentioning the forum with an @-tag in a comment does not relay the message, as distribution is controlled entirely by the original post creator. \ No newline at end of file diff --git a/doc/Home.md b/doc/Home.md index 7c86ce805a..dc45a22534 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -13,7 +13,7 @@ Friendica Documentation and Resources * [Making Friends](help/Making-Friends) * [Groups and Privacy](help/Groups-and-Privacy) * [Tags and Mentions](help/Tags-and-Mentions) -* [Pages](help/Pages) +* [Community Forums](help/Forums) * [Move Account](help/Move-Account) * [Remove Account](help/Remove-Account) * [Bugs and Issues](help/Bugs-and-Issues) diff --git a/doc/Move-Account.md b/doc/Move-Account.md index 2813f7101f..35c50259e3 100644 --- a/doc/Move-Account.md +++ b/doc/Move-Account.md @@ -17,6 +17,8 @@ It also contains your secret keys to authenticate yourself to your contacts: Go to your new server, and open *http://newserver.com/uimport* (there is not a direct link to this page at the moment). +Do NOT create a new account prior to importing your old settings - uimport should be used *instead* of register. + Load your saved account file and click "Import". Friendica will recreate your account on the new server, with your contacts and groups. diff --git a/doc/Pages.md b/doc/Pages.md deleted file mode 100644 index d0e6776a4b..0000000000 --- a/doc/Pages.md +++ /dev/null @@ -1,36 +0,0 @@ -Pages -===== - -* [Home](help) - - -Friendica also lets you create forum and/or celebrity pages. - -Every page in Friendica has a nickname and these must all be unique. This applies to all pages, whether they are normal profiles or forum pages. - -Therefore the first thing you need to do to create a new page is to register a new account for the page. Please note that the site administrator can restrict and/or regulate the registration of new accounts. - -If you create a second account on a system and use the same email address or OpenID account as an existing account, you will no longer be able to use the email address (or OpenID) to login to the account. You should login using the account nickname instead. - -On the new account, visit the 'Settings' page. Towards the end of the page are "Advanced Page Settings". Typically you would use "Normal Account" for a normal personal account. This is the default selection. Group pages provide the ability for people to become friends/fans of the page without requiring approval. - -The exact setting you would use depends on how you wish to interact with people who join the page. The "Soapbox" setting let's the page owner control all communications. Everything you post will go out to the page members, but there will be no opportunity for interaction. This setting would typically be used for announcements or corporate communications. - -The most common setting is the "Community Account". This creates a group page where all members can freely interact. - -The "Automatic Friend Account" is typically used for personal profile pages where you wish to automatically approve any friendship/connection requests. - -**Managing Multiple Pages** - -We recommend that you create group pages with the same email address and password as your normal account. If you do this, you will find a new "Manage" tab on the menu bar which lets you toggle identities easily and manage your pages. You are not required to do this, but the alternative is to logout and log back into the other account to manage alternate pages - and this could get cumbersome if you manage several different pages/identities. - -You may also appoint a delegate to manage your page. Do this by visiting the [Delegation Setup Page](delegate). This will provide you with a list of contacts on this system under "Potential Delegates". Selecting one or more persons will give them access to manage your page. They will be able to edit contacts, profiles, and all content for this account/page. Please use this facility wisely. Delegated managers will not be able to alter basic account settings such as passwords or page types and/or remove the account. - - -**Posting to Community Pages** - -If you are a member of a community page/forum, you may post to the page by including an @-tag in the post mentioning the forum. For example @bicycle would send my post to all members of the group "bicycle" in addition to the normal recipients. If your post is private you must also explicitly include the group in the post permissions (to allow the forum "contact" to see the post) **and** mention it in a tag (which redistributes the post to the forum members). - -You may also post to a community page/forum by posting a "wall-to-wall" post using secure cross-site authentication. - -Comments which are relayed to community pages will be relayed back to the original post creator. Mentioning the forum/group with an @-tag in a comment does not relay the message, as distribution is controlled entirely by the original post creator. \ No newline at end of file diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md index ae5de2cb65..e33c2b06ec 100644 --- a/doc/Remove-Account.md +++ b/doc/Remove-Account.md @@ -9,16 +9,6 @@ http://sitename/removeme with your web browser. You will need to be logged in at the time. -You will be asked for your password to confirm the request. If this matches your stored password, your account will immediately be removed. Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind. Your user details, your conversations, your photos, your friends - everything; will be removed immediately and you will be logged out. +You will be asked for your password to confirm the request. If this matches your stored password, your account will immediately be blocked to all probing. Unlike some social networks we do **not** hold onto it for a grace period in case you change your mind. All your content and user data, etc is instantly removed. For all intents and purposes, the account is gone in moments. -When we expire posts we send notifications out to Friendica to remove the posts. Diaspora doesn't have a bulk delete so this step is skipped on that network - and hopefully it will be obvious that deletion doesn't work on any other networks. If you manually delete a post or a range of posts we send individual delete notifications to Friendica and Diaspora for each deleted post. - -Diaspora often loses these. - -If you delete a post but somebody else has starred it, it is still removed. Your wishes take priority. - -When you remove your account we physically remove all your posts and your profile and user data, etc. immediately. - -In order to send out a bulk remove we would need to keep your account around to do this, as we would need to prove to your friends who it is that is submitting the request. We can't do this if you don't have an account. - -Your friends may still see your posts if your account is gone, but there is no public place within Friendica where they can be viewed. If you had friends on Diaspora, your public posts may stick around and be visible to others from that network. +We then send out an "unfriend" signal to all of your contacts. This signal deletes all content on those networks. Unfortunately, due to limitations of the other networks, this only works well with Friendica contacts. We allow four days for this, in case some servers were down and the unfriend signal was queued. After this, we finish off deleting the account. diff --git a/doc/Text_editor.md b/doc/Text_editor.md index fa4393f009..e2234825a9 100644 --- a/doc/Text_editor.md +++ b/doc/Text_editor.md @@ -7,7 +7,7 @@ Here you can find an overview of the different ways to create and edit your post editor -The different iconss +The different icons editor This symbol is used to upload a picture from your computer. If you only want to add an adress (url), you can also use the "tree" icon at the upper part of the editor. After selecting an image, you'll see a thumbnail in the editor.

diff --git a/doc/de/Forums.md b/doc/de/Forums.md new file mode 100644 index 0000000000..6a8fd5bd7a --- /dev/null +++ b/doc/de/Forums.md @@ -0,0 +1,37 @@ +Foren +===== + +* [Zur Startseite der Hilfe](help) + + +Friendica lässt dich auch Foren und/oder Prominenten-Seiten erstellen. + +Jede Seite in Friendica hat einen einzigartigen Spitznamen. Das gilt für alle Seiten, unabhängig davon, ob es sich um normale Profile oder Forenseite handelt. + +Das Erste, was du machen musst, um ein neues Forum zu kreieren ist, einen neuen Account zu erstellen. Bitte beachte, dass der Seitenadministrator die Registrierung neuer Accounts sperren oder an Bedingungen knüpfen kann. + +Wenn du einen zweiten Account in einem System erstellst und die gleiche Email-Adresse oder den gleichen OpenID-Account nutzt, kannst du dich zukünftig nur noch mit deinem Spitznamen anmelden. + +Gehe im neuen Account auf die "Einstellungs"-Seite und dort am Ende der Seite auf "Erweiterte Konto-/Seitentyp-Einstellungen". Normalerweise nutzt du "Normales Konto" für einen normalen, persönlichen Account. Das ist die Standardeinstellung. Gr‬uppenseiten bieten die Möglichkeit, Leute als Freund/Fan ohne Kontaktbestätigung zuzulassen. + +Die Auswahl der Einstellung, die du wählst, hängt davon ab, wie du mit anderen Leuten auf deiner Seite interagieren willst. Die "Marktschreier"-Einstellung (Soapbox) lässt den Seitenbesitzer die gesamte Kommunikation kontrollieren. Alles was du schreibst, geht an alle Seitennutzer, aber es gibt keine Möglichkeit, zu interagieren. Diese Seite wird normalerweise für Ankündigungen oder die Kommunikation von Gemeinschaften genutzt. + +Die normalste Einstellung ist das "Forum-/Promi-Konto". Diese erstellt eine Gruppenseite, in der alle Mitglieder frei miteinander interagieren können. + +Der "Automatische Freunde Seite"-Account ist typischerweise für persönliche Profile, bei denen du alle Freundschaftsanfragen automatisch bestätigen willst. + + +**Multiple Foren verwalten** + +Wir schlagen vor, dass du ein Gruppenforum mit der gleichen Email-Adresse und dem gleichen Passwort wie bei deinem normalen Account nutzt. Wenn du das machst, findest du einen neuen "Verwalten"-Link im Hauptmenü, das dir hilft, einfach zwischen den Identitäten zu wechseln. Du musst das nicht machen, die Alternative ist allerdings, dich immer wieder aus- und wieder einzuloggen. Und das kann umständlich sein, wenn du mehrere verschiedene Foren/Identitäten verwaltest. + +Du kannst ebenso jemanden wählen, der dein Forum verwaltet. Mach das, indem du die [Delegierungs-Setup-Seite](delegate) besuchst. Dort wird dir eine Liste an "Potentiellen Bevollmächtigen" angezeigt. Die Auswahl einer oder mehrerer Personen gibt diesen die Möglichkeit, dein Forum zu verwalten. Sie können Kontakte, Profile und alle Inhalte deines Accounts/deiner Seite bearbeiten. Bitte nutze diese Einstellung mit Vorsicht. Delegierte haben jedoch keine Möglichkeit, grundlegende Account-Einstellungen wie das Passwort oder den Seitentypen zu ändern bzw. den Account zu löschen. + + +**Beiträge auf Community-Foren** + +Wenn du Mitglied eines Community-Forums bist, kannst du das Forum in einem Beitrag hinzufügen/erwähnen, wenn du den @-Tag nutzt. Zum Beispiel würde @Fahrrad deinen Beitrag neben den sonst ausgewählten Nutzern an alle Nutzer schicken, die in der Gruppe "Fahrrad" sind. Wenn dein Beitrag privat ist, musst du diese Gruppe explizit in den Zugriffsrechten des Beitrags auswählen **und** sie mit dem @-Tag erwähnen (was den Beitrag auf die Gruppenmitglieder erweitert). + +Du kannst außerdem via "Wall zu Wall" einen Beitrag auf der Community-Seite bzw. in dem Community-Forum erstellen. + +Kommentare, die du an ein Community-Forum schickst, werden an den Originalbeitrag weitergeleitet. Das Forum mit dem @-Tag zu erwähnen, leitet den Beitrag nicht weiter, da die Verteilung des Beitrages komplett vom Original-Beitragsschreiber kontrolliert wird. diff --git a/doc/de/Home.md b/doc/de/Home.md index 26febad5a7..585f78f44e 100644 --- a/doc/de/Home.md +++ b/doc/de/Home.md @@ -12,7 +12,8 @@ Friendica - Dokumentation und Ressourcen * [Freunde finden](help/Making-Friends) * [Gruppen und Privatsphäre](help/Groups-and-Privacy) * [Tags und Erwähnungen](help/Tags-and-Mentions) -* [Seiten](help/Pages) +* [Community-Foren](help/Forums) +* [Account umziehen](help/Move-Account) * [Account löschen](help/Remove-Account) * [Bugs und Probleme](help/Bugs-and-Issues) diff --git a/doc/de/Move-Account.md b/doc/de/Move-Account.md new file mode 100644 index 0000000000..8861fe7ef0 --- /dev/null +++ b/doc/de/Move-Account.md @@ -0,0 +1,41 @@ +Accounts Umziehen +================= + +* [Zur Startseite der Hilfe](help) + + +! **Dies ist ein experimentelles Feature** + +**Wie man einen Account von einem Server zu einem anderen umzieht.** + +Unter "Einstellungen" -> "[Persönliche Daten exportieren](uexport)" aufrufen. +"Account exportieren" anklicken und die Daten speichern. +Diese Datei enthält Details über dich, deine Kontakte, Gruppen und persönliche +Einstellungen. Außerdem enthält sie deinen geheimen Schlüssel mit dem du dich +deinen Kontakten gegenüber ausweist. + +**Speichere diese Datei an einem sicheren Ort**! + +Rufe nun dem neuen Server die Seite *http://newserver.com/uimport* auf +(es gibt derzeit keinen direkten Link auf diese Seite). + +Lege auf dem neuen Server auf keinen Fall einen gleichnamigen Account an! +uimport muss anstelle des Registrierens verwendet werden. + +Wähle die gesicherte Account Datei aus und klicke "Importieren". + +Friendica wird nun deinen Account auf dem neuen Server wiederherstellen, mit +all deinen Friendica Kontakten und Gruppen. An deine Friendica Kontakte wird +außerdem eine Nachricht gesendet um sie über deine neue Adresse zu informieren. +Wenn deine Kontakte ihren Account auf einem aktuellen Server haben werden deine +Kontaktdetails automatisch aktualisiert. + +Kontakte auf StatusNet/idendi.ca oder Diaspora werden archiviert, da wir ihnen +keine Information über deinen Umzug zukommen lassen können. +Du solltest sie persönlich anschreiben deinen Eintrag aus ihren Kontaktlisten +zu entfernen und dich neu hinzuzufügen, anschließend solltest du da gleiche mit +ihren Accounts tun.. + +Nach dem Umzug wird dein Account auf dem alten Server nicht mehr zuverlässig +funktionieren und sollte deshalb gelöscht werden. + diff --git a/doc/de/Pages.md b/doc/de/Pages.md deleted file mode 100644 index af6395b78d..0000000000 --- a/doc/de/Pages.md +++ /dev/null @@ -1,35 +0,0 @@ -Seiten -===== - -* [Zur Startseite der Hilfe](help) - - -Friendica lässt dich auch Foren und/oder Prominenten-Seiten erstellen. - -Jede Seite in Friendica hat einen einzigartigen Spitznamen. Das gilt für alle Seiten, unabhängig davon, ob es sich um normale Profile oder Forenseite handelt. - -Das Erste, was du machen musst, um eine neue Seite zu kreieren ist, einen neuen Account zu erstellen. Bitte beachte, dass der Seitenadministrator die Registrierung neuer Accounts sperren oder an Bedingungen knüpfen kann. - -Wenn du einen zweiten Account in einem System erstellst und die gleiche Email-Adresse oder den gleichen OpenID-Account nutzt, kannst du dich zukünftig nur noch mit deinem Spitznamen anmelden. - -Gehe im neuen Account auf die "Einstellungs"-Seite und dort am Ende der Seite auf "Erweiterte Konto-/Seitentyp-Einstellungen". Normalerweise nutzt du "Normales Konto" für einen normalen, persönlichen Account. Das ist die Standardeinstellung. Gr‬uppenseiten bieten die Möglichkeit, Leute als Freund/Fan ohne Kontaktbestätigung zuzulassen. - -Die Auswahl der Einstellung, die du wählst, hängt davon ab, wie du mit anderen Leuten auf deiner Seite interagieren willst. Die "Marktschreier"-Einstellung (Soapbox) lässt den Seitenbesitzer die gesamte Kommunikation kontrollieren. Alles was du schreibst, geht an alle Seitennutzer, aber es gibt keine Möglichkeit, zu interagieren. Diese Seite wird normalerweise für Ankündigungen oder die Kommunikation von Gemeinschaften genutzt. - -Die normalste Einstellung ist das "Forum-/Promi-Konto". Diese erstellt eine Gruppenseite, in der alle Mitglieder frei miteinander interagieren können. Der "Automatische Freunde Seite"-Account ist typischerweise für persönliche Profile, bei denen du alle Freundschaftsanfragen automatisch bestätigen willst. - - -**Multiple Seiten verwalten** - -Wir schlagen vor, dass du eine Gruppenseite mit der gleichen Email-Adresse und dem gleichen Passwort wie bei deinem normalen Account nutzt. Wenn du das machst, findest du einen neuen "Verwalten"-Link im Hauptmenü, das dir hilft, einfach zwischen den Identitäten zu wechseln. Du musst das nicht machen, die Alternative ist allerdings, dich immer wieder aus- und wieder einzuloggen. Und das kann umständlich sein, wenn du mehrere verschiedene Seiten/Identitäten verwaltest. - -Du kannst ebenso jemanden wählen, der deine Seite verwaltet. Mach das, indem du die [Delegierungs-Setup-Seite](delegate) besuchst. Dort wird dir eine Liste an "Potentiellen Bevollmächtigen" angezeigt. Die Auswahl einer oder mehrerer Personen gibt diesen die Möglichkeit, deine Seite zu verwalten. Sie können Kontakte, Profile und alle Inhalte deines Accounts/deiner Seite bearbeiten. Bitte nutze diese Einstellung mit Vorsicht. Delegierte haben jedoch keine Möglichkeit, grundlegende Account-Einstellungen wie das Passwort oder den Seitentypen zu ändern bzw. den Account zu löschen. - - -**Beiträge auf Community-Seiten** - -Wenn du Mitglied einer Community-Seite/-Forums bist, kannst du die Seite in einem Beitrag hinzufügen/erwähnen, wenn du den @-Tag nutzt. Zum Beispiel würde @Fahrrad deinen Beitrag neben den sonst ausgewählten Nutzern an alle Nutzer schicken, die in der Gruppe "Fahrrad" sind. Wenn dein Beitrag privat ist, musst du diese Gruppe explizit in den Zugriffsrechten des Beitrags auswählen **und** sie mit dem @-Tag erwähnen (was den Beitrag auf die Gruppenmitglieder erweitert). - -Du kannst außerdem via "Wall zu Wall" einen Beitrag auf der Community-Seite bzw. in dem Community-Forum erstellen. - -Kommentare, die du an eine Community-Seite schickst, werden an den Originalbeitrag weitergeleitet. Das Forum bzw. die Gruppe mit dem @-Tag zu erwähnen, leitet den Beitrag nicht weiter, da die Verteilung des Beitrages komplett vom Original-Beitragsschreiber kontrolliert wird. diff --git a/include/Photo.php b/include/Photo.php index 8fd581977d..69b08f6291 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -584,6 +584,7 @@ class Photo { `album` = '%s', `height` = %d, `width` = %d, + `datasize` = %d, `data` = '%s', `scale` = %d, `profile` = %d, @@ -604,6 +605,7 @@ class Photo { dbesc($album), intval($this->getHeight()), intval($this->getWidth()), + dbesc(strlen($this->imageString())), dbesc($this->imageString()), intval($scale), intval($profile), @@ -616,8 +618,8 @@ class Photo { } else { $r = q("INSERT INTO `photo` - ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) - VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", + ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) + VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", intval($uid), intval($cid), dbesc($guid), @@ -629,6 +631,7 @@ class Photo { dbesc($album), intval($this->getHeight()), intval($this->getWidth()), + dbesc(strlen($this->imageString())), dbesc($this->imageString()), intval($scale), intval($profile), diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 4b3ca987a6..7e2f81dffe 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -83,6 +83,8 @@ function network_to_name($s) { NETWORK_LINKEDIN => t('LinkedIn'), NETWORK_XMPP => t('XMPP/IM'), NETWORK_MYSPACE => t('MySpace'), + NETWORK_MAIL2 => t('Email'), + NETWORK_GPLUS => t('Google+') ); call_hooks('network_to_name', $nets); diff --git a/include/contact_widgets.php b/include/contact_widgets.php index ea71b3b707..9401adccad 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -47,6 +47,8 @@ function networks_widget($baseurl,$selected = '') { if(! local_user()) return ''; + if(! feature_enabled(local_user(),'networks')) + return ''; $r = q("select distinct(network) from contact where uid = %d and self = 0", intval(local_user()) @@ -80,6 +82,9 @@ function fileas_widget($baseurl,$selected = '') { if(! local_user()) return ''; + if(! feature_enabled(local_user(),'filing')) + return ''; + $saved = get_pconfig(local_user(),'system','filetags'); if(! strlen($saved)) return; @@ -106,8 +111,12 @@ function fileas_widget($baseurl,$selected = '') { } function categories_widget($baseurl,$selected = '') { + $a = get_app(); + if(! feature_enabled($a->profile['profile_uid'],'categories')) + return ''; + $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); if(! strlen($saved)) return; @@ -196,4 +205,4 @@ function common_friends_visitor_widget($profile_uid) { '$items' => $r )); -}; \ No newline at end of file +}; diff --git a/include/conversation.php b/include/conversation.php index 1de77feb1b..e4f3ec9ff6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -686,7 +686,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, - '$dropping' => ($page_dropping?t('Delete Selected Items'):False), + '$dropping' => ($page_dropping && feature_enabled(local_user(),'multi_delete') ? t('Delete Selected Items') : False), )); return $o; @@ -887,9 +887,12 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : ''); - $plaintext = false; - if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) - $plaintext = true; +/* $plaintext = false; + if( local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext')) ) + $plaintext = true;*/ + $plaintext = true; + if( local_user() && feature_enabled(local_user(),'richtext') ) + $plaintext = false; $tpl = get_markup_template('jot-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( @@ -958,7 +961,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { if($notes_cid) $jotnets .= ''; - $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); +// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $o .= replace_macros($tpl,array( '$return_path' => $a->query_string, @@ -981,7 +984,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$title' => "", '$placeholdertitle' => t('Set title'), '$category' => "", - '$placeholdercategory' => t('Categories (comma-separated list)'), + '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), @@ -1000,7 +1003,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$acl' => $x['acl'], '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], - '$preview' => t('Preview'), + '$preview' => ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''), + '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), '$cancel' => t('Cancel'), '$rand_num' => random_digits(12) diff --git a/include/directory.php b/include/directory.php index 356118bb08..29a793a2a0 100644 --- a/include/directory.php +++ b/include/directory.php @@ -38,6 +38,7 @@ function directory_run(&$argv, &$argc){ call_hooks('globaldir_update', $arr); + logger('Updating directory: ' . $arr['url'], LOGGER_DEBUG); if(strlen($arr['url'])) fetch_url($dir . '?url=' . bin2hex($arr['url'])); diff --git a/include/features.php b/include/features.php new file mode 100644 index 0000000000..b2712665e1 --- /dev/null +++ b/include/features.php @@ -0,0 +1,67 @@ + $uid, 'feature' => $feature, 'enabled' => $x); + call_hooks('feature_enabled',$arr); + return($arr['enabled']); +} + +function get_features() { + + $arr = array( + + // General + 'general' => array( + t('General Features'), + //array('expire', t('Content Expiration'), t('Remove old posts/comments after a period of time')), + array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles')), + ), + + // Post composition + 'composition' => array( + t('Post Composition Features'), + array('richtext', t('Richtext Editor'), t('Enable richtext editor')), + array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')), + ), + + // Network sidebar widgets + 'widgets' => array( + t('Network Sidebar Widgets'), + array('archives', t('Search by Date'), t('Ability to select posts by date ranges')), + array('groups', t('Group Filter'), t('Enable widget to display Network posts only from selected group')), + array('networks', t('Network Filter'), t('Enable widget to display Network posts only from selected network')), + array('savedsearch', t('Saved Searches'), t('Save search terms for re-use')), + ), + + // Network tabs + 'net_tabs' => array( + t('Network Tabs'), + array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on')), + array('new_tab', t('Network New Tab'), t('Enable tab to display only new Network posts (from the last 12 hours)')), + array('link_tab', t('Network Shared Links Tab'), t('Enable tab to display only Network posts with links in them')), + ), + + // Item tools + 'tools' => array( + t('Post/Comment Tools'), + array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once')), + array('edit_posts', t('Edit Sent Posts'), t('Edit and correct posts and comments after sending')), + array('commtag', t('Tagging'), t('Ability to tag existing posts')), + array('categories', t('Post Categories'), t('Add categories to your posts')), + array('filing', t('Saved Folders'), t('Ability to file posts under folders')), + array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments')), + array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator')), + ), + ); + + call_hooks('get_features',$arr); + return $arr; +} diff --git a/include/items.php b/include/items.php index 4ef26fbda8..fb7a7e25d1 100755 --- a/include/items.php +++ b/include/items.php @@ -885,7 +885,7 @@ function item_store($arr,$force_parent = false) { if (version_compare(PHP_VERSION, '5.3.0', '>=')) { - require_once('Text/LanguageDetect.php'); + require_once('library/langdet/Text/LanguageDetect.php'); $naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']); $l = new Text_LanguageDetect; $lng = $l->detectConfidence($naked_body); @@ -4031,10 +4031,13 @@ function posted_dates($uid,$wall) { function posted_date_widget($url,$uid,$wall) { $o = ''; + if(! feature_enabled($uid,'archives')) + return $o; + // For former Facebook folks that left because of "timeline" - if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget'))) - return $o; +/* if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget'))) + return $o;*/ $ret = posted_dates($uid,$wall); if(! count($ret)) diff --git a/include/nav.php b/include/nav.php index e26cc8889a..3c058e04f6 100644 --- a/include/nav.php +++ b/include/nav.php @@ -111,6 +111,7 @@ function nav(&$a) { if(local_user()) { $nav['network'] = array('network', t('Network'), "", t('Conversations from your friends')); + $nav['net_reset'] = array('network/0?f=&order=comment&nets=all', t('Network Reset'), "", t('Load Network page with no filters')); $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); @@ -135,7 +136,9 @@ function nav(&$a) { } $nav['settings'] = array('settings', t('Settings'),"", t('Account settings')); - $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles')); + if(feature_enabled(local_user(),'multi_profiles')) + $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles')); + $nav['contacts'] = array('contacts', t('Contacts'),"", t('Manage/edit friends and contacts')); } diff --git a/include/notifier.php b/include/notifier.php index f05bac1966..091d09b562 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -606,6 +606,10 @@ function notifier_run(&$argv, &$argc){ } continue; } + // be sure to pick up any stragglers + if(count($this_batch)) + proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); + $deliver_status = 0; diff --git a/include/redir.php b/include/redir.php index 3fbbf4c130..ab4f3220cd 100644 --- a/include/redir.php +++ b/include/redir.php @@ -2,6 +2,11 @@ function auto_redir(&$a, $contact_nick) { + // prevent looping + + if(x($_REQUEST,'redir') && intval($_REQUEST['redir'])) + return; + if((! $contact_nick) || ($contact_nick === $a->user['nickname'])) return; @@ -20,12 +25,15 @@ function auto_redir(&$a, $contact_nick) { if($domain_st === false) return; $baseurl = substr($baseurl, $domain_st + 3); + $nurl = normalise_link($baseurl); + $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) - AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' AND blocked = 0 AND pending = 0 LIMIT 1", + AND nick = '%s' AND self = 0 AND ( url LIKE '%%%s%%' or nurl LIKE '%%%s%%' ) AND blocked = 0 AND pending = 0 LIMIT 1", dbesc($contact_nick), dbesc($a->user['nickname']), - dbesc($baseurl) + dbesc($baseurl), + dbesc($nurl) ); if((!$r) || (! count($r)) || $r[0]['id'] == remote_user()) @@ -56,6 +64,12 @@ function auto_redir(&$a, $contact_nick) { $dfrn_id = '0:' . $orig_id; } + // ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode + // that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues + + if(strlen($dfrn_id) < 3) + return; + $sec = random_string(); q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`) diff --git a/library/langdet/Text/LanguageDetect.php b/library/langdet/Text/LanguageDetect.php index 7cebbe6077..d3caaff390 100644 --- a/library/langdet/Text/LanguageDetect.php +++ b/library/langdet/Text/LanguageDetect.php @@ -21,9 +21,9 @@ * @link http://langdetect.blogspot.com/ */ -require_once 'Text/LanguageDetect/Exception.php'; -require_once 'Text/LanguageDetect/Parser.php'; -require_once 'Text/LanguageDetect/ISO639.php'; +require_once 'library/langdet/Text/LanguageDetect/Exception.php'; +require_once 'library/langdet/Text/LanguageDetect/Parser.php'; +require_once 'library/langdet/Text/LanguageDetect/ISO639.php'; /** * Language detection class diff --git a/mod/admin.php b/mod/admin.php index a145e5b28b..bd0d14bef7 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -244,6 +244,7 @@ function admin_page_site_post(&$a){ $register_policy = ((x($_POST,'register_policy')) ? intval(trim($_POST['register_policy'])) : 0); + $daily_registrations = ((x($_POST,'max_daily_registrations')) ? intval(trim($_POST['max_daily_registrations'])) :0); $abandon_days = ((x($_POST,'abandon_days')) ? intval(trim($_POST['abandon_days'])) : 0); $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); @@ -339,6 +340,7 @@ function admin_page_site_post(&$a){ set_config('system','jpeg_quality', $jpegimagequality); set_config('config','register_policy', $register_policy); + set_config('system','max_daily_registrations', $daily_registrations); set_config('system','account_abandon_days', $abandon_days); set_config('config','register_text', $register_text); set_config('system','allowed_sites', $allowed_sites); @@ -459,6 +461,7 @@ function admin_page_site(&$a) { '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")), '$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices), + '$daily_registrations' => array('max_daily_registrations', t("Maximum Daily Registrations"), get_config('system', 'max_daily_registrations'), t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")), '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), diff --git a/mod/community.php b/mod/community.php index defc873b0a..aa5bb7268d 100644 --- a/mod/community.php +++ b/mod/community.php @@ -44,23 +44,23 @@ function community_content(&$a, $update = 0) { // Only public posts can be shown // OR your own posts if you are a logged in member - if(! get_pconfig(local_user(),'system','alt_pager')) { - $r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` - WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' - AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0" - ); + if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) { + $r = q("SELECT COUNT(distinct(`item`.`uri`)) AS `total` + FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` + WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 + AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' + AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' + AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0" + ); - if(count($r)) - $a->set_pager_total($r[0]['total']); + if(count($r)) + $a->set_pager_total($r[0]['total']); - if(! $r[0]['total']) { - info( t('No results.') . EOL); - return $o; - } + if(! $r[0]['total']) { + info( t('No results.') . EOL); + return $o; + } } @@ -91,11 +91,11 @@ function community_content(&$a, $update = 0) { $o .= conversation($a,$r,'community',$update); - if(! get_pconfig(local_user(),'system','alt_pager')) { - $o .= paginate($a); + if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) { + $o .= alt_pager($a,count($r)); } else { - $o .= alt_pager($a,count($r)); + $o .= paginate($a); } return $o; diff --git a/mod/contacts.php b/mod/contacts.php index 7668b45b3a..3ef7b53043 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -2,6 +2,7 @@ require_once('include/Contact.php'); require_once('include/socgraph.php'); +require_once('include/contact_selectors.php'); function contacts_init(&$a) { if(! local_user()) diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 8abe42abbb..1d3bbd4420 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -493,7 +493,7 @@ function dfrn_poll_content(&$a) { switch($destination_url) { case 'profile': - $dest = $a->get_baseurl() . '/profile/' . $profile . '?tab=profile'; + $dest = $a->get_baseurl() . '/profile/' . $profile . '?f=&tab=profile'; break; case 'photos': $dest = $a->get_baseurl() . '/photos/' . $profile; @@ -503,7 +503,7 @@ function dfrn_poll_content(&$a) { $dest = $a->get_baseurl() . '/profile/' . $profile; break; default: - $dest = $destination_url; + $dest = $destination_url . '?f=&redir=1'; break; } diff --git a/mod/editpost.php b/mod/editpost.php index 1dc6aea21e..d6539e1078 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -28,9 +28,12 @@ function editpost_content(&$a) { return; } - $plaintext = false; - if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) - $plaintext = true; +/* $plaintext = false; + if( local_user() && intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') ) + $plaintext = true;*/ + $plaintext = true; + if( local_user() && feature_enabled(local_user(),'richtext') ) + $plaintext = false; $o .= '

' . t('Edit post') . '

'; @@ -130,7 +133,7 @@ function editpost_content(&$a) { '$title' => $itm[0]['title'], '$placeholdertitle' => t('Set title'), '$category' => file_tag_file_to_list($itm[0]['file'], 'category'), - '$placeholdercategory' => t('Categories (comma-separated list)'), + '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb), diff --git a/mod/item.php b/mod/item.php index 6dbe99dfd0..2ed1b812a4 100644 --- a/mod/item.php +++ b/mod/item.php @@ -18,7 +18,7 @@ require_once('include/crypto.php'); require_once('include/enotify.php'); require_once('include/email.php'); -require_once('Text/LanguageDetect.php'); +require_once('library/langdet/Text/LanguageDetect.php'); function item_post(&$a) { @@ -309,7 +309,11 @@ function item_post(&$a) { // First figure out if it's a status post that would've been // created using tinymce. Otherwise leave it alone. - $plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0); +/* $plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled($profile_uid,'richtext') : 0); + if((! $parent) && (! $api_source) && (! $plaintext)) { + $body = fix_mce_lf($body); + }*/ + $plaintext = (local_user() ? !feature_enabled($profile_uid,'richtext') : 0); if((! $parent) && (! $api_source) && (! $plaintext)) { $body = fix_mce_lf($body); } diff --git a/mod/message.php b/mod/message.php index 97c6586320..744a3eb3f7 100644 --- a/mod/message.php +++ b/mod/message.php @@ -46,7 +46,11 @@ function message_post(&$a) { // Work around doubled linefeeds in Tinymce 3.5b2 - $plaintext = intval(get_pconfig(local_user(),'system','plaintext')); +/* $plaintext = intval(get_pconfig(local_user(),'system','plaintext') && !feature_enabled(local_user(),'richtext')); + if(! $plaintext) { + $body = fix_mce_lf($body); + }*/ + $plaintext = intval(!feature_enabled(local_user(),'richtext')); if(! $plaintext) { $body = fix_mce_lf($body); } @@ -229,9 +233,12 @@ function message_content(&$a) { $o .= $header; - $plaintext = false; +/* $plaintext = false; if(intval(get_pconfig(local_user(),'system','plaintext'))) - $plaintext = true; + $plaintext = true;*/ + $plaintext = true; + if( local_user() && feature_enabled(local_user(),'richtext') ) + $plaintext = false; $tpl = get_markup_template('msg-header.tpl'); diff --git a/mod/network.php b/mod/network.php index bbdd0130d7..2524ae0634 100644 --- a/mod/network.php +++ b/mod/network.php @@ -181,7 +181,7 @@ function network_init(&$a) { $a->page['content'] .= '

' . t('Search Results For:') . ' ' . $search . '

'; } - $a->page['aside'] .= group_side('network/0','network',true,$group_id); + $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network',true,$group_id) : ''); $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); $a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : '')); $a->page['aside'] .= saved_searches($search); @@ -191,6 +191,9 @@ function network_init(&$a) { function saved_searches($search) { + if(! feature_enabled(local_user(),'savedsearch')) + return ''; + $a = get_app(); $srchurl = '/network?f=' @@ -403,30 +406,30 @@ function network_content(&$a, $update = 0) { 'title' => t('Sort by Post Date'), ), - array( +/* array( 'label' => t('Personal'), 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, 'title' => t('Posts that mention or involve you'), - ), - array( + ),*/ +/* array( 'label' => t('New'), 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), 'sel' => $new_active, 'title' => t('Activity Stream - by date'), - ), - array( + ),*/ +/* array( 'label' => t('Starred'), 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', 'sel'=>$starred_active, 'title' => t('Favourite Posts'), - ), - array( + ),*/ +/* array( 'label' => t('Shared Links'), 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1', 'sel'=>$bookmarked_active, 'title'=> t('Interesting Links'), - ), + ), */ // array( // 'label' => t('Spam'), // 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1' @@ -436,6 +439,53 @@ function network_content(&$a, $update = 0) { ); + if(feature_enabled(local_user(),'personal_tab')) { + $tabs[] = array( + 'label' => t('Personal'), + 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1', + 'sel' => $conv_active, + 'title' => t('Posts that mention or involve you'), + ); + } + + if(feature_enabled(local_user(),'new_tab')) { + $tabs[] = array( + 'label' => t('New'), + 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), + 'sel' => $new_active, + 'title' => t('Activity Stream - by date'), + ); + } + + if(feature_enabled(local_user(),'link_tab')) { + $tabs[] = array( + 'label' => t('Shared Links'), + 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1', + 'sel'=>$bookmarked_active, + 'title'=> t('Interesting Links'), + ); + } + + if(feature_enabled(local_user(),'star_posts')) { + $tabs[] = array( + 'label' => t('Starred'), + 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', + 'sel'=>$starred_active, + 'title' => t('Favourite Posts'), + ); + } + + // Not yet implemented + +/* if(feature_enabled(local_user(),'spam_filter')) { + $tabs[] = array( + 'label' => t('Spam'), + 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1', + 'sel'=> $spam_active, + 'title' => t('Posts flagged as SPAM'), + ); + }*/ + // save selected tab, but only if not in search or file mode if(!x($_GET,'search') && !x($_GET,'file')) { set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) ); @@ -646,7 +696,7 @@ function network_content(&$a, $update = 0) { } else { - if(! get_pconfig(local_user(),'system','alt_pager')) { + if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) { $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 @@ -795,11 +845,11 @@ function network_content(&$a, $update = 0) { $o .= conversation($a,$items,$mode,$update); if(! $update) { - if(! get_pconfig(local_user(),'system','alt_pager')) { - $o .= paginate($a); + if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) { + $o .= alt_pager($a,count($items)); } else { - $o .= alt_pager($a,count($items)); + $o .= paginate($a); } } diff --git a/mod/photos.php b/mod/photos.php index 08dc0e0fc5..efccb0e10a 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1027,19 +1027,15 @@ function photos_content(&$a) { $default_upload = '
'; - - $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ", - intval($a->data['user']['uid']) - ); - - + $usage_message = ''; $limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit'); if($limit !== false) { + + $r = q("select sum(datasize) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ", + intval($a->data['user']['uid']) + ); $usage_message = sprintf( t("You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."), $r[0]['total'] / 1024000, $limit / 1024000 ); } - else { - $usage_message = sprintf( t('You have used %1$.2f Mbytes of photo storage.'), $r[0]['total'] / 1024000 ); - } $tpl = get_markup_template('photos_upload.tpl'); diff --git a/mod/profile.php b/mod/profile.php index 827166f927..25871c2405 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -242,7 +242,7 @@ function profile_content(&$a, $update = 0) { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } - if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) { + if( (! get_config('alt_pager', 'global')) && (! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) ) { $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 @@ -323,12 +323,12 @@ function profile_content(&$a, $update = 0) { $o .= conversation($a,$items,'profile',$update); if(! $update) { - if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) { - $o .= paginate($a); - } - else { - $o .= alt_pager($a,count($items)); - } + if( get_config('alt_pager', 'global') || get_pconfig($a->profile['profile_uid'],'system','alt_pager') ) { + $o .= alt_pager($a,count($items)); + } + else { + $o .= paginate($a); + } } return $o; diff --git a/mod/profiles.php b/mod/profiles.php index 013e8e8200..d4a3db83e0 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -42,6 +42,13 @@ function profiles_post(&$a) { $day = intval($_POST['day']); if(($day > $mtab[$month]) || ($day < 0)) $day = 0; + + // It's OK to have an empty (0) year, but if you supplied a year you have to have a non-zero month and day + if($year && ! $month) + $month = 1; + if($year && ! $day) + $day = 1; + $dob = '0000-00-00'; $dob = sprintf('%04d-%02d-%02d',$year,$month,$day); @@ -554,9 +561,12 @@ function profiles_content(&$a) { require_once('include/profile_selectors.php'); - $editselect = 'textareas'; - if(intval(get_pconfig(local_user(),'system','plaintext'))) - $editselect = 'none'; +/* $editselect = 'textareas'; + if( intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') ) + $editselect = 'none';*/ + $editselect = 'none'; + if( feature_enabled(local_user(),'richtext') ) + $editselect = 'textareas'; $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array( '$baseurl' => $a->get_baseurl(true), diff --git a/mod/search.php b/mod/search.php index ac848a0cec..956816fed0 100644 --- a/mod/search.php +++ b/mod/search.php @@ -4,6 +4,9 @@ function search_saved_searches() { $o = ''; + if(! feature_enabled(local_user(),'savedsearch')) + return $o; + $r = q("select `id`,`term` from `search` WHERE `uid` = %d", intval(local_user()) ); @@ -141,7 +144,7 @@ function search_content(&$a) { // OR your own posts if you are a logged in member // No items will be shown if the member has a blocked profile wall. - if(! get_pconfig(local_user(),'system','alt_pager')) { + if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) { $r = q("SELECT distinct(`item`.`uri`) as `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 @@ -194,11 +197,11 @@ function search_content(&$a) { $o .= conversation($a,$r,'search',false); - if(! get_pconfig(local_user(),'system','alt_pager')) { - $o .= paginate($a); + if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) { + $o .= alt_pager($a,count($r)); } else { - $o .= alt_pager($a,count($r)); + $o .= paginate($a); } return $o; diff --git a/mod/settings.php b/mod/settings.php index bd5e81e2e9..1e464de18c 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -31,6 +31,11 @@ function settings_init(&$a) { 'url' => $a->get_baseurl(true).'/settings', 'selected' => (($a->argc == 1)?'active':''), ), + array( + 'label' => t('Additional features'), + 'url' => $a->get_baseurl(true).'/settings/features', + 'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''), + ), array( 'label' => t('Display settings'), 'url' => $a->get_baseurl(true).'/settings/display', @@ -231,7 +236,18 @@ function settings_post(&$a) { return; } - if(($a->argc > 1) && ($a->argv[1] == 'display')) { + if(($a->argc > 1) && ($a->argv[1] === 'features')) { + check_form_security_token_redirectOnErr('/settings/features', 'settings_features'); + foreach($_POST as $k => $v) { + if(strpos($k,'feature_') === 0) { + set_pconfig(local_user(),'feature',substr($k,8),((intval($v)) ? 1 : 0)); + } + } + info( t('Features updated') . EOL); + return; + } + + if(($a->argc > 1) && ($a->argv[1] === 'display')) { check_form_security_token_redirectOnErr('/settings/display', 'settings_display'); @@ -612,6 +628,7 @@ function settings_content(&$a) { return $o; } + if(($a->argc > 1) && ($a->argv[1] === 'addon')) { $settings_addons = ""; @@ -631,6 +648,30 @@ function settings_content(&$a) { return $o; } + if(($a->argc > 1) && ($a->argv[1] === 'features')) { + + $arr = array(); + $features = get_features(); + foreach($features as $fname => $fdata) { + $arr[$fname] = array(); + $arr[$fname][0] = $fdata[0]; + foreach(array_slice($fdata,1) as $f) { + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(get_pconfig(local_user(),'feature',$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + } + } + + + $tpl = get_markup_template("settings_features.tpl"); + $o .= replace_macros($tpl, array( + '$form_security_token' => get_form_security_token("settings_features"), + '$title' => t('Additional Features'), + '$features' => $arr, + '$submit' => t('Submit'), + '$field_yesno' => 'field_yesno.tpl', + )); + return $o; + } + if(($a->argc > 1) && ($a->argv[1] === 'connectors')) { $settings_connectors = ""; diff --git a/object/Item.php b/object/Item.php index 2799291111..9cc9fe15a6 100644 --- a/object/Item.php +++ b/object/Item.php @@ -113,7 +113,7 @@ class Item extends BaseObject { $drop = array( 'dropping' => $dropping, - 'pagedrop' => $item['pagedrop'], + 'pagedrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $item['pagedrop'] : ''), 'select' => t('Select'), 'delete' => t('Delete'), ); @@ -184,9 +184,14 @@ class Item extends BaseObject { 'classdo' => (($item['starred']) ? "hidden" : ""), 'classundo' => (($item['starred']) ? "" : "hidden"), 'starred' => t('starred'), - 'tagger' => t("add tag"), - 'classtagger' => "", ); + $tagger = ''; + if(feature_enabled($conv->get_profile_owner(),'commtag')) { + $tagger = array( + 'add' => t("add tag"), + 'class' => "", + ); + } } } else { $indent = 'comment'; @@ -195,7 +200,7 @@ class Item extends BaseObject { if($conv->is_writable()) { $buttons = array( 'like' => array( t("I like this \x28toggle\x29"), t("like")), - 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")), + 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''), ); if ($shareable) $buttons['share'] = array( t('Share this'), t('share')); } @@ -249,14 +254,15 @@ class Item extends BaseObject { 'owner_photo' => $this->get_owner_photo(), 'owner_name' => template_escape($this->get_owner_name()), 'plink' => get_plink($item), - 'edpost' => $edpost, + 'edpost' => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''), 'isstarred' => $isstarred, - 'star' => $star, - 'filer' => $filer, + 'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''), + 'tagger' => $tagger, + 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''), 'drop' => $drop, 'vote' => $buttons, 'like' => $like, - 'dislike' => $dislike, + 'dislike' => $dislike, 'switchcomment' => t('Comment'), 'comment' => $this->get_comment_box($indent), 'previewing' => ($conv->is_preview() ? ' preview ' : ''), @@ -570,7 +576,7 @@ class Item extends BaseObject { '$edimg' => t('Image'), '$edurl' => t('Link'), '$edvideo' => t('Video'), - '$preview' => t('Preview'), + '$preview' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), '$indent' => $indent, '$sourceapp' => t($a->sourcename), '$ww' => (($conv->get_mode() === 'network') ? $ww : ''), diff --git a/update.php b/update.php index 3d3eec6f97..b29afdb741 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ \n" "Language-Team: LANGUAGE \n" @@ -39,9 +39,9 @@ msgstr "" #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:146 -#: ../../mod/settings.php:86 ../../mod/settings.php:525 -#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:147 +#: ../../mod/settings.php:91 ../../mod/settings.php:541 +#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -50,7 +50,7 @@ msgstr "" #: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 -#: ../../mod/message.php:38 ../../mod/message.php:168 +#: ../../mod/message.php:38 ../../mod/message.php:172 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 #: ../../mod/display.php:165 ../../mod/profiles.php:7 @@ -59,7 +59,7 @@ msgstr "" #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -92,8 +92,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:545 -#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702 +#: ../../mod/crepair.php:148 ../../mod/settings.php:561 +#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705 msgid "Name" msgstr "" @@ -131,18 +131,18 @@ msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:455 ../../mod/photos.php:1028 -#: ../../mod/photos.php:1104 ../../mod/photos.php:1367 -#: ../../mod/photos.php:1407 ../../mod/photos.php:1451 -#: ../../mod/photos.php:1523 ../../mod/install.php:246 +#: ../../mod/photos.php:1100 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 +#: ../../mod/photos.php:1519 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:351 -#: ../../mod/settings.php:543 ../../mod/settings.php:697 -#: ../../mod/settings.php:769 ../../mod/settings.php:976 -#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 -#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689 -#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112 -#: ../../mod/profiles.php:594 ../../mod/invite.php:119 -#: ../../addon/fromgplus/fromgplus.php:40 +#: ../../mod/content.php:693 ../../mod/contacts.php:352 +#: ../../mod/settings.php:559 ../../mod/settings.php:669 +#: ../../mod/settings.php:738 ../../mod/settings.php:810 +#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137 +#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445 +#: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028 +#: ../../mod/admin.php:1115 ../../mod/profiles.php:597 +#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 @@ -171,18 +171,18 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:685 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:599 +#: ../../view/theme/diabook/theme.php:642 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:562 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:570 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -282,12 +282,12 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:323 ../../include/text.php:1192 +#: ../../mod/events.php:323 ../../include/text.php:1190 msgid "link to source" msgstr "" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:52 ../../boot.php:1745 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../include/nav.php:52 ../../boot.php:1748 msgid "Events" msgstr "" @@ -344,8 +344,9 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:448 ../../mod/directory.php:134 +#: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1275 +#: ../../boot.php:1278 msgid "Location:" msgstr "" @@ -357,10 +358,10 @@ msgstr "" msgid "Share this event" msgstr "" -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 -#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 -#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1005 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145 +#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560 +#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45 +#: ../../include/conversation.php:1009 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -407,43 +408,43 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:237 -#: ../../mod/profiles.php:574 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:237 +#: ../../mod/profiles.php:577 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:238 -#: ../../mod/profiles.php:575 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:238 +#: ../../mod/profiles.php:578 msgid "No" msgstr "" -#: ../../mod/photos.php:51 ../../boot.php:1738 +#: ../../mod/photos.php:51 ../../boot.php:1741 msgid "Photo Albums" msgstr "" #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 -#: ../../mod/photos.php:1096 ../../mod/photos.php:1111 -#: ../../mod/photos.php:1566 ../../mod/photos.php:1578 +#: ../../mod/photos.php:1092 ../../mod/photos.php:1107 +#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:485 +#: ../../view/theme/diabook/theme.php:492 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616 +#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612 msgid "Upload New Photos" msgstr "" @@ -455,13 +456,13 @@ msgstr "" msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096 -#: ../../mod/photos.php:1111 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092 +#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -471,11 +472,11 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:182 ../../mod/photos.php:1105 +#: ../../mod/photos.php:182 ../../mod/photos.php:1101 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:245 ../../mod/photos.php:1368 +#: ../../mod/photos.php:245 ../../mod/photos.php:1364 msgid "Delete Photo" msgstr "" @@ -488,7 +489,7 @@ msgstr "" msgid "a photo" msgstr "" -#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321 #: ../../addon.old/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" @@ -509,7 +510,8 @@ msgstr "" #: ../../mod/photos.php:865 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31 +#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31 +#: ../../addon/forumdirectory/forumdirectory.php:53 msgid "Public access denied." msgstr "" @@ -521,166 +523,161 @@ msgstr "" msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:1038 +#: ../../mod/photos.php:1037 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:1041 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "" - -#: ../../mod/photos.php:1047 +#: ../../mod/photos.php:1043 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:1051 ../../mod/photos.php:1100 +#: ../../mod/photos.php:1047 ../../mod/photos.php:1096 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:1052 +#: ../../mod/photos.php:1048 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:1053 +#: ../../mod/photos.php:1049 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:1055 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1051 ../../mod/photos.php:1359 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:1115 +#: ../../mod/photos.php:1111 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:1121 +#: ../../mod/photos.php:1117 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:1123 +#: ../../mod/photos.php:1119 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:1147 ../../mod/photos.php:1599 +#: ../../mod/photos.php:1143 ../../mod/photos.php:1595 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1182 +#: ../../mod/photos.php:1178 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1184 +#: ../../mod/photos.php:1180 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1236 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1236 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1241 +#: ../../mod/photos.php:1237 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1247 ../../mod/content.php:603 +#: ../../mod/photos.php:1243 ../../mod/content.php:603 #: ../../object/Item.php:104 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1266 +#: ../../mod/photos.php:1262 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1340 +#: ../../mod/photos.php:1336 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1343 +#: ../../mod/photos.php:1339 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1353 +#: ../../mod/photos.php:1349 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1354 +#: ../../mod/photos.php:1350 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1356 +#: ../../mod/photos.php:1352 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1359 +#: ../../mod/photos.php:1355 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1361 +#: ../../mod/photos.php:1357 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1365 +#: ../../mod/photos.php:1361 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1385 ../../mod/content.php:667 -#: ../../object/Item.php:197 +#: ../../mod/photos.php:1381 ../../mod/content.php:667 +#: ../../object/Item.php:202 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1386 ../../mod/content.php:668 -#: ../../object/Item.php:198 +#: ../../mod/photos.php:1382 ../../mod/content.php:668 +#: ../../object/Item.php:203 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1387 ../../include/conversation.php:966 +#: ../../mod/photos.php:1383 ../../include/conversation.php:969 msgid "Share" msgstr "" -#: ../../mod/photos.php:1388 ../../mod/editpost.php:118 +#: ../../mod/photos.php:1384 ../../mod/editpost.php:121 #: ../../mod/content.php:482 ../../mod/content.php:848 -#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:624 -#: ../../include/conversation.php:985 ../../object/Item.php:261 +#: ../../mod/wallmessage.php:152 ../../mod/message.php:300 +#: ../../mod/message.php:488 ../../include/conversation.php:624 +#: ../../include/conversation.php:988 ../../object/Item.php:269 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 -#: ../../mod/photos.php:1520 ../../mod/content.php:690 -#: ../../object/Item.php:559 +#: ../../mod/photos.php:1400 ../../mod/photos.php:1444 +#: ../../mod/photos.php:1516 ../../mod/content.php:690 +#: ../../object/Item.php:567 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1406 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:605 -#: ../../object/Item.php:561 +#: ../../mod/photos.php:1402 ../../mod/photos.php:1446 +#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608 +#: ../../object/Item.php:266 ../../object/Item.php:569 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1408 ../../mod/photos.php:1452 -#: ../../mod/photos.php:1524 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:1003 -#: ../../object/Item.php:571 +#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 +#: ../../mod/photos.php:1520 ../../mod/editpost.php:142 +#: ../../mod/content.php:702 ../../include/conversation.php:1006 +#: ../../object/Item.php:579 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1492 ../../mod/content.php:439 -#: ../../mod/content.php:724 ../../mod/settings.php:606 -#: ../../mod/group.php:168 ../../mod/admin.php:696 +#: ../../mod/photos.php:1488 ../../mod/content.php:439 +#: ../../mod/content.php:724 ../../mod/settings.php:622 +#: ../../mod/group.php:168 ../../mod/admin.php:699 #: ../../include/conversation.php:569 ../../object/Item.php:118 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1605 +#: ../../mod/photos.php:1601 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1614 +#: ../../mod/photos.php:1610 msgid "Recent Photos" msgstr "" @@ -688,13 +685,13 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 #: ../../include/nav.php:101 msgid "Community" msgstr "" #: ../../mod/community.php:61 ../../mod/community.php:86 -#: ../../mod/search.php:159 ../../mod/search.php:185 +#: ../../mod/search.php:162 ../../mod/search.php:188 msgid "No results." msgstr "" @@ -734,100 +731,100 @@ msgstr "" msgid "Item not found" msgstr "" -#: ../../mod/editpost.php:36 +#: ../../mod/editpost.php:39 msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:952 +#: ../../mod/editpost.php:91 ../../include/conversation.php:955 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:103 ../../mod/content.php:711 -#: ../../mod/settings.php:605 ../../object/Item.php:108 +#: ../../mod/editpost.php:106 ../../mod/content.php:711 +#: ../../mod/settings.php:621 ../../object/Item.php:108 msgid "Edit" msgstr "" -#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 -#: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:967 +#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150 +#: ../../mod/message.php:298 ../../mod/message.php:485 +#: ../../include/conversation.php:970 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:968 +#: ../../mod/editpost.php:108 ../../include/conversation.php:971 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:106 ../../include/conversation.php:969 +#: ../../mod/editpost.php:109 ../../include/conversation.php:972 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:107 ../../include/conversation.php:970 +#: ../../mod/editpost.php:110 ../../include/conversation.php:973 msgid "attach file" msgstr "" -#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 -#: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:971 +#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151 +#: ../../mod/message.php:299 ../../mod/message.php:486 +#: ../../include/conversation.php:974 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:972 +#: ../../mod/editpost.php:112 ../../include/conversation.php:975 msgid "web link" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:973 +#: ../../mod/editpost.php:113 ../../include/conversation.php:976 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:974 +#: ../../mod/editpost.php:114 ../../include/conversation.php:977 msgid "video link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:975 +#: ../../mod/editpost.php:115 ../../include/conversation.php:978 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:976 +#: ../../mod/editpost.php:116 ../../include/conversation.php:979 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:977 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:978 +#: ../../mod/editpost.php:118 ../../include/conversation.php:981 msgid "set location" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:979 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:980 +#: ../../mod/editpost.php:120 ../../include/conversation.php:983 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:986 +#: ../../mod/editpost.php:122 ../../include/conversation.php:989 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:995 +#: ../../mod/editpost.php:130 ../../include/conversation.php:998 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:996 +#: ../../mod/editpost.php:131 ../../include/conversation.php:999 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:982 +#: ../../mod/editpost.php:134 ../../include/conversation.php:985 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:133 ../../include/conversation.php:984 +#: ../../mod/editpost.php:136 ../../include/conversation.php:987 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:998 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1001 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -912,7 +909,7 @@ msgstr "" msgid "Disallowed profile URL." msgstr "" -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123 +#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124 msgid "Failed to update contact record." msgstr "" @@ -948,7 +945,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356 msgid "[Name Withheld]" msgstr "" @@ -1000,7 +997,7 @@ msgstr "" msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640 +#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" @@ -1020,39 +1017,40 @@ msgstr "" msgid "Submit Request" msgstr "" -#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137 +#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138 msgid "Account settings" msgstr "" -#: ../../mod/uexport.php:14 ../../mod/settings.php:35 +#: ../../mod/uexport.php:14 ../../mod/settings.php:40 msgid "Display settings" msgstr "" -#: ../../mod/uexport.php:20 ../../mod/settings.php:41 +#: ../../mod/uexport.php:20 ../../mod/settings.php:46 msgid "Connector settings" msgstr "" -#: ../../mod/uexport.php:25 ../../mod/settings.php:46 +#: ../../mod/uexport.php:25 ../../mod/settings.php:51 msgid "Plugin settings" msgstr "" -#: ../../mod/uexport.php:30 ../../mod/settings.php:51 +#: ../../mod/uexport.php:30 ../../mod/settings.php:56 msgid "Connected apps" msgstr "" -#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56 +#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61 msgid "Export personal data" msgstr "" -#: ../../mod/uexport.php:40 ../../mod/settings.php:61 +#: ../../mod/uexport.php:40 ../../mod/settings.php:66 msgid "Remove account" msgstr "" -#: ../../mod/uexport.php:48 ../../mod/settings.php:69 -#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 +#: ../../mod/uexport.php:48 ../../mod/settings.php:74 +#: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 -#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138 +#: ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "" @@ -1398,7 +1396,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1213 +#: ../../include/contact_widgets.php:9 ../../boot.php:1216 msgid "Connect" msgstr "" @@ -1415,15 +1413,15 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../mod/content.php:119 ../../mod/network.php:544 +#: ../../mod/content.php:119 ../../mod/network.php:594 msgid "No such group" msgstr "" -#: ../../mod/content.php:130 ../../mod/network.php:555 +#: ../../mod/content.php:130 ../../mod/network.php:605 msgid "Group is empty" msgstr "" -#: ../../mod/content.php:134 ../../mod/network.php:559 +#: ../../mod/content.php:134 ../../mod/network.php:609 msgid "Group: " msgstr "" @@ -1434,13 +1432,13 @@ msgstr "" #: ../../mod/content.php:455 ../../mod/content.php:817 #: ../../mod/content.php:818 ../../include/conversation.php:587 -#: ../../object/Item.php:229 ../../object/Item.php:230 +#: ../../object/Item.php:234 ../../object/Item.php:235 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:465 ../../mod/content.php:829 -#: ../../include/conversation.php:607 ../../object/Item.php:242 +#: ../../include/conversation.php:607 ../../object/Item.php:248 #, php-format msgid "%s from %s" msgstr "" @@ -1449,15 +1447,15 @@ msgstr "" msgid "View in context" msgstr "" -#: ../../mod/content.php:586 ../../object/Item.php:280 +#: ../../mod/content.php:586 ../../object/Item.php:288 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../mod/content.php:588 ../../include/text.php:1448 -#: ../../object/Item.php:282 ../../object/Item.php:295 +#: ../../mod/content.php:588 ../../include/text.php:1446 +#: ../../object/Item.php:290 ../../object/Item.php:303 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1465,57 +1463,57 @@ msgstr[1] "" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:606 -#: ../../object/Item.php:283 ../../addon.old/page/page.php:77 +#: ../../include/contact_widgets.php:204 ../../boot.php:609 +#: ../../object/Item.php:291 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "" -#: ../../mod/content.php:667 ../../object/Item.php:197 +#: ../../mod/content.php:667 ../../object/Item.php:202 msgid "like" msgstr "" -#: ../../mod/content.php:668 ../../object/Item.php:198 +#: ../../mod/content.php:668 ../../object/Item.php:203 msgid "dislike" msgstr "" -#: ../../mod/content.php:670 ../../object/Item.php:200 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "Share this" msgstr "" -#: ../../mod/content.php:670 ../../object/Item.php:200 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "share" msgstr "" -#: ../../mod/content.php:694 ../../object/Item.php:563 +#: ../../mod/content.php:694 ../../object/Item.php:571 msgid "Bold" msgstr "" -#: ../../mod/content.php:695 ../../object/Item.php:564 +#: ../../mod/content.php:695 ../../object/Item.php:572 msgid "Italic" msgstr "" -#: ../../mod/content.php:696 ../../object/Item.php:565 +#: ../../mod/content.php:696 ../../object/Item.php:573 msgid "Underline" msgstr "" -#: ../../mod/content.php:697 ../../object/Item.php:566 +#: ../../mod/content.php:697 ../../object/Item.php:574 msgid "Quote" msgstr "" -#: ../../mod/content.php:698 ../../object/Item.php:567 +#: ../../mod/content.php:698 ../../object/Item.php:575 msgid "Code" msgstr "" -#: ../../mod/content.php:699 ../../object/Item.php:568 +#: ../../mod/content.php:699 ../../object/Item.php:576 msgid "Image" msgstr "" -#: ../../mod/content.php:700 ../../object/Item.php:569 +#: ../../mod/content.php:700 ../../object/Item.php:577 msgid "Link" msgstr "" -#: ../../mod/content.php:701 ../../object/Item.php:570 +#: ../../mod/content.php:701 ../../object/Item.php:578 msgid "Video" msgstr "" @@ -1535,7 +1533,7 @@ msgstr "" msgid "starred" msgstr "" -#: ../../mod/content.php:742 ../../object/Item.php:187 +#: ../../mod/content.php:742 ../../object/Item.php:191 msgid "add tag" msgstr "" @@ -1543,15 +1541,15 @@ msgstr "" msgid "save to folder" msgstr "" -#: ../../mod/content.php:819 ../../object/Item.php:231 +#: ../../mod/content.php:819 ../../object/Item.php:236 msgid "to" msgstr "" -#: ../../mod/content.php:820 ../../object/Item.php:232 +#: ../../mod/content.php:820 ../../object/Item.php:238 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:821 ../../object/Item.php:233 +#: ../../mod/content.php:821 ../../object/Item.php:239 msgid "via Wall-To-Wall:" msgstr "" @@ -1571,8 +1569,8 @@ msgid "Discard" msgstr "" #: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:324 -#: ../../mod/contacts.php:378 +#: ../../mod/notifications.php:209 ../../mod/contacts.php:325 +#: ../../mod/contacts.php:379 msgid "Ignore" msgstr "" @@ -1584,21 +1582,21 @@ msgstr "" msgid "Network" msgstr "" -#: ../../mod/notifications.php:88 ../../mod/network.php:407 +#: ../../mod/notifications.php:88 ../../mod/network.php:444 msgid "Personal" msgstr "" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 -#: ../../include/nav.php:77 ../../include/nav.php:115 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../include/nav.php:77 ../../include/nav.php:116 msgid "Home" msgstr "" -#: ../../mod/notifications.php:98 ../../include/nav.php:121 +#: ../../mod/notifications.php:98 ../../include/nav.php:122 msgid "Introductions" msgstr "" -#: ../../mod/notifications.php:103 ../../mod/message.php:176 -#: ../../include/nav.php:128 +#: ../../mod/notifications.php:103 ../../mod/message.php:180 +#: ../../include/nav.php:129 msgid "Messages" msgstr "" @@ -1624,7 +1622,7 @@ msgid "suggested by %s" msgstr "" #: ../../mod/notifications.php:156 ../../mod/notifications.php:203 -#: ../../mod/contacts.php:384 +#: ../../mod/contacts.php:385 msgid "Hide this contact from others" msgstr "" @@ -1637,7 +1635,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:160 ../../mod/notifications.php:207 -#: ../../mod/admin.php:694 +#: ../../mod/admin.php:697 msgid "Approve" msgstr "" @@ -1681,7 +1679,7 @@ msgstr "" msgid "No introductions." msgstr "" -#: ../../mod/notifications.php:219 ../../include/nav.php:122 +#: ../../mod/notifications.php:219 ../../include/nav.php:123 msgid "Notifications" msgstr "" @@ -1746,307 +1744,309 @@ msgstr "" msgid "Home Notifications" msgstr "" -#: ../../mod/contacts.php:84 ../../mod/contacts.php:164 +#: ../../mod/contacts.php:85 ../../mod/contacts.php:165 msgid "Could not access contact record." msgstr "" -#: ../../mod/contacts.php:98 +#: ../../mod/contacts.php:99 msgid "Could not locate selected profile." msgstr "" -#: ../../mod/contacts.php:121 +#: ../../mod/contacts.php:122 msgid "Contact updated." msgstr "" -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been blocked" msgstr "" -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been unblocked" msgstr "" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been ignored" msgstr "" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been unignored" msgstr "" -#: ../../mod/contacts.php:219 +#: ../../mod/contacts.php:220 msgid "Contact has been archived" msgstr "" -#: ../../mod/contacts.php:219 +#: ../../mod/contacts.php:220 msgid "Contact has been unarchived" msgstr "" -#: ../../mod/contacts.php:232 +#: ../../mod/contacts.php:233 msgid "Contact has been removed." msgstr "" -#: ../../mod/contacts.php:266 +#: ../../mod/contacts.php:267 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: ../../mod/contacts.php:270 +#: ../../mod/contacts.php:271 #, php-format msgid "You are sharing with %s" msgstr "" -#: ../../mod/contacts.php:275 +#: ../../mod/contacts.php:276 #, php-format msgid "%s is sharing with you" msgstr "" -#: ../../mod/contacts.php:292 +#: ../../mod/contacts.php:293 msgid "Private communications are not available for this contact." msgstr "" -#: ../../mod/contacts.php:295 +#: ../../mod/contacts.php:296 msgid "Never" msgstr "" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:300 msgid "(Update was successful)" msgstr "" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:300 msgid "(Update was not successful)" msgstr "" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:302 msgid "Suggest friends" msgstr "" -#: ../../mod/contacts.php:305 +#: ../../mod/contacts.php:306 #, php-format msgid "Network type: %s" msgstr "" -#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190 +#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:314 msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 -#: ../../mod/admin.php:698 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 +#: ../../mod/admin.php:701 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 -#: ../../mod/admin.php:697 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 +#: ../../mod/admin.php:700 msgid "Block" msgstr "" -#: ../../mod/contacts.php:321 +#: ../../mod/contacts.php:322 msgid "Toggle Blocked status" msgstr "" -#: ../../mod/contacts.php:324 ../../mod/contacts.php:378 +#: ../../mod/contacts.php:325 ../../mod/contacts.php:379 msgid "Unignore" msgstr "" -#: ../../mod/contacts.php:327 +#: ../../mod/contacts.php:328 msgid "Toggle Ignored status" msgstr "" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:332 msgid "Unarchive" msgstr "" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:332 msgid "Archive" msgstr "" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:335 msgid "Toggle Archive status" msgstr "" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:338 msgid "Repair" msgstr "" -#: ../../mod/contacts.php:340 +#: ../../mod/contacts.php:341 msgid "Advanced Contact Settings" msgstr "" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:347 msgid "Communications lost with this contact!" msgstr "" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:350 msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:353 msgid "Profile Visibility" msgstr "" -#: ../../mod/contacts.php:353 +#: ../../mod/contacts.php:354 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:355 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:356 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:360 ../../mod/contacts.php:552 +#: ../../mod/contacts.php:361 ../../mod/contacts.php:553 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:362 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:362 +#: ../../mod/contacts.php:363 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:363 +#: ../../mod/contacts.php:364 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:364 +#: ../../mod/contacts.php:365 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:366 +#: ../../mod/contacts.php:367 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:370 +#: ../../mod/contacts.php:371 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:372 +#: ../../mod/contacts.php:373 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:374 ../../mod/admin.php:1170 +#: ../../mod/contacts.php:375 ../../mod/admin.php:1173 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:382 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:382 +#: ../../mod/contacts.php:383 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:383 +#: ../../mod/contacts.php:384 msgid "Currently archived" msgstr "" -#: ../../mod/contacts.php:384 +#: ../../mod/contacts.php:385 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:438 msgid "Suggestions" msgstr "" -#: ../../mod/contacts.php:440 +#: ../../mod/contacts.php:441 msgid "Suggest potential friends" msgstr "" -#: ../../mod/contacts.php:443 ../../mod/group.php:191 +#: ../../mod/contacts.php:444 ../../mod/group.php:191 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:447 msgid "Show all contacts" msgstr "" -#: ../../mod/contacts.php:449 +#: ../../mod/contacts.php:450 msgid "Unblocked" msgstr "" -#: ../../mod/contacts.php:452 +#: ../../mod/contacts.php:453 msgid "Only show unblocked contacts" msgstr "" -#: ../../mod/contacts.php:456 +#: ../../mod/contacts.php:457 msgid "Blocked" msgstr "" -#: ../../mod/contacts.php:459 +#: ../../mod/contacts.php:460 msgid "Only show blocked contacts" msgstr "" -#: ../../mod/contacts.php:463 +#: ../../mod/contacts.php:464 msgid "Ignored" msgstr "" -#: ../../mod/contacts.php:466 +#: ../../mod/contacts.php:467 msgid "Only show ignored contacts" msgstr "" -#: ../../mod/contacts.php:470 +#: ../../mod/contacts.php:471 msgid "Archived" msgstr "" -#: ../../mod/contacts.php:473 +#: ../../mod/contacts.php:474 msgid "Only show archived contacts" msgstr "" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:478 msgid "Hidden" msgstr "" -#: ../../mod/contacts.php:480 +#: ../../mod/contacts.php:481 msgid "Only show hidden contacts" msgstr "" -#: ../../mod/contacts.php:528 +#: ../../mod/contacts.php:529 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:532 +#: ../../mod/contacts.php:533 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:536 +#: ../../mod/contacts.php:537 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88 -#: ../../include/nav.php:139 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89 +#: ../../include/nav.php:142 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:578 +#: ../../mod/contacts.php:579 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:579 ../../mod/directory.php:59 +#: ../../mod/contacts.php:580 ../../mod/directory.php:59 +#: ../../addon/forumdirectory/forumdirectory.php:81 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:580 ../../mod/directory.php:61 +#: ../../mod/contacts.php:581 ../../mod/directory.php:61 +#: ../../addon/forumdirectory/forumdirectory.php:83 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "" @@ -2070,8 +2070,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359 -#: ../../boot.php:821 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 +#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2085,7 +2085,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:960 +#: ../../mod/lostpass.php:83 ../../boot.php:963 msgid "Password Reset" msgstr "" @@ -2129,69 +2129,77 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../mod/settings.php:113 +#: ../../mod/settings.php:35 +msgid "Additional features" +msgstr "" + +#: ../../mod/settings.php:118 msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:116 ../../mod/settings.php:569 +#: ../../mod/settings.php:121 ../../mod/settings.php:585 msgid "Update" msgstr "" -#: ../../mod/settings.php:221 +#: ../../mod/settings.php:226 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: ../../mod/settings.php:226 +#: ../../mod/settings.php:231 msgid "Email settings updated." msgstr "" -#: ../../mod/settings.php:290 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:295 -msgid "Empty passwords are not allowed. Password unchanged." +#: ../../mod/settings.php:246 +msgid "Features updated" msgstr "" #: ../../mod/settings.php:306 +msgid "Passwords do not match. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:311 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:322 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:308 +#: ../../mod/settings.php:324 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:373 +#: ../../mod/settings.php:389 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:375 +#: ../../mod/settings.php:391 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:381 +#: ../../mod/settings.php:397 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:383 +#: ../../mod/settings.php:399 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:437 +#: ../../mod/settings.php:453 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: ../../mod/settings.php:441 +#: ../../mod/settings.php:457 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495 +#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495 #: ../../addon/fbpost/fbpost.php:144 #: ../../addon/remote_permissions/remote_permissions.php:204 #: ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:389 +#: ../../addon/twitter/twitter.php:501 #: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/fbpost/fbpost.php:144 #: ../../addon.old/impressum/impressum.php:78 @@ -2201,442 +2209,454 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:542 ../../mod/settings.php:568 -#: ../../mod/settings.php:604 +#: ../../mod/settings.php:558 ../../mod/settings.php:584 +#: ../../mod/settings.php:620 msgid "Add application" msgstr "" -#: ../../mod/settings.php:546 ../../mod/settings.php:572 -#: ../../addon/statusnet/statusnet.php:570 +#: ../../mod/settings.php:562 ../../mod/settings.php:588 +#: ../../addon/statusnet/statusnet.php:679 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:547 ../../mod/settings.php:573 -#: ../../addon/statusnet/statusnet.php:569 +#: ../../mod/settings.php:563 ../../mod/settings.php:589 +#: ../../addon/statusnet/statusnet.php:678 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:548 ../../mod/settings.php:574 +#: ../../mod/settings.php:564 ../../mod/settings.php:590 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:549 ../../mod/settings.php:575 +#: ../../mod/settings.php:565 ../../mod/settings.php:591 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:560 +#: ../../mod/settings.php:576 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:619 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:607 +#: ../../mod/settings.php:623 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:608 +#: ../../mod/settings.php:624 msgid "No name" msgstr "" -#: ../../mod/settings.php:609 +#: ../../mod/settings.php:625 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:620 +#: ../../mod/settings.php:637 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123 #: ../../addon.old/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:659 +msgid "Off" +msgstr "" + +#: ../../mod/settings.php:659 +msgid "On" +msgstr "" + +#: ../../mod/settings.php:667 +msgid "Additional Features" +msgstr "" + +#: ../../mod/settings.php:681 ../../mod/settings.php:682 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "enabled" msgstr "" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "disabled" msgstr "" -#: ../../mod/settings.php:641 +#: ../../mod/settings.php:682 msgid "StatusNet" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:714 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:720 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:684 +#: ../../mod/settings.php:725 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:685 +#: ../../mod/settings.php:726 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/settings.php:686 +#: ../../mod/settings.php:727 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:688 +#: ../../mod/settings.php:729 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:689 +#: ../../mod/settings.php:730 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:690 +#: ../../mod/settings.php:731 msgid "Security:" msgstr "" -#: ../../mod/settings.php:690 ../../mod/settings.php:695 +#: ../../mod/settings.php:731 ../../mod/settings.php:736 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "" -#: ../../mod/settings.php:691 +#: ../../mod/settings.php:732 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:733 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:693 +#: ../../mod/settings.php:734 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:694 +#: ../../mod/settings.php:735 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:696 +#: ../../mod/settings.php:737 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:727 ../../mod/admin.php:402 +#: ../../mod/settings.php:768 ../../mod/admin.php:404 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:808 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:773 ../../mod/settings.php:784 +#: ../../mod/settings.php:814 ../../mod/settings.php:825 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:774 +#: ../../mod/settings.php:815 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Number of items to display per page:" msgstr "" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:777 +#: ../../mod/settings.php:818 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:894 msgid "Normal Account Page" msgstr "" -#: ../../mod/settings.php:854 +#: ../../mod/settings.php:895 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:857 +#: ../../mod/settings.php:898 msgid "Soapbox Page" msgstr "" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:899 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:861 +#: ../../mod/settings.php:902 msgid "Community Forum/Celebrity Account" msgstr "" -#: ../../mod/settings.php:862 +#: ../../mod/settings.php:903 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:865 +#: ../../mod/settings.php:906 msgid "Automatic Friend Page" msgstr "" -#: ../../mod/settings.php:866 +#: ../../mod/settings.php:907 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:869 +#: ../../mod/settings.php:910 msgid "Private Forum [Experimental]" msgstr "" -#: ../../mod/settings.php:870 +#: ../../mod/settings.php:911 msgid "Private forum - approved members only" msgstr "" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:933 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:939 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:906 +#: ../../mod/settings.php:947 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:910 +#: ../../mod/settings.php:951 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:915 +#: ../../mod/settings.php:956 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:921 +#: ../../mod/settings.php:962 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:968 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:974 msgid "Permit unknown people to send you private mail?" msgstr "" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:982 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248 +#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248 msgid "or" msgstr "" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:990 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:1002 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:1003 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:1004 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:1005 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:1006 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:1007 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:1008 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:1015 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:1023 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:1024 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:1029 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1031 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1032 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1033 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1034 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1037 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1039 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:998 ../../mod/settings.php:1017 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1058 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1040 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1000 +#: ../../mod/settings.php:1041 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1058 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1061 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1062 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1063 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1064 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1065 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1066 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1026 +#: ../../mod/settings.php:1067 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1068 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1069 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1070 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1071 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1072 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1073 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1074 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1077 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1078 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -2658,63 +2678,64 @@ msgstr "" msgid "Search Results For:" msgstr "" -#: ../../mod/network.php:221 ../../mod/search.php:18 +#: ../../mod/network.php:224 ../../mod/search.php:21 msgid "Remove term" msgstr "" -#: ../../mod/network.php:230 ../../mod/search.php:27 +#: ../../mod/network.php:233 ../../mod/search.php:30 +#: ../../include/features.php:41 msgid "Saved Searches" msgstr "" -#: ../../mod/network.php:231 ../../include/group.php:275 +#: ../../mod/network.php:234 ../../include/group.php:275 msgid "add" msgstr "" -#: ../../mod/network.php:394 +#: ../../mod/network.php:397 msgid "Commented Order" msgstr "" -#: ../../mod/network.php:397 +#: ../../mod/network.php:400 msgid "Sort by Comment Date" msgstr "" -#: ../../mod/network.php:400 +#: ../../mod/network.php:403 msgid "Posted Order" msgstr "" -#: ../../mod/network.php:403 +#: ../../mod/network.php:406 msgid "Sort by Post Date" msgstr "" -#: ../../mod/network.php:410 +#: ../../mod/network.php:447 msgid "Posts that mention or involve you" msgstr "" -#: ../../mod/network.php:413 +#: ../../mod/network.php:453 msgid "New" msgstr "" -#: ../../mod/network.php:416 +#: ../../mod/network.php:456 msgid "Activity Stream - by date" msgstr "" -#: ../../mod/network.php:419 -msgid "Starred" -msgstr "" - -#: ../../mod/network.php:422 -msgid "Favourite Posts" -msgstr "" - -#: ../../mod/network.php:425 +#: ../../mod/network.php:462 msgid "Shared Links" msgstr "" -#: ../../mod/network.php:428 +#: ../../mod/network.php:465 msgid "Interesting Links" msgstr "" -#: ../../mod/network.php:496 +#: ../../mod/network.php:471 +msgid "Starred" +msgstr "" + +#: ../../mod/network.php:474 +msgid "Favourite Posts" +msgstr "" + +#: ../../mod/network.php:546 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2722,29 +2743,29 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:499 +#: ../../mod/network.php:549 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:569 +#: ../../mod/network.php:619 msgid "Contact: " msgstr "" -#: ../../mod/network.php:571 +#: ../../mod/network.php:621 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:576 +#: ../../mod/network.php:626 msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1752 +#: ../../mod/notes.php:44 ../../boot.php:1755 msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:263 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:281 #: ../../addon/fbpost/fbpost.php:267 #: ../../addon/dav/friendica/layout.fnk.php:441 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688 @@ -2796,7 +2817,7 @@ msgstr "" msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "" -#: ../../mod/wallmessage.php:56 ../../mod/message.php:59 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:63 msgid "No recipient selected." msgstr "" @@ -2804,15 +2825,15 @@ msgstr "" msgid "Unable to check your home location." msgstr "" -#: ../../mod/wallmessage.php:62 ../../mod/message.php:66 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:70 msgid "Message could not be sent." msgstr "" -#: ../../mod/wallmessage.php:65 ../../mod/message.php:69 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:73 msgid "Message collection failure." msgstr "" -#: ../../mod/wallmessage.php:68 ../../mod/message.php:72 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:76 msgid "Message sent." msgstr "" @@ -2821,12 +2842,12 @@ msgid "No recipient." msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 -#: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:902 ../../include/conversation.php:920 +#: ../../mod/message.php:249 ../../mod/message.php:257 +#: ../../include/conversation.php:905 ../../include/conversation.php:923 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/wallmessage.php:138 ../../mod/message.php:278 +#: ../../mod/wallmessage.php:138 ../../mod/message.php:285 msgid "Send Private Message" msgstr "" @@ -2837,18 +2858,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:279 -#: ../../mod/message.php:469 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:286 +#: ../../mod/message.php:476 msgid "To:" msgstr "" -#: ../../mod/wallmessage.php:141 ../../mod/message.php:284 -#: ../../mod/message.php:471 +#: ../../mod/wallmessage.php:141 ../../mod/message.php:291 +#: ../../mod/message.php:478 msgid "Subject:" msgstr "" -#: ../../mod/wallmessage.php:147 ../../mod/message.php:288 -#: ../../mod/message.php:474 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:147 ../../mod/message.php:295 +#: ../../mod/message.php:481 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2903,9 +2924,9 @@ msgid "" msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1728 +#: ../../boot.php:1731 msgid "Profile" msgstr "" @@ -3187,7 +3208,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:260 ../../mod/admin.php:444 +#: ../../mod/register.php:260 ../../mod/admin.php:446 msgid "Registration" msgstr "" @@ -3210,7 +3231,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:920 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923 msgid "Register" msgstr "" @@ -3220,8 +3241,8 @@ msgstr "" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1444 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 +#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442 +#: ../../include/diaspora.php:1848 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 msgid "photo" @@ -3231,8 +3252,8 @@ msgstr "" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:452 -#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:459 +#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3243,7 +3264,7 @@ msgstr "" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3257,8 +3278,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 -#: ../../mod/display.php:169 ../../include/items.php:3837 +#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39 +#: ../../mod/display.php:169 ../../include/items.php:3843 msgid "Item not found." msgstr "" @@ -3266,8 +3287,8 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:51 ../../boot.php:1735 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../include/nav.php:51 ../../boot.php:1738 msgid "Photos" msgstr "" @@ -3296,34 +3317,34 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:420 ../../mod/wall_upload.php:135 +#: ../../mod/item.php:424 ../../mod/wall_upload.php:135 #: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:833 +#: ../../mod/item.php:837 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:858 +#: ../../mod/item.php:862 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:860 +#: ../../mod/item.php:864 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:861 +#: ../../mod/item.php:865 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:863 +#: ../../mod/item.php:867 #, php-format msgid "%s posted an update." msgstr "" @@ -3422,71 +3443,71 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/message.php:9 ../../include/nav.php:131 +#: ../../mod/message.php:9 ../../include/nav.php:132 msgid "New Message" msgstr "" -#: ../../mod/message.php:63 +#: ../../mod/message.php:67 msgid "Unable to locate contact information." msgstr "" -#: ../../mod/message.php:191 +#: ../../mod/message.php:195 msgid "Message deleted." msgstr "" -#: ../../mod/message.php:221 +#: ../../mod/message.php:225 msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:327 +#: ../../mod/message.php:334 msgid "No messages." msgstr "" -#: ../../mod/message.php:334 +#: ../../mod/message.php:341 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:337 +#: ../../mod/message.php:344 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:340 +#: ../../mod/message.php:347 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:350 ../../mod/message.php:462 +#: ../../mod/message.php:357 ../../mod/message.php:469 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:353 +#: ../../mod/message.php:360 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:356 +#: ../../mod/message.php:363 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:391 +#: ../../mod/message.php:398 msgid "Message not available." msgstr "" -#: ../../mod/message.php:444 +#: ../../mod/message.php:451 msgid "Delete message" msgstr "" -#: ../../mod/message.php:464 +#: ../../mod/message.php:471 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:468 +#: ../../mod/message.php:475 msgid "Send Reply" msgstr "" @@ -3503,19 +3524,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:442 +#: ../../mod/admin.php:96 ../../mod/admin.php:444 msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701 +#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825 +#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024 +#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027 msgid "Themes" msgstr "" @@ -3523,11 +3544,11 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114 msgid "Logs" msgstr "" -#: ../../mod/admin.php:120 ../../include/nav.php:146 +#: ../../mod/admin.php:120 ../../include/nav.php:149 msgid "Admin" msgstr "" @@ -3539,19 +3560,19 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:183 ../../mod/admin.php:669 +#: ../../mod/admin.php:183 ../../mod/admin.php:672 msgid "Normal Account" msgstr "" -#: ../../mod/admin.php:184 ../../mod/admin.php:670 +#: ../../mod/admin.php:184 ../../mod/admin.php:673 msgid "Soapbox Account" msgstr "" -#: ../../mod/admin.php:185 ../../mod/admin.php:671 +#: ../../mod/admin.php:185 ../../mod/admin.php:674 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/admin.php:186 ../../mod/admin.php:672 +#: ../../mod/admin.php:186 ../../mod/admin.php:675 msgid "Automatic Friend Account" msgstr "" @@ -3567,9 +3588,9 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687 -#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987 -#: ../../mod/admin.php:1023 ../../mod/admin.php:1110 +#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690 +#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990 +#: ../../mod/admin.php:1026 ../../mod/admin.php:1113 msgid "Administration" msgstr "" @@ -3593,558 +3614,570 @@ msgstr "" msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:373 +#: ../../mod/admin.php:375 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 msgid "Closed" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "Open" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:438 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:447 msgid "File upload" msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:448 msgid "Policies" msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:449 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567 +#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:676 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:454 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:455 msgid "System language" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:456 msgid "System theme" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:456 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:457 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:457 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:458 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:458 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:459 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:459 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:460 msgid "Maximum image length" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:460 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is -" "1, which means no limits." msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:461 msgid "JPEG image quality" msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:461 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:463 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:464 +msgid "Maximum Daily Registrations" +msgstr "" + +#: ../../mod/admin.php:464 +msgid "" +"If registration is permitted above, this sets the maximum number of new user " +"registrations to accept per day. If register is set to closed, this setting " +"has no effect." +msgstr "" + +#: ../../mod/admin.php:465 msgid "Register text" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:465 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:466 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:466 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:467 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:467 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:468 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:468 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 "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:469 msgid "Block public" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:469 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:470 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:470 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:471 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:471 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:472 msgid "Allow threaded items" msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:472 msgid "Allow infinite level threading for items on this site." msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:473 msgid "Private posts by default for new users" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:473 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:475 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:475 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:477 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:477 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:478 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:478 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:479 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:479 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:480 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:480 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 "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:481 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:481 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:482 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:482 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:483 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:483 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 "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:484 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:485 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:486 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:486 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:487 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:487 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:488 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:488 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:489 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:489 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:503 +#: ../../mod/admin.php:506 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:513 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "" - #: ../../mod/admin.php:516 #, php-format -msgid "Update %s was successfully applied." +msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:520 +#: ../../mod/admin.php:519 #, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." +msgid "Update %s was successfully applied." msgstr "" #: ../../mod/admin.php:523 #, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:526 +#, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:538 +#: ../../mod/admin.php:541 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:542 +#: ../../mod/admin.php:545 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:543 +#: ../../mod/admin.php:546 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: ../../mod/admin.php:544 +#: ../../mod/admin.php:547 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:545 +#: ../../mod/admin.php:548 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:570 +#: ../../mod/admin.php:573 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:577 +#: ../../mod/admin.php:580 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:616 +#: ../../mod/admin.php:619 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:624 +#: ../../mod/admin.php:627 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:624 +#: ../../mod/admin.php:627 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:690 +#: ../../mod/admin.php:693 msgid "select all" msgstr "" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:694 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:692 +#: ../../mod/admin.php:695 msgid "Request date" msgstr "" -#: ../../mod/admin.php:692 ../../mod/admin.php:702 +#: ../../mod/admin.php:695 ../../mod/admin.php:705 #: ../../include/contact_selectors.php:79 +#: ../../include/contact_selectors.php:86 msgid "Email" msgstr "" -#: ../../mod/admin.php:693 +#: ../../mod/admin.php:696 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Deny" msgstr "" -#: ../../mod/admin.php:699 +#: ../../mod/admin.php:702 msgid "Site admin" msgstr "" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "Register date" msgstr "" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "Last login" msgstr "" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "Last item" msgstr "" -#: ../../mod/admin.php:702 +#: ../../mod/admin.php:705 msgid "Account" msgstr "" -#: ../../mod/admin.php:704 +#: ../../mod/admin.php:707 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:705 +#: ../../mod/admin.php:708 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 "" -#: ../../mod/admin.php:746 +#: ../../mod/admin.php:749 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:750 +#: ../../mod/admin.php:753 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:760 ../../mod/admin.php:958 +#: ../../mod/admin.php:763 ../../mod/admin.php:961 msgid "Disable" msgstr "" -#: ../../mod/admin.php:762 ../../mod/admin.php:960 +#: ../../mod/admin.php:765 ../../mod/admin.php:963 msgid "Enable" msgstr "" -#: ../../mod/admin.php:784 ../../mod/admin.php:989 +#: ../../mod/admin.php:787 ../../mod/admin.php:992 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:792 ../../mod/admin.php:999 +#: ../../mod/admin.php:795 ../../mod/admin.php:1002 msgid "Author: " msgstr "" -#: ../../mod/admin.php:793 ../../mod/admin.php:1000 +#: ../../mod/admin.php:796 ../../mod/admin.php:1003 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:922 +#: ../../mod/admin.php:925 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:981 +#: ../../mod/admin.php:984 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1029 +#: ../../mod/admin.php:1032 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1030 +#: ../../mod/admin.php:1033 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1057 +#: ../../mod/admin.php:1060 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1113 +#: ../../mod/admin.php:1116 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1119 +#: ../../mod/admin.php:1122 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1120 +#: ../../mod/admin.php:1123 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1120 +#: ../../mod/admin.php:1123 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1121 +#: ../../mod/admin.php:1124 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1171 +#: ../../mod/admin.php:1174 msgid "Close" msgstr "" -#: ../../mod/admin.php:1177 +#: ../../mod/admin.php:1180 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1178 +#: ../../mod/admin.php:1181 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1179 +#: ../../mod/admin.php:1182 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1180 +#: ../../mod/admin.php:1183 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1123 +#: ../../mod/profile.php:21 ../../boot.php:1126 msgid "Requested profile is not available." msgstr "" @@ -4252,7 +4285,7 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:96 ../../include/text.php:685 +#: ../../mod/search.php:99 ../../include/text.php:685 #: ../../include/text.php:686 ../../include/nav.php:91 msgid "Search" msgstr "" @@ -4362,211 +4395,212 @@ msgstr "" msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:573 +#: ../../mod/profiles.php:576 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:596 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:598 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:599 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:600 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:601 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:602 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:603 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:604 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:605 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:606 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:607 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:608 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:609 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:610 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:611 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:612 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:613 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:614 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:615 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:617 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:618 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "" -#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:619 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:620 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:621 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:622 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:623 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "" -#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:625 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:626 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:627 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:628 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:629 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:630 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:631 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:632 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:633 msgid "Television" msgstr "" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:634 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:635 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:636 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:637 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:642 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:649 ../../mod/directory.php:111 +#: ../../mod/profiles.php:652 ../../mod/directory.php:111 +#: ../../addon/forumdirectory/forumdirectory.php:133 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:688 +#: ../../mod/profiles.php:691 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:689 ../../boot.php:1241 +#: ../../mod/profiles.php:692 ../../boot.php:1244 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:690 ../../boot.php:1242 +#: ../../mod/profiles.php:693 ../../boot.php:1245 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:701 ../../boot.php:1252 +#: ../../mod/profiles.php:704 ../../boot.php:1255 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:703 ../../boot.php:1255 +#: ../../mod/profiles.php:706 ../../boot.php:1258 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:704 ../../boot.php:1256 +#: ../../mod/profiles.php:707 ../../boot.php:1259 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:906 -#: ../../include/conversation.php:924 +#: ../../mod/filer.php:29 ../../include/conversation.php:909 +#: ../../include/conversation.php:927 msgid "Save to Folder:" msgstr "" @@ -4658,7 +4692,7 @@ msgstr "" msgid "diaspora2bb: " msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4673,42 +4707,50 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 +#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71 +#: ../../view/theme/diabook/theme.php:518 msgid "Global Directory" msgstr "" -#: ../../mod/directory.php:57 +#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79 msgid "Find on this site" msgstr "" -#: ../../mod/directory.php:60 +#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82 msgid "Site Directory" msgstr "" #: ../../mod/directory.php:114 +#: ../../addon/forumdirectory/forumdirectory.php:136 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1277 +#: ../../mod/directory.php:136 +#: ../../addon/forumdirectory/forumdirectory.php:158 +#: ../../include/profile_advanced.php:17 ../../boot.php:1280 msgid "Gender:" msgstr "" -#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1280 +#: ../../mod/directory.php:138 +#: ../../addon/forumdirectory/forumdirectory.php:160 +#: ../../include/profile_advanced.php:37 ../../boot.php:1283 msgid "Status:" msgstr "" -#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1282 +#: ../../mod/directory.php:140 +#: ../../addon/forumdirectory/forumdirectory.php:162 +#: ../../include/profile_advanced.php:48 ../../boot.php:1285 msgid "Homepage:" msgstr "" -#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58 +#: ../../mod/directory.php:142 +#: ../../addon/forumdirectory/forumdirectory.php:164 +#: ../../include/profile_advanced.php:58 msgid "About:" msgstr "" #: ../../mod/directory.php:180 +#: ../../addon/forumdirectory/forumdirectory.php:202 msgid "No entries (some entries may be hidden)." msgstr "" @@ -5179,27 +5221,27 @@ msgstr "" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:260 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:278 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:265 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:283 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:268 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:286 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:270 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:288 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:272 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:290 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "" @@ -5567,11 +5609,15 @@ msgstr "" msgid "Enable Planets Plugin" msgstr "" +#: ../../addon/forumdirectory/forumdirectory.php:22 +msgid "Forum Directory" +msgstr "" + #: ../../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:64 ../../boot.php:946 +#: ../../include/nav.php:64 ../../boot.php:949 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -5611,7 +5657,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1442 +#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -6180,7 +6226,7 @@ msgstr "" #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:774 +#: ../../include/enotify.php:28 ../../include/notifier.php:778 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -6534,22 +6580,22 @@ msgstr "" msgid "Failed" msgstr "" -#: ../../addon/js_upload/js_upload.php:297 +#: ../../addon/js_upload/js_upload.php:303 #: ../../addon.old/js_upload/js_upload.php:297 msgid "No files were uploaded." msgstr "" -#: ../../addon/js_upload/js_upload.php:303 +#: ../../addon/js_upload/js_upload.php:309 #: ../../addon.old/js_upload/js_upload.php:303 msgid "Uploaded file is empty" msgstr "" -#: ../../addon/js_upload/js_upload.php:326 +#: ../../addon/js_upload/js_upload.php:332 #: ../../addon.old/js_upload/js_upload.php:326 msgid "File has an invalid extension, it should be one of " msgstr "" -#: ../../addon/js_upload/js_upload.php:337 +#: ../../addon/js_upload/js_upload.php:343 #: ../../addon.old/js_upload/js_upload.php:337 msgid "Upload was cancelled, or server error encountered" msgstr "" @@ -7253,7 +7299,7 @@ msgstr "" msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/statusnet/statusnet.php:568 +#: ../../addon/statusnet/statusnet.php:677 #: ../../addon.old/statusnet/statusnet.php:568 msgid "API URL" msgstr "" @@ -7487,11 +7533,11 @@ msgstr "" msgid "Send linked #-tags and @-names to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396 +#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396 msgid "Consumer key" msgstr "" -#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397 +#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397 msgid "Consumer secret" msgstr "" @@ -7629,135 +7675,137 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../include/nav.php:116 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:88 +#: ../../view/theme/diabook/theme.php:89 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:93 +#: ../../view/theme/diabook/theme.php:94 +#: ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:632 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:377 -#: ../../view/theme/diabook/theme.php:591 +#: ../../view/theme/diabook/theme.php:384 +#: ../../view/theme/diabook/theme.php:634 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:398 -#: ../../view/theme/diabook/theme.php:596 +#: ../../view/theme/diabook/theme.php:405 +#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:427 -#: ../../view/theme/diabook/theme.php:598 +#: ../../view/theme/diabook/theme.php:434 +#: ../../view/theme/diabook/theme.php:641 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:472 -#: ../../view/theme/diabook/theme.php:597 +#: ../../view/theme/diabook/theme.php:479 +#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:509 -#: ../../view/theme/diabook/theme.php:594 +#: ../../view/theme/diabook/theme.php:516 +#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:517 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:531 -#: ../../view/theme/diabook/theme.php:590 +#: ../../view/theme/diabook/theme.php:572 +#: ../../view/theme/diabook/theme.php:633 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:536 +#: ../../view/theme/diabook/theme.php:577 msgid "Set zoomfactor for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:578 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:538 +#: ../../view/theme/diabook/theme.php:579 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 +#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:558 -#: ../../view/theme/diabook/theme.php:593 +#: ../../view/theme/diabook/theme.php:599 +#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:595 +#: ../../view/theme/diabook/theme.php:606 +#: ../../view/theme/diabook/theme.php:638 msgid "Last Tweets" msgstr "" -#: ../../view/theme/diabook/theme.php:568 +#: ../../view/theme/diabook/theme.php:609 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:629 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:629 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "" -#: ../../view/theme/diabook/theme.php:588 +#: ../../view/theme/diabook/theme.php:630 msgid "Show/hide boxes at right-hand column:" msgstr "" @@ -7931,6 +7979,10 @@ msgstr "" msgid "MySpace" msgstr "" +#: ../../include/contact_selectors.php:87 +msgid "Google+" +msgstr "" + #: ../../include/profile_selectors.php:6 msgid "Male" msgstr "" @@ -8172,7 +8224,7 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:457 ../../include/notifier.php:767 +#: ../../include/delivery.php:457 ../../include/notifier.php:771 msgid "(no subject)" msgstr "" @@ -8391,31 +8443,31 @@ msgstr "" msgid "December" msgstr "" -#: ../../include/text.php:1012 +#: ../../include/text.php:1010 msgid "bytes" msgstr "" -#: ../../include/text.php:1039 ../../include/text.php:1051 +#: ../../include/text.php:1037 ../../include/text.php:1049 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1224 ../../include/user.php:236 +#: ../../include/text.php:1222 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1236 +#: ../../include/text.php:1234 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1446 +#: ../../include/text.php:1444 msgid "activity" msgstr "" -#: ../../include/text.php:1449 +#: ../../include/text.php:1447 msgid "post" msgstr "" -#: ../../include/text.php:1604 +#: ../../include/text.php:1602 msgid "Item filed" msgstr "" @@ -8423,11 +8475,11 @@ msgstr "" msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2222 +#: ../../include/diaspora.php:2236 msgid "Attachments:" msgstr "" -#: ../../include/network.php:849 +#: ../../include/network.php:847 msgid "view full size" msgstr "" @@ -8510,7 +8562,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:945 +#: ../../include/nav.php:46 ../../boot.php:948 msgid "Logout" msgstr "" @@ -8518,7 +8570,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1721 +#: ../../include/nav.php:49 ../../boot.php:1724 msgid "Status" msgstr "" @@ -8566,55 +8618,63 @@ msgstr "" msgid "Conversations from your friends" msgstr "" -#: ../../include/nav.php:121 +#: ../../include/nav.php:114 +msgid "Network Reset" +msgstr "" + +#: ../../include/nav.php:114 +msgid "Load Network page with no filters" +msgstr "" + +#: ../../include/nav.php:122 msgid "Friend Requests" msgstr "" -#: ../../include/nav.php:123 +#: ../../include/nav.php:124 msgid "See all notifications" msgstr "" -#: ../../include/nav.php:124 +#: ../../include/nav.php:125 msgid "Mark all system notifications seen" msgstr "" -#: ../../include/nav.php:128 +#: ../../include/nav.php:129 msgid "Private mail" msgstr "" -#: ../../include/nav.php:129 +#: ../../include/nav.php:130 msgid "Inbox" msgstr "" -#: ../../include/nav.php:130 +#: ../../include/nav.php:131 msgid "Outbox" msgstr "" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage" msgstr "" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1235 +#: ../../include/nav.php:140 ../../boot.php:1238 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1235 -msgid "Manage/edit profiles" +#: ../../include/nav.php:140 +msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:139 +#: ../../include/nav.php:142 msgid "Manage/edit friends and contacts" msgstr "" -#: ../../include/nav.php:146 +#: ../../include/nav.php:149 msgid "Site setup and configuration" msgstr "" -#: ../../include/nav.php:170 +#: ../../include/nav.php:173 msgid "Nothing new here" msgstr "" @@ -8657,23 +8717,23 @@ msgstr "" msgid "Random Profile" msgstr "" -#: ../../include/contact_widgets.php:68 +#: ../../include/contact_widgets.php:70 msgid "Networks" msgstr "" -#: ../../include/contact_widgets.php:71 +#: ../../include/contact_widgets.php:73 msgid "All Networks" msgstr "" -#: ../../include/contact_widgets.php:98 +#: ../../include/contact_widgets.php:103 ../../include/features.php:59 msgid "Saved Folders" msgstr "" -#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129 +#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138 msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:126 +#: ../../include/contact_widgets.php:135 msgid "Categories" msgstr "" @@ -8748,12 +8808,12 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:472 ../../include/items.php:1689 +#: ../../include/datetime.php:472 ../../include/items.php:1695 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/datetime.php:473 ../../include/items.php:1690 +#: ../../include/datetime.php:473 ../../include/items.php:1696 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -8762,24 +8822,172 @@ msgstr "" msgid "From: " msgstr "" -#: ../../include/bbcode.php:185 ../../include/bbcode.php:406 +#: ../../include/bbcode.php:202 ../../include/bbcode.php:423 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:371 ../../include/bbcode.php:391 +#: ../../include/bbcode.php:388 ../../include/bbcode.php:408 msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:410 ../../include/bbcode.php:411 +#: ../../include/bbcode.php:427 ../../include/bbcode.php:428 msgid "Encrypted content" msgstr "" +#: ../../include/features.php:23 +msgid "General Features" +msgstr "" + +#: ../../include/features.php:25 +msgid "Multiple Profiles" +msgstr "" + +#: ../../include/features.php:25 +msgid "Ability to create multiple profiles" +msgstr "" + +#: ../../include/features.php:30 +msgid "Post Composition Features" +msgstr "" + +#: ../../include/features.php:31 +msgid "Richtext Editor" +msgstr "" + +#: ../../include/features.php:31 +msgid "Enable richtext editor" +msgstr "" + +#: ../../include/features.php:32 +msgid "Post Preview" +msgstr "" + +#: ../../include/features.php:32 +msgid "Allow previewing posts and comments before publishing them" +msgstr "" + +#: ../../include/features.php:37 +msgid "Network Sidebar Widgets" +msgstr "" + +#: ../../include/features.php:38 +msgid "Search by Date" +msgstr "" + +#: ../../include/features.php:38 +msgid "Ability to select posts by date ranges" +msgstr "" + +#: ../../include/features.php:39 +msgid "Group Filter" +msgstr "" + +#: ../../include/features.php:39 +msgid "Enable widget to display Network posts only from selected group" +msgstr "" + +#: ../../include/features.php:40 +msgid "Network Filter" +msgstr "" + +#: ../../include/features.php:40 +msgid "Enable widget to display Network posts only from selected network" +msgstr "" + +#: ../../include/features.php:41 +msgid "Save search terms for re-use" +msgstr "" + +#: ../../include/features.php:46 +msgid "Network Tabs" +msgstr "" + +#: ../../include/features.php:47 +msgid "Network Personal Tab" +msgstr "" + +#: ../../include/features.php:47 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "" + +#: ../../include/features.php:48 +msgid "Network New Tab" +msgstr "" + +#: ../../include/features.php:48 +msgid "Enable tab to display only new Network posts (from the last 12 hours)" +msgstr "" + +#: ../../include/features.php:49 +msgid "Network Shared Links Tab" +msgstr "" + +#: ../../include/features.php:49 +msgid "Enable tab to display only Network posts with links in them" +msgstr "" + +#: ../../include/features.php:54 +msgid "Post/Comment Tools" +msgstr "" + +#: ../../include/features.php:55 +msgid "Multiple Deletion" +msgstr "" + +#: ../../include/features.php:55 +msgid "Select and delete multiple posts/comments at once" +msgstr "" + +#: ../../include/features.php:56 +msgid "Edit Sent Posts" +msgstr "" + +#: ../../include/features.php:56 +msgid "Edit and correct posts and comments after sending" +msgstr "" + +#: ../../include/features.php:57 +msgid "Tagging" +msgstr "" + +#: ../../include/features.php:57 +msgid "Ability to tag existing posts" +msgstr "" + +#: ../../include/features.php:58 +msgid "Post Categories" +msgstr "" + +#: ../../include/features.php:58 +msgid "Add categories to your posts" +msgstr "" + +#: ../../include/features.php:59 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:60 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:60 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:61 +msgid "Star Posts" +msgstr "" + +#: ../../include/features.php:61 +msgid "Ability to mark special posts with a star indicator" +msgstr "" + #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/message.php:15 ../../include/message.php:171 +#: ../../include/message.php:15 ../../include/message.php:172 msgid "[no subject]" msgstr "" @@ -9027,15 +9235,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:3357 +#: ../../include/items.php:3363 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:3357 +#: ../../include/items.php:3363 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:4038 +#: ../../include/items.php:4047 msgid "Archives" msgstr "" @@ -9174,11 +9382,11 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:599 ../../object/Item.php:220 +#: ../../include/conversation.php:599 ../../object/Item.php:225 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:600 ../../object/Item.php:221 +#: ../../include/conversation.php:600 ../../object/Item.php:226 msgid "Filed under:" msgstr "" @@ -9233,31 +9441,31 @@ msgstr "" msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:901 ../../include/conversation.php:919 +#: ../../include/conversation.php:904 ../../include/conversation.php:922 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:903 ../../include/conversation.php:921 +#: ../../include/conversation.php:906 ../../include/conversation.php:924 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:904 ../../include/conversation.php:922 +#: ../../include/conversation.php:907 ../../include/conversation.php:925 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:905 ../../include/conversation.php:923 +#: ../../include/conversation.php:908 ../../include/conversation.php:926 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:907 ../../include/conversation.php:925 +#: ../../include/conversation.php:910 ../../include/conversation.php:928 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:908 +#: ../../include/conversation.php:911 msgid "Delete item(s)?" msgstr "" -#: ../../include/conversation.php:987 +#: ../../include/conversation.php:990 msgid "permissions" msgstr "" @@ -9273,108 +9481,116 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:604 +#: ../../boot.php:607 msgid "Delete this item?" msgstr "" -#: ../../boot.php:607 +#: ../../boot.php:610 msgid "show fewer" msgstr "" -#: ../../boot.php:816 +#: ../../boot.php:819 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:818 +#: ../../boot.php:821 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:919 +#: ../../boot.php:922 msgid "Create a New Account" msgstr "" -#: ../../boot.php:948 +#: ../../boot.php:951 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:949 +#: ../../boot.php:952 msgid "Password: " msgstr "" -#: ../../boot.php:950 +#: ../../boot.php:953 msgid "Remember me" msgstr "" -#: ../../boot.php:953 +#: ../../boot.php:956 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:959 +#: ../../boot.php:962 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1084 +#: ../../boot.php:1087 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1161 +#: ../../boot.php:1164 msgid "Edit profile" msgstr "" -#: ../../boot.php:1227 +#: ../../boot.php:1230 msgid "Message" msgstr "" -#: ../../boot.php:1349 ../../boot.php:1435 +#: ../../boot.php:1238 +msgid "Manage/edit profiles" +msgstr "" + +#: ../../boot.php:1352 ../../boot.php:1438 msgid "g A l F d" msgstr "" -#: ../../boot.php:1350 ../../boot.php:1436 +#: ../../boot.php:1353 ../../boot.php:1439 msgid "F d" msgstr "" -#: ../../boot.php:1395 ../../boot.php:1476 +#: ../../boot.php:1398 ../../boot.php:1479 msgid "[today]" msgstr "" -#: ../../boot.php:1407 +#: ../../boot.php:1410 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1408 +#: ../../boot.php:1411 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1469 +#: ../../boot.php:1472 msgid "[No description]" msgstr "" -#: ../../boot.php:1487 +#: ../../boot.php:1490 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1488 +#: ../../boot.php:1491 msgid "Events this week:" msgstr "" -#: ../../boot.php:1724 +#: ../../boot.php:1727 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1731 +#: ../../boot.php:1734 msgid "Profile Details" msgstr "" -#: ../../boot.php:1748 +#: ../../boot.php:1751 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1755 +#: ../../boot.php:1758 msgid "Only You Can See This" msgstr "" +#: ../../object/Item.php:237 +msgid "via" +msgstr "" + #: ../../index.php:398 msgid "toggle mobile" msgstr "" diff --git a/view/admin_site.tpl b/view/admin_site.tpl index ceba97d3f1..11122cb474 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -53,7 +53,7 @@

$registration

{{ inc field_input.tpl with $field=$register_text }}{{ endinc }} {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }} - + {{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }} {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }} diff --git a/view/de/messages.po b/view/de/messages.po index f1c4fa7a06..2479dc67a1 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-11-14 10:00-0800\n" -"PO-Revision-Date: 2012-11-16 08:50+0000\n" +"POT-Creation-Date: 2012-11-28 10:00-0800\n" +"PO-Revision-Date: 2012-11-30 08:09+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -54,9 +54,9 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:146 -#: ../../mod/settings.php:86 ../../mod/settings.php:525 -#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:147 +#: ../../mod/settings.php:91 ../../mod/settings.php:541 +#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -65,7 +65,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 -#: ../../mod/message.php:38 ../../mod/message.php:168 +#: ../../mod/message.php:38 ../../mod/message.php:172 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 #: ../../mod/display.php:165 ../../mod/profiles.php:7 @@ -74,7 +74,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -107,8 +107,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, w msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" -#: ../../mod/crepair.php:148 ../../mod/settings.php:545 -#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702 +#: ../../mod/crepair.php:148 ../../mod/settings.php:561 +#: ../../mod/settings.php:587 ../../mod/admin.php:692 ../../mod/admin.php:702 msgid "Name" msgstr "Name" @@ -146,18 +146,18 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:455 ../../mod/photos.php:1028 -#: ../../mod/photos.php:1104 ../../mod/photos.php:1367 -#: ../../mod/photos.php:1407 ../../mod/photos.php:1451 -#: ../../mod/photos.php:1523 ../../mod/install.php:246 +#: ../../mod/photos.php:1100 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 +#: ../../mod/photos.php:1519 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:351 -#: ../../mod/settings.php:543 ../../mod/settings.php:697 -#: ../../mod/settings.php:769 ../../mod/settings.php:976 -#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 -#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689 -#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112 -#: ../../mod/profiles.php:594 ../../mod/invite.php:119 -#: ../../addon/fromgplus/fromgplus.php:40 +#: ../../mod/content.php:693 ../../mod/contacts.php:352 +#: ../../mod/settings.php:559 ../../mod/settings.php:669 +#: ../../mod/settings.php:738 ../../mod/settings.php:810 +#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137 +#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:443 +#: ../../mod/admin.php:689 ../../mod/admin.php:826 ../../mod/admin.php:1025 +#: ../../mod/admin.php:1112 ../../mod/profiles.php:597 +#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 @@ -186,18 +186,18 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:685 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:599 +#: ../../view/theme/diabook/theme.php:600 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:562 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:570 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -297,12 +297,12 @@ msgstr "l, F j" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:323 ../../include/text.php:1192 +#: ../../mod/events.php:323 ../../include/text.php:1190 msgid "link to source" msgstr "Link zum Originalbeitrag" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:52 ../../boot.php:1745 +#: ../../include/nav.php:52 ../../boot.php:1748 msgid "Events" msgstr "Veranstaltungen" @@ -359,8 +359,9 @@ msgid "Description:" msgstr "Beschreibung" #: ../../mod/events.php:448 ../../mod/directory.php:134 +#: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1275 +#: ../../boot.php:1278 msgid "Location:" msgstr "Ort:" @@ -372,10 +373,10 @@ msgstr "Titel:" msgid "Share this event" msgstr "Veranstaltung teilen" -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 -#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 -#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1005 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145 +#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560 +#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45 +#: ../../include/conversation.php:1009 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -422,43 +423,43 @@ msgid "" 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:835 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:237 -#: ../../mod/profiles.php:574 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:237 +#: ../../mod/profiles.php:577 msgid "Yes" msgstr "Ja" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:238 -#: ../../mod/profiles.php:575 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:238 +#: ../../mod/profiles.php:578 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:51 ../../boot.php:1738 +#: ../../mod/photos.php:51 ../../boot.php:1741 msgid "Photo Albums" msgstr "Fotoalben" #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 -#: ../../mod/photos.php:1096 ../../mod/photos.php:1111 -#: ../../mod/photos.php:1566 ../../mod/photos.php:1578 +#: ../../mod/photos.php:1092 ../../mod/photos.php:1107 +#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:485 +#: ../../view/theme/diabook/theme.php:486 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616 +#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" @@ -470,13 +471,13 @@ msgstr "jeder" msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" -#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096 -#: ../../mod/photos.php:1111 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092 +#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:487 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -486,11 +487,11 @@ msgstr "Profilbilder" msgid "Album not found." msgstr "Album nicht gefunden." -#: ../../mod/photos.php:182 ../../mod/photos.php:1105 +#: ../../mod/photos.php:182 ../../mod/photos.php:1101 msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:245 ../../mod/photos.php:1368 +#: ../../mod/photos.php:245 ../../mod/photos.php:1364 msgid "Delete Photo" msgstr "Foto löschen" @@ -503,7 +504,7 @@ msgstr "%1$s wurde von %3$s in %2$s getaggt" msgid "a photo" msgstr "einem Foto" -#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321 #: ../../addon.old/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "Die Bildgröße übersteigt das Limit von " @@ -524,7 +525,8 @@ msgstr "Hochladen des Bildes gescheitert." #: ../../mod/photos.php:865 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31 +#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31 +#: ../../addon/forumdirectory/forumdirectory.php:53 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." @@ -536,167 +538,162 @@ msgstr "Keine Bilder ausgewählt" msgid "Access to this item is restricted." msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt." -#: ../../mod/photos.php:1038 +#: ../../mod/photos.php:1037 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers." -#: ../../mod/photos.php:1041 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "Du verwendest %1$.2f Mbyte des Foto-Speichers." - -#: ../../mod/photos.php:1047 +#: ../../mod/photos.php:1043 msgid "Upload Photos" msgstr "Bilder hochladen" -#: ../../mod/photos.php:1051 ../../mod/photos.php:1100 +#: ../../mod/photos.php:1047 ../../mod/photos.php:1096 msgid "New album name: " msgstr "Name des neuen Albums: " -#: ../../mod/photos.php:1052 +#: ../../mod/photos.php:1048 msgid "or existing album name: " msgstr "oder existierender Albumname: " -#: ../../mod/photos.php:1053 +#: ../../mod/photos.php:1049 msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:1055 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1051 ../../mod/photos.php:1359 msgid "Permissions" msgstr "Berechtigungen" -#: ../../mod/photos.php:1115 +#: ../../mod/photos.php:1111 msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:1121 +#: ../../mod/photos.php:1117 msgid "Show Newest First" msgstr "Zeige neueste zuerst" -#: ../../mod/photos.php:1123 +#: ../../mod/photos.php:1119 msgid "Show Oldest First" msgstr "Zeige älteste zuerst" -#: ../../mod/photos.php:1147 ../../mod/photos.php:1599 +#: ../../mod/photos.php:1143 ../../mod/photos.php:1595 msgid "View Photo" msgstr "Fotos betrachten" -#: ../../mod/photos.php:1182 +#: ../../mod/photos.php:1178 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:1184 +#: ../../mod/photos.php:1180 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1236 msgid "View photo" msgstr "Fotos ansehen" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1236 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1241 +#: ../../mod/photos.php:1237 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1247 ../../mod/content.php:603 +#: ../../mod/photos.php:1243 ../../mod/content.php:603 #: ../../object/Item.php:104 msgid "Private Message" msgstr "Private Nachricht" -#: ../../mod/photos.php:1266 +#: ../../mod/photos.php:1262 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1340 +#: ../../mod/photos.php:1336 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1343 +#: ../../mod/photos.php:1339 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1353 +#: ../../mod/photos.php:1349 msgid "Rotate CW (right)" msgstr "Drehen US (rechts)" -#: ../../mod/photos.php:1354 +#: ../../mod/photos.php:1350 msgid "Rotate CCW (left)" msgstr "Drehen EUS (links)" -#: ../../mod/photos.php:1356 +#: ../../mod/photos.php:1352 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1359 +#: ../../mod/photos.php:1355 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1361 +#: ../../mod/photos.php:1357 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1365 +#: ../../mod/photos.php:1361 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1385 ../../mod/content.php:667 -#: ../../object/Item.php:197 +#: ../../mod/photos.php:1381 ../../mod/content.php:667 +#: ../../object/Item.php:202 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1386 ../../mod/content.php:668 -#: ../../object/Item.php:198 +#: ../../mod/photos.php:1382 ../../mod/content.php:668 +#: ../../object/Item.php:203 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1387 ../../include/conversation.php:966 +#: ../../mod/photos.php:1383 ../../include/conversation.php:969 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1388 ../../mod/editpost.php:118 +#: ../../mod/photos.php:1384 ../../mod/editpost.php:121 #: ../../mod/content.php:482 ../../mod/content.php:848 -#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:624 -#: ../../include/conversation.php:985 ../../object/Item.php:261 +#: ../../mod/wallmessage.php:152 ../../mod/message.php:300 +#: ../../mod/message.php:488 ../../include/conversation.php:624 +#: ../../include/conversation.php:988 ../../object/Item.php:269 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 -#: ../../mod/photos.php:1520 ../../mod/content.php:690 -#: ../../object/Item.php:559 +#: ../../mod/photos.php:1400 ../../mod/photos.php:1444 +#: ../../mod/photos.php:1516 ../../mod/content.php:690 +#: ../../object/Item.php:567 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1406 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:605 -#: ../../object/Item.php:561 +#: ../../mod/photos.php:1402 ../../mod/photos.php:1446 +#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608 +#: ../../object/Item.php:266 ../../object/Item.php:569 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1408 ../../mod/photos.php:1452 -#: ../../mod/photos.php:1524 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:1003 -#: ../../object/Item.php:571 +#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 +#: ../../mod/photos.php:1520 ../../mod/editpost.php:142 +#: ../../mod/content.php:702 ../../include/conversation.php:1006 +#: ../../object/Item.php:579 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1492 ../../mod/content.php:439 -#: ../../mod/content.php:724 ../../mod/settings.php:606 +#: ../../mod/photos.php:1488 ../../mod/content.php:439 +#: ../../mod/content.php:724 ../../mod/settings.php:622 #: ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../include/conversation.php:569 ../../object/Item.php:118 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1605 +#: ../../mod/photos.php:1601 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1614 +#: ../../mod/photos.php:1610 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -710,7 +707,7 @@ msgid "Community" msgstr "Gemeinschaft" #: ../../mod/community.php:61 ../../mod/community.php:86 -#: ../../mod/search.php:159 ../../mod/search.php:185 +#: ../../mod/search.php:162 ../../mod/search.php:188 msgid "No results." msgstr "Keine Ergebnisse." @@ -750,100 +747,100 @@ msgstr "Keine Plugins/Erweiterungen/Apps installiert" msgid "Item not found" msgstr "Beitrag nicht gefunden" -#: ../../mod/editpost.php:36 +#: ../../mod/editpost.php:39 msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:88 ../../include/conversation.php:952 +#: ../../mod/editpost.php:91 ../../include/conversation.php:955 msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:103 ../../mod/content.php:711 -#: ../../mod/settings.php:605 ../../object/Item.php:108 +#: ../../mod/editpost.php:106 ../../mod/content.php:711 +#: ../../mod/settings.php:621 ../../object/Item.php:108 msgid "Edit" msgstr "Bearbeiten" -#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 -#: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:967 +#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150 +#: ../../mod/message.php:298 ../../mod/message.php:485 +#: ../../include/conversation.php:970 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:105 ../../include/conversation.php:968 +#: ../../mod/editpost.php:108 ../../include/conversation.php:971 msgid "upload photo" msgstr "Bild hochladen" -#: ../../mod/editpost.php:106 ../../include/conversation.php:969 +#: ../../mod/editpost.php:109 ../../include/conversation.php:972 msgid "Attach file" msgstr "Datei anhängen" -#: ../../mod/editpost.php:107 ../../include/conversation.php:970 +#: ../../mod/editpost.php:110 ../../include/conversation.php:973 msgid "attach file" msgstr "Datei anhängen" -#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 -#: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:971 +#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151 +#: ../../mod/message.php:299 ../../mod/message.php:486 +#: ../../include/conversation.php:974 msgid "Insert web link" msgstr "einen Link einfügen" -#: ../../mod/editpost.php:109 ../../include/conversation.php:972 +#: ../../mod/editpost.php:112 ../../include/conversation.php:975 msgid "web link" msgstr "Weblink" -#: ../../mod/editpost.php:110 ../../include/conversation.php:973 +#: ../../mod/editpost.php:113 ../../include/conversation.php:976 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../mod/editpost.php:111 ../../include/conversation.php:974 +#: ../../mod/editpost.php:114 ../../include/conversation.php:977 msgid "video link" msgstr "Video-Link" -#: ../../mod/editpost.php:112 ../../include/conversation.php:975 +#: ../../mod/editpost.php:115 ../../include/conversation.php:978 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../mod/editpost.php:113 ../../include/conversation.php:976 +#: ../../mod/editpost.php:116 ../../include/conversation.php:979 msgid "audio link" msgstr "Audio-Link" -#: ../../mod/editpost.php:114 ../../include/conversation.php:977 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:115 ../../include/conversation.php:978 +#: ../../mod/editpost.php:118 ../../include/conversation.php:981 msgid "set location" msgstr "Ort setzen" -#: ../../mod/editpost.php:116 ../../include/conversation.php:979 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:117 ../../include/conversation.php:980 +#: ../../mod/editpost.php:120 ../../include/conversation.php:983 msgid "clear location" msgstr "Ort löschen" -#: ../../mod/editpost.php:119 ../../include/conversation.php:986 +#: ../../mod/editpost.php:122 ../../include/conversation.php:989 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:127 ../../include/conversation.php:995 +#: ../../mod/editpost.php:130 ../../include/conversation.php:998 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:128 ../../include/conversation.php:996 +#: ../../mod/editpost.php:131 ../../include/conversation.php:999 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:131 ../../include/conversation.php:982 +#: ../../mod/editpost.php:134 ../../include/conversation.php:985 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:133 ../../include/conversation.php:984 +#: ../../mod/editpost.php:136 ../../include/conversation.php:987 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:998 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1001 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -928,7 +925,7 @@ msgstr "Ungültige Profil-URL." msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123 +#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." @@ -964,7 +961,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s." msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" @@ -1016,7 +1013,7 @@ msgstr "Friendica" msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640 +#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" @@ -1036,39 +1033,39 @@ msgstr "Adresse deines Profils:" msgid "Submit Request" msgstr "Anfrage abschicken" -#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137 +#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138 msgid "Account settings" msgstr "Kontoeinstellungen" -#: ../../mod/uexport.php:14 ../../mod/settings.php:35 +#: ../../mod/uexport.php:14 ../../mod/settings.php:40 msgid "Display settings" msgstr "Anzeige-Einstellungen" -#: ../../mod/uexport.php:20 ../../mod/settings.php:41 +#: ../../mod/uexport.php:20 ../../mod/settings.php:46 msgid "Connector settings" msgstr "Connector-Einstellungen" -#: ../../mod/uexport.php:25 ../../mod/settings.php:46 +#: ../../mod/uexport.php:25 ../../mod/settings.php:51 msgid "Plugin settings" msgstr "Plugin-Einstellungen" -#: ../../mod/uexport.php:30 ../../mod/settings.php:51 +#: ../../mod/uexport.php:30 ../../mod/settings.php:56 msgid "Connected apps" msgstr "Verbundene Programme" -#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56 +#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61 msgid "Export personal data" msgstr "Persönliche Daten exportieren" -#: ../../mod/uexport.php:40 ../../mod/settings.php:61 +#: ../../mod/uexport.php:40 ../../mod/settings.php:66 msgid "Remove account" msgstr "Konto löschen" -#: ../../mod/uexport.php:48 ../../mod/settings.php:69 +#: ../../mod/uexport.php:48 ../../mod/settings.php:74 #: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 -#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:615 +#: ../../include/nav.php:138 ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Einstellungen" @@ -1415,7 +1412,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1213 +#: ../../include/contact_widgets.php:9 ../../boot.php:1216 msgid "Connect" msgstr "Verbinden" @@ -1432,15 +1429,15 @@ msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar." msgid "Visible to:" msgstr "Sichtbar für:" -#: ../../mod/content.php:119 ../../mod/network.php:544 +#: ../../mod/content.php:119 ../../mod/network.php:594 msgid "No such group" msgstr "Es gibt keine solche Gruppe" -#: ../../mod/content.php:130 ../../mod/network.php:555 +#: ../../mod/content.php:130 ../../mod/network.php:605 msgid "Group is empty" msgstr "Gruppe ist leer" -#: ../../mod/content.php:134 ../../mod/network.php:559 +#: ../../mod/content.php:134 ../../mod/network.php:609 msgid "Group: " msgstr "Gruppe: " @@ -1451,13 +1448,13 @@ msgstr "Auswählen" #: ../../mod/content.php:455 ../../mod/content.php:817 #: ../../mod/content.php:818 ../../include/conversation.php:587 -#: ../../object/Item.php:229 ../../object/Item.php:230 +#: ../../object/Item.php:234 ../../object/Item.php:235 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." #: ../../mod/content.php:465 ../../mod/content.php:829 -#: ../../include/conversation.php:607 ../../object/Item.php:242 +#: ../../include/conversation.php:607 ../../object/Item.php:248 #, php-format msgid "%s from %s" msgstr "%s von %s" @@ -1466,15 +1463,15 @@ msgstr "%s von %s" msgid "View in context" msgstr "Im Zusammenhang betrachten" -#: ../../mod/content.php:586 ../../object/Item.php:280 +#: ../../mod/content.php:586 ../../object/Item.php:288 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d Kommentar" msgstr[1] "%d Kommentare" -#: ../../mod/content.php:588 ../../include/text.php:1448 -#: ../../object/Item.php:282 ../../object/Item.php:295 +#: ../../mod/content.php:588 ../../include/text.php:1446 +#: ../../object/Item.php:290 ../../object/Item.php:303 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1482,57 +1479,57 @@ msgstr[1] "Kommentar" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:606 -#: ../../object/Item.php:283 ../../addon.old/page/page.php:77 +#: ../../include/contact_widgets.php:204 ../../boot.php:609 +#: ../../object/Item.php:291 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "mehr anzeigen" -#: ../../mod/content.php:667 ../../object/Item.php:197 +#: ../../mod/content.php:667 ../../object/Item.php:202 msgid "like" msgstr "mag ich" -#: ../../mod/content.php:668 ../../object/Item.php:198 +#: ../../mod/content.php:668 ../../object/Item.php:203 msgid "dislike" msgstr "mag ich nicht" -#: ../../mod/content.php:670 ../../object/Item.php:200 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "Share this" msgstr "Weitersagen" -#: ../../mod/content.php:670 ../../object/Item.php:200 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "share" msgstr "Teilen" -#: ../../mod/content.php:694 ../../object/Item.php:563 +#: ../../mod/content.php:694 ../../object/Item.php:571 msgid "Bold" msgstr "Fett" -#: ../../mod/content.php:695 ../../object/Item.php:564 +#: ../../mod/content.php:695 ../../object/Item.php:572 msgid "Italic" msgstr "Kursiv" -#: ../../mod/content.php:696 ../../object/Item.php:565 +#: ../../mod/content.php:696 ../../object/Item.php:573 msgid "Underline" msgstr "Unterstrichen" -#: ../../mod/content.php:697 ../../object/Item.php:566 +#: ../../mod/content.php:697 ../../object/Item.php:574 msgid "Quote" msgstr "Zitat" -#: ../../mod/content.php:698 ../../object/Item.php:567 +#: ../../mod/content.php:698 ../../object/Item.php:575 msgid "Code" msgstr "Code" -#: ../../mod/content.php:699 ../../object/Item.php:568 +#: ../../mod/content.php:699 ../../object/Item.php:576 msgid "Image" msgstr "Bild" -#: ../../mod/content.php:700 ../../object/Item.php:569 +#: ../../mod/content.php:700 ../../object/Item.php:577 msgid "Link" msgstr "Verweis" -#: ../../mod/content.php:701 ../../object/Item.php:570 +#: ../../mod/content.php:701 ../../object/Item.php:578 msgid "Video" msgstr "Video" @@ -1552,7 +1549,7 @@ msgstr "Markierung umschalten" msgid "starred" msgstr "markiert" -#: ../../mod/content.php:742 ../../object/Item.php:187 +#: ../../mod/content.php:742 ../../object/Item.php:191 msgid "add tag" msgstr "Tag hinzufügen" @@ -1560,15 +1557,15 @@ msgstr "Tag hinzufügen" msgid "save to folder" msgstr "In Ordner speichern" -#: ../../mod/content.php:819 ../../object/Item.php:231 +#: ../../mod/content.php:819 ../../object/Item.php:236 msgid "to" msgstr "zu" -#: ../../mod/content.php:820 ../../object/Item.php:232 +#: ../../mod/content.php:820 ../../object/Item.php:238 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: ../../mod/content.php:821 ../../object/Item.php:233 +#: ../../mod/content.php:821 ../../object/Item.php:239 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" @@ -1588,8 +1585,8 @@ msgid "Discard" msgstr "Verwerfen" #: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:324 -#: ../../mod/contacts.php:378 +#: ../../mod/notifications.php:209 ../../mod/contacts.php:325 +#: ../../mod/contacts.php:379 msgid "Ignore" msgstr "Ignorieren" @@ -1601,21 +1598,21 @@ msgstr "System" msgid "Network" msgstr "Netzwerk" -#: ../../mod/notifications.php:88 ../../mod/network.php:407 +#: ../../mod/notifications.php:88 ../../mod/network.php:444 msgid "Personal" msgstr "Persönlich" #: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 -#: ../../include/nav.php:77 ../../include/nav.php:115 +#: ../../include/nav.php:77 ../../include/nav.php:116 msgid "Home" msgstr "Pinnwand" -#: ../../mod/notifications.php:98 ../../include/nav.php:121 +#: ../../mod/notifications.php:98 ../../include/nav.php:122 msgid "Introductions" msgstr "Kontaktanfragen" -#: ../../mod/notifications.php:103 ../../mod/message.php:176 -#: ../../include/nav.php:128 +#: ../../mod/notifications.php:103 ../../mod/message.php:180 +#: ../../include/nav.php:129 msgid "Messages" msgstr "Nachrichten" @@ -1641,7 +1638,7 @@ msgid "suggested by %s" msgstr "vorgeschlagen von %s" #: ../../mod/notifications.php:156 ../../mod/notifications.php:203 -#: ../../mod/contacts.php:384 +#: ../../mod/contacts.php:385 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" @@ -1698,7 +1695,7 @@ msgstr "Neuer Bewunderer" msgid "No introductions." msgstr "Keine Kontaktanfragen." -#: ../../mod/notifications.php:219 ../../include/nav.php:122 +#: ../../mod/notifications.php:219 ../../include/nav.php:123 msgid "Notifications" msgstr "Benachrichtigungen" @@ -1763,307 +1760,309 @@ msgstr "Keine weiteren Pinnwand-Benachrichtigungen" msgid "Home Notifications" msgstr "Pinnwand Benachrichtigungen" -#: ../../mod/contacts.php:84 ../../mod/contacts.php:164 +#: ../../mod/contacts.php:85 ../../mod/contacts.php:165 msgid "Could not access contact record." msgstr "Konnte nicht auf die Kontaktdaten zugreifen." -#: ../../mod/contacts.php:98 +#: ../../mod/contacts.php:99 msgid "Could not locate selected profile." msgstr "Konnte das ausgewählte Profil nicht finden." -#: ../../mod/contacts.php:121 +#: ../../mod/contacts.php:122 msgid "Contact updated." msgstr "Kontakt aktualisiert." -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been blocked" msgstr "Kontakt wurde blockiert" -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been unblocked" msgstr "Kontakt wurde wieder freigegeben" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been ignored" msgstr "Kontakt wurde ignoriert" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been unignored" msgstr "Kontakt wird nicht mehr ignoriert" -#: ../../mod/contacts.php:219 +#: ../../mod/contacts.php:220 msgid "Contact has been archived" msgstr "Kontakt wurde archiviert" -#: ../../mod/contacts.php:219 +#: ../../mod/contacts.php:220 msgid "Contact has been unarchived" msgstr "Kontakt wurde aus dem Archiv geholt" -#: ../../mod/contacts.php:232 +#: ../../mod/contacts.php:233 msgid "Contact has been removed." msgstr "Kontakt wurde entfernt." -#: ../../mod/contacts.php:266 +#: ../../mod/contacts.php:267 #, php-format msgid "You are mutual friends with %s" msgstr "Du hast mit %s eine beidseitige Freundschaft" -#: ../../mod/contacts.php:270 +#: ../../mod/contacts.php:271 #, php-format msgid "You are sharing with %s" msgstr "Du teilst mit %s" -#: ../../mod/contacts.php:275 +#: ../../mod/contacts.php:276 #, php-format msgid "%s is sharing with you" msgstr "%s teilt mit Dir" -#: ../../mod/contacts.php:292 +#: ../../mod/contacts.php:293 msgid "Private communications are not available for this contact." msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." -#: ../../mod/contacts.php:295 +#: ../../mod/contacts.php:296 msgid "Never" msgstr "Niemals" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:300 msgid "(Update was successful)" msgstr "(Aktualisierung war erfolgreich)" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:300 msgid "(Update was not successful)" msgstr "(Aktualisierung war nicht erfolgreich)" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:302 msgid "Suggest friends" msgstr "Kontakte vorschlagen" -#: ../../mod/contacts.php:305 +#: ../../mod/contacts.php:306 #, php-format msgid "Network type: %s" msgstr "Netzwerktyp: %s" -#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190 +#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "%d gemeinsamer Kontakt" msgstr[1] "%d gemeinsame Kontakte" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:314 msgid "View all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 #: ../../mod/admin.php:698 msgid "Unblock" msgstr "Entsperren" -#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 #: ../../mod/admin.php:697 msgid "Block" msgstr "Sperren" -#: ../../mod/contacts.php:321 +#: ../../mod/contacts.php:322 msgid "Toggle Blocked status" msgstr "Geblockt-Status ein-/ausschalten" -#: ../../mod/contacts.php:324 ../../mod/contacts.php:378 +#: ../../mod/contacts.php:325 ../../mod/contacts.php:379 msgid "Unignore" msgstr "Ignorieren aufheben" -#: ../../mod/contacts.php:327 +#: ../../mod/contacts.php:328 msgid "Toggle Ignored status" msgstr "Ignoriert-Status ein-/ausschalten" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:332 msgid "Unarchive" msgstr "Aus Archiv zurückholen" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:332 msgid "Archive" msgstr "Archivieren" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:335 msgid "Toggle Archive status" msgstr "Archiviert-Status ein-/ausschalten" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:338 msgid "Repair" msgstr "Reparieren" -#: ../../mod/contacts.php:340 +#: ../../mod/contacts.php:341 msgid "Advanced Contact Settings" msgstr "Fortgeschrittene Kontakteinstellungen" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:347 msgid "Communications lost with this contact!" msgstr "Verbindungen mit diesem Kontakt verloren!" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:350 msgid "Contact Editor" msgstr "Kontakt Editor" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:353 msgid "Profile Visibility" msgstr "Profil-Sichtbarkeit" -#: ../../mod/contacts.php:353 +#: ../../mod/contacts.php:354 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft." -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:355 msgid "Contact Information / Notes" msgstr "Kontakt Informationen / Notizen" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:356 msgid "Edit contact notes" msgstr "Notizen zum Kontakt bearbeiten" -#: ../../mod/contacts.php:360 ../../mod/contacts.php:552 +#: ../../mod/contacts.php:361 ../../mod/contacts.php:553 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:362 msgid "Block/Unblock contact" msgstr "Kontakt blockieren/freischalten" -#: ../../mod/contacts.php:362 +#: ../../mod/contacts.php:363 msgid "Ignore contact" msgstr "Ignoriere den Kontakt" -#: ../../mod/contacts.php:363 +#: ../../mod/contacts.php:364 msgid "Repair URL settings" msgstr "URL Einstellungen reparieren" -#: ../../mod/contacts.php:364 +#: ../../mod/contacts.php:365 msgid "View conversations" msgstr "Unterhaltungen anzeigen" -#: ../../mod/contacts.php:366 +#: ../../mod/contacts.php:367 msgid "Delete contact" msgstr "Lösche den Kontakt" -#: ../../mod/contacts.php:370 +#: ../../mod/contacts.php:371 msgid "Last update:" msgstr "letzte Aktualisierung:" -#: ../../mod/contacts.php:372 +#: ../../mod/contacts.php:373 msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:374 ../../mod/admin.php:1170 +#: ../../mod/contacts.php:375 ../../mod/admin.php:1170 msgid "Update now" msgstr "Jetzt aktualisieren" -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:382 msgid "Currently blocked" msgstr "Derzeit geblockt" -#: ../../mod/contacts.php:382 +#: ../../mod/contacts.php:383 msgid "Currently ignored" msgstr "Derzeit ignoriert" -#: ../../mod/contacts.php:383 +#: ../../mod/contacts.php:384 msgid "Currently archived" msgstr "Momentan archiviert" -#: ../../mod/contacts.php:384 +#: ../../mod/contacts.php:385 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:438 msgid "Suggestions" msgstr "Kontaktvorschläge" -#: ../../mod/contacts.php:440 +#: ../../mod/contacts.php:441 msgid "Suggest potential friends" msgstr "Freunde vorschlagen" -#: ../../mod/contacts.php:443 ../../mod/group.php:191 +#: ../../mod/contacts.php:444 ../../mod/group.php:191 msgid "All Contacts" msgstr "Alle Kontakte" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:447 msgid "Show all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:449 +#: ../../mod/contacts.php:450 msgid "Unblocked" msgstr "Ungeblockt" -#: ../../mod/contacts.php:452 +#: ../../mod/contacts.php:453 msgid "Only show unblocked contacts" msgstr "Nur nicht-blockierte Kontakte anzeigen" -#: ../../mod/contacts.php:456 +#: ../../mod/contacts.php:457 msgid "Blocked" msgstr "Geblockt" -#: ../../mod/contacts.php:459 +#: ../../mod/contacts.php:460 msgid "Only show blocked contacts" msgstr "Nur blockierte Kontakte anzeigen" -#: ../../mod/contacts.php:463 +#: ../../mod/contacts.php:464 msgid "Ignored" msgstr "Ignoriert" -#: ../../mod/contacts.php:466 +#: ../../mod/contacts.php:467 msgid "Only show ignored contacts" msgstr "Nur ignorierte Kontakte anzeigen" -#: ../../mod/contacts.php:470 +#: ../../mod/contacts.php:471 msgid "Archived" msgstr "Archiviert" -#: ../../mod/contacts.php:473 +#: ../../mod/contacts.php:474 msgid "Only show archived contacts" msgstr "Nur archivierte Kontakte anzeigen" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:478 msgid "Hidden" msgstr "Verborgen" -#: ../../mod/contacts.php:480 +#: ../../mod/contacts.php:481 msgid "Only show hidden contacts" msgstr "Nur verborgene Kontakte anzeigen" -#: ../../mod/contacts.php:528 +#: ../../mod/contacts.php:529 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: ../../mod/contacts.php:532 +#: ../../mod/contacts.php:533 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: ../../mod/contacts.php:536 +#: ../../mod/contacts.php:537 msgid "you are a fan of" msgstr "du bist Fan von" -#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88 -#: ../../include/nav.php:139 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:88 +#: ../../include/nav.php:142 msgid "Contacts" msgstr "Kontakte" -#: ../../mod/contacts.php:578 +#: ../../mod/contacts.php:579 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: ../../mod/contacts.php:579 ../../mod/directory.php:59 +#: ../../mod/contacts.php:580 ../../mod/directory.php:59 +#: ../../addon/forumdirectory/forumdirectory.php:81 msgid "Finding: " msgstr "Funde: " -#: ../../mod/contacts.php:580 ../../mod/directory.php:61 +#: ../../mod/contacts.php:581 ../../mod/directory.php:61 +#: ../../addon/forumdirectory/forumdirectory.php:83 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Finde" @@ -2087,8 +2086,8 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359 -#: ../../boot.php:821 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 +#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2102,7 +2101,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: ../../mod/lostpass.php:83 ../../boot.php:960 +#: ../../mod/lostpass.php:83 ../../boot.php:963 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -2146,69 +2145,77 @@ msgstr "Spitzname oder E-Mail:" msgid "Reset" msgstr "Zurücksetzen" -#: ../../mod/settings.php:113 +#: ../../mod/settings.php:35 +msgid "Additional features" +msgstr "Zusätzliche Features" + +#: ../../mod/settings.php:118 msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: ../../mod/settings.php:116 ../../mod/settings.php:569 +#: ../../mod/settings.php:121 ../../mod/settings.php:585 msgid "Update" msgstr "Aktualisierungen" -#: ../../mod/settings.php:221 +#: ../../mod/settings.php:226 msgid "Failed to connect with email account using the settings provided." msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich." -#: ../../mod/settings.php:226 +#: ../../mod/settings.php:231 msgid "Email settings updated." msgstr "E-Mail Einstellungen bearbeitet." -#: ../../mod/settings.php:290 +#: ../../mod/settings.php:246 +msgid "Features updated" +msgstr "Features aktualisiert" + +#: ../../mod/settings.php:306 msgid "Passwords do not match. Password unchanged." msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." -#: ../../mod/settings.php:295 +#: ../../mod/settings.php:311 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert." -#: ../../mod/settings.php:306 +#: ../../mod/settings.php:322 msgid "Password changed." msgstr "Passwort ändern." -#: ../../mod/settings.php:308 +#: ../../mod/settings.php:324 msgid "Password update failed. Please try again." msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." -#: ../../mod/settings.php:373 +#: ../../mod/settings.php:389 msgid " Please use a shorter name." msgstr " Bitte verwende einen kürzeren Namen." -#: ../../mod/settings.php:375 +#: ../../mod/settings.php:391 msgid " Name too short." msgstr " Name ist zu kurz." -#: ../../mod/settings.php:381 +#: ../../mod/settings.php:397 msgid " Not valid email." msgstr " Keine gültige E-Mail." -#: ../../mod/settings.php:383 +#: ../../mod/settings.php:399 msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:437 +#: ../../mod/settings.php:453 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt." -#: ../../mod/settings.php:441 +#: ../../mod/settings.php:457 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte." -#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495 +#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495 #: ../../addon/fbpost/fbpost.php:144 #: ../../addon/remote_permissions/remote_permissions.php:204 #: ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:389 +#: ../../addon/twitter/twitter.php:501 #: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/fbpost/fbpost.php:144 #: ../../addon.old/impressum/impressum.php:78 @@ -2218,443 +2225,455 @@ msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gib msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:542 ../../mod/settings.php:568 -#: ../../mod/settings.php:604 +#: ../../mod/settings.php:558 ../../mod/settings.php:584 +#: ../../mod/settings.php:620 msgid "Add application" msgstr "Programm hinzufügen" -#: ../../mod/settings.php:546 ../../mod/settings.php:572 -#: ../../addon/statusnet/statusnet.php:570 +#: ../../mod/settings.php:562 ../../mod/settings.php:588 +#: ../../addon/statusnet/statusnet.php:679 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:547 ../../mod/settings.php:573 -#: ../../addon/statusnet/statusnet.php:569 +#: ../../mod/settings.php:563 ../../mod/settings.php:589 +#: ../../addon/statusnet/statusnet.php:678 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:548 ../../mod/settings.php:574 +#: ../../mod/settings.php:564 ../../mod/settings.php:590 msgid "Redirect" msgstr "Umleiten" -#: ../../mod/settings.php:549 ../../mod/settings.php:575 +#: ../../mod/settings.php:565 ../../mod/settings.php:591 msgid "Icon url" msgstr "Icon URL" -#: ../../mod/settings.php:560 +#: ../../mod/settings.php:576 msgid "You can't edit this application." msgstr "Du kannst dieses Programm nicht bearbeiten." -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:619 msgid "Connected Apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:607 +#: ../../mod/settings.php:623 msgid "Client key starts with" msgstr "Anwenderschlüssel beginnt mit" -#: ../../mod/settings.php:608 +#: ../../mod/settings.php:624 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:609 +#: ../../mod/settings.php:625 msgid "Remove authorization" msgstr "Autorisierung entziehen" -#: ../../mod/settings.php:620 +#: ../../mod/settings.php:637 msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123 #: ../../addon.old/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:659 +msgid "Off" +msgstr "Aus" + +#: ../../mod/settings.php:659 +msgid "On" +msgstr "An" + +#: ../../mod/settings.php:667 +msgid "Additional Features" +msgstr "Zusätzliche Features" + +#: ../../mod/settings.php:681 ../../mod/settings.php:682 #, 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:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:641 +#: ../../mod/settings.php:682 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:714 msgid "Email access is disabled on this site." msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:720 msgid "Connector Settings" msgstr "Verbindungs-Einstellungen" -#: ../../mod/settings.php:684 +#: ../../mod/settings.php:725 msgid "Email/Mailbox Setup" msgstr "E-Mail/Postfach-Einstellungen" -#: ../../mod/settings.php:685 +#: ../../mod/settings.php:726 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:686 +#: ../../mod/settings.php:727 msgid "Last successful email check:" msgstr "Letzter erfolgreicher E-Mail Check" -#: ../../mod/settings.php:688 +#: ../../mod/settings.php:729 msgid "IMAP server name:" msgstr "IMAP-Server-Name:" -#: ../../mod/settings.php:689 +#: ../../mod/settings.php:730 msgid "IMAP port:" msgstr "IMAP-Port:" -#: ../../mod/settings.php:690 +#: ../../mod/settings.php:731 msgid "Security:" msgstr "Sicherheit:" -#: ../../mod/settings.php:690 ../../mod/settings.php:695 +#: ../../mod/settings.php:731 ../../mod/settings.php:736 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "Keine" -#: ../../mod/settings.php:691 +#: ../../mod/settings.php:732 msgid "Email login name:" msgstr "E-Mail-Login-Name:" -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:733 msgid "Email password:" msgstr "E-Mail-Passwort:" -#: ../../mod/settings.php:693 +#: ../../mod/settings.php:734 msgid "Reply-to address:" msgstr "Reply-to Adresse:" -#: ../../mod/settings.php:694 +#: ../../mod/settings.php:735 msgid "Send public posts to all email contacts:" msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Action after import:" msgstr "Aktion nach Import:" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Mark as seen" msgstr "Als gelesen markieren" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Move to folder" msgstr "In einen Ordner verschieben" -#: ../../mod/settings.php:696 +#: ../../mod/settings.php:737 msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:727 ../../mod/admin.php:402 +#: ../../mod/settings.php:768 ../../mod/admin.php:402 msgid "No special theme for mobile devices" msgstr "Kein spezielles Theme für mobile Geräte verwenden." -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:808 msgid "Display Settings" msgstr "Anzeige-Einstellungen" -#: ../../mod/settings.php:773 ../../mod/settings.php:784 +#: ../../mod/settings.php:814 ../../mod/settings.php:825 msgid "Display Theme:" msgstr "Theme:" -#: ../../mod/settings.php:774 +#: ../../mod/settings.php:815 msgid "Mobile Theme:" msgstr "Mobiles Theme" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Update browser every xx seconds" msgstr "Browser alle xx Sekunden aktualisieren" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimal 10 Sekunden, kein Maximum" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Number of items to display per page:" msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: " -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Maximum of 100 items" msgstr "Maximal 100 Beiträge" -#: ../../mod/settings.php:777 +#: ../../mod/settings.php:818 msgid "Don't show emoticons" msgstr "Keine Smilies anzeigen" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:894 msgid "Normal Account Page" msgstr "Normales Konto" -#: ../../mod/settings.php:854 +#: ../../mod/settings.php:895 msgid "This account is a normal personal profile" msgstr "Dieses Konto ist ein normales persönliches Profil" -#: ../../mod/settings.php:857 +#: ../../mod/settings.php:898 msgid "Soapbox Page" msgstr "Marktschreier-Konto" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:899 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:861 +#: ../../mod/settings.php:902 msgid "Community Forum/Celebrity Account" msgstr "Forum/Promi-Konto" -#: ../../mod/settings.php:862 +#: ../../mod/settings.php:903 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:865 +#: ../../mod/settings.php:906 msgid "Automatic Friend Page" msgstr "Automatische Freunde Seite" -#: ../../mod/settings.php:866 +#: ../../mod/settings.php:907 msgid "Automatically approve all connection/friend requests as friends" msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert" -#: ../../mod/settings.php:869 +#: ../../mod/settings.php:910 msgid "Private Forum [Experimental]" msgstr "Privates Forum [Versuchsstadium]" -#: ../../mod/settings.php:870 +#: ../../mod/settings.php:911 msgid "Private forum - approved members only" msgstr "Privates Forum, nur für Mitglieder" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID." -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:933 msgid "Publish your default profile in your local site directory?" msgstr "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:939 msgid "Publish your default profile in the global social directory?" msgstr "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?" -#: ../../mod/settings.php:906 +#: ../../mod/settings.php:947 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" -#: ../../mod/settings.php:910 +#: ../../mod/settings.php:951 msgid "Hide your profile details from unknown viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: ../../mod/settings.php:915 +#: ../../mod/settings.php:956 msgid "Allow friends to post to your profile page?" msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?" -#: ../../mod/settings.php:921 +#: ../../mod/settings.php:962 msgid "Allow friends to tag your posts?" msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:968 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:974 msgid "Permit unknown people to send you private mail?" msgstr "Dürfen dir Unbekannte private Nachrichten schicken?" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:982 msgid "Profile is not published." msgstr "Profil ist nicht veröffentlicht." -#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248 +#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248 msgid "or" msgstr "oder" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:990 msgid "Your Identity Address is" msgstr "Die Adresse deines Profils lautet:" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 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:961 +#: ../../mod/settings.php:1002 msgid "Advanced expiration settings" msgstr "Erweiterte Verfallseinstellungen" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:1003 msgid "Advanced Expiration" msgstr "Erweitertes Verfallen" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:1004 msgid "Expire posts:" msgstr "Beiträge verfallen lassen:" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:1005 msgid "Expire personal notes:" msgstr "Persönliche Notizen verfallen lassen:" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:1006 msgid "Expire starred posts:" msgstr "Markierte Beiträge verfallen lassen:" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:1007 msgid "Expire photos:" msgstr "Fotos verfallen lassen:" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:1008 msgid "Only expire posts by others:" msgstr "Nur Beiträge anderer verfallen:" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:1015 msgid "Account Settings" msgstr "Kontoeinstellungen" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:1023 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:1024 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:1029 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Kompletter Name:" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1031 msgid "Email Address:" msgstr "E-Mail-Adresse:" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1032 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1033 msgid "Default Post Location:" msgstr "Standardstandort:" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1034 msgid "Use Browser Location:" msgstr "Standort des Browsers verwenden:" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1037 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1039 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:" -#: ../../mod/settings.php:998 ../../mod/settings.php:1017 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1058 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1040 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: ../../mod/settings.php:1000 +#: ../../mod/settings.php:1041 msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1058 msgid "Maximum private messages per day from unknown people:" msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1061 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1062 msgid "By default post a status message when:" msgstr "Standardmäßig eine Statusnachricht posten, wenn:" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1063 msgid "accepting a friend request" msgstr "– du eine Kontaktanfrage akzeptierst" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1064 msgid "joining a forum/community" msgstr "– du einem Forum/einer Gemeinschaftsseite beitrittst" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1065 msgid "making an interesting profile change" msgstr "– du eine interessante Änderung an deinem Profil durchführst" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1066 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden wenn:" -#: ../../mod/settings.php:1026 +#: ../../mod/settings.php:1067 msgid "You receive an introduction" msgstr "– du eine Kontaktanfrage erhältst" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1068 msgid "Your introductions are confirmed" msgstr "– eine deiner Kontaktanfragen akzeptiert wurde" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1069 msgid "Someone writes on your profile wall" msgstr "– jemand etwas auf deine Pinnwand schreibt" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1070 msgid "Someone writes a followup comment" msgstr "– jemand auch einen Kommentar verfasst" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1071 msgid "You receive a private message" msgstr "– du eine private Nachricht erhältst" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1072 msgid "You receive a friend suggestion" msgstr "– du eine Empfehlung erhältst" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1073 msgid "You are tagged in a post" msgstr "– du in einem Beitrag erwähnt wirst" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1074 msgid "You are poked/prodded/etc. in a post" msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1077 msgid "Advanced Account/Page Type Settings" msgstr "Erweiterte Konto-/Seitentyp-Einstellungen" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1078 msgid "Change the behaviour of this account for special situations" msgstr "Verhalten dieses Kontos in bestimmten Situationen:" @@ -2676,63 +2695,64 @@ msgstr "Wähle eine Identität zum Verwalten: " msgid "Search Results For:" msgstr "Suchergebnisse für:" -#: ../../mod/network.php:221 ../../mod/search.php:18 +#: ../../mod/network.php:224 ../../mod/search.php:21 msgid "Remove term" msgstr "Begriff entfernen" -#: ../../mod/network.php:230 ../../mod/search.php:27 +#: ../../mod/network.php:233 ../../mod/search.php:30 +#: ../../include/features.php:41 msgid "Saved Searches" msgstr "Gespeicherte Suchen" -#: ../../mod/network.php:231 ../../include/group.php:275 +#: ../../mod/network.php:234 ../../include/group.php:275 msgid "add" msgstr "hinzufügen" -#: ../../mod/network.php:394 +#: ../../mod/network.php:397 msgid "Commented Order" msgstr "Neueste Kommentare" -#: ../../mod/network.php:397 +#: ../../mod/network.php:400 msgid "Sort by Comment Date" msgstr "Nach Kommentardatum sortieren" -#: ../../mod/network.php:400 +#: ../../mod/network.php:403 msgid "Posted Order" msgstr "Neueste Beiträge" -#: ../../mod/network.php:403 +#: ../../mod/network.php:406 msgid "Sort by Post Date" msgstr "Nach Beitragsdatum sortieren" -#: ../../mod/network.php:410 +#: ../../mod/network.php:447 msgid "Posts that mention or involve you" msgstr "Beiträge, in denen es um dich geht" -#: ../../mod/network.php:413 +#: ../../mod/network.php:453 msgid "New" msgstr "Neue" -#: ../../mod/network.php:416 +#: ../../mod/network.php:456 msgid "Activity Stream - by date" msgstr "Aktivitäten-Stream - nach Datum" -#: ../../mod/network.php:419 -msgid "Starred" -msgstr "Markierte" - -#: ../../mod/network.php:422 -msgid "Favourite Posts" -msgstr "Favorisierte Beiträge" - -#: ../../mod/network.php:425 +#: ../../mod/network.php:462 msgid "Shared Links" msgstr "Geteilte Links" -#: ../../mod/network.php:428 +#: ../../mod/network.php:465 msgid "Interesting Links" msgstr "Interessante Links" -#: ../../mod/network.php:496 +#: ../../mod/network.php:471 +msgid "Starred" +msgstr "Markierte" + +#: ../../mod/network.php:474 +msgid "Favourite Posts" +msgstr "Favorisierte Beiträge" + +#: ../../mod/network.php:546 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2740,29 +2760,29 @@ 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:499 +#: ../../mod/network.php:549 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:569 +#: ../../mod/network.php:619 msgid "Contact: " msgstr "Kontakt: " -#: ../../mod/network.php:571 +#: ../../mod/network.php:621 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:576 +#: ../../mod/network.php:626 msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1752 +#: ../../mod/notes.php:44 ../../boot.php:1755 msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:263 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:281 #: ../../addon/fbpost/fbpost.php:267 #: ../../addon/dav/friendica/layout.fnk.php:441 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688 @@ -2810,7 +2830,7 @@ msgstr "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche D 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:59 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:63 msgid "No recipient selected." msgstr "Kein Empfänger gewählt." @@ -2818,15 +2838,15 @@ msgstr "Kein Empfänger gewählt." msgid "Unable to check your home location." msgstr "Konnte deinen Heimatort nicht bestimmen." -#: ../../mod/wallmessage.php:62 ../../mod/message.php:66 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:70 msgid "Message could not be sent." msgstr "Nachricht konnte nicht gesendet werden." -#: ../../mod/wallmessage.php:65 ../../mod/message.php:69 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:73 msgid "Message collection failure." msgstr "Konnte Nachrichten nicht abrufen." -#: ../../mod/wallmessage.php:68 ../../mod/message.php:72 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:76 msgid "Message sent." msgstr "Nachricht gesendet." @@ -2835,12 +2855,12 @@ msgid "No recipient." msgstr "Kein Empfänger." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 -#: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:902 ../../include/conversation.php:920 +#: ../../mod/message.php:249 ../../mod/message.php:257 +#: ../../include/conversation.php:905 ../../include/conversation.php:923 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" -#: ../../mod/wallmessage.php:138 ../../mod/message.php:278 +#: ../../mod/wallmessage.php:138 ../../mod/message.php:285 msgid "Send Private Message" msgstr "Private Nachricht senden" @@ -2851,18 +2871,18 @@ msgid "" "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:140 ../../mod/message.php:279 -#: ../../mod/message.php:469 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:286 +#: ../../mod/message.php:476 msgid "To:" msgstr "An:" -#: ../../mod/wallmessage.php:141 ../../mod/message.php:284 -#: ../../mod/message.php:471 +#: ../../mod/wallmessage.php:141 ../../mod/message.php:291 +#: ../../mod/message.php:478 msgid "Subject:" msgstr "Betreff:" -#: ../../mod/wallmessage.php:147 ../../mod/message.php:288 -#: ../../mod/message.php:474 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:147 ../../mod/message.php:295 +#: ../../mod/message.php:481 ../../mod/invite.php:113 msgid "Your message:" msgstr "Deine Nachricht:" @@ -2919,7 +2939,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1728 +#: ../../boot.php:1731 msgid "Profile" msgstr "Profil" @@ -3224,7 +3244,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:920 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923 msgid "Register" msgstr "Registrieren" @@ -3234,8 +3254,8 @@ msgstr "Personensuche" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1444 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 +#: ../../view/theme/diabook/theme.php:458 ../../include/text.php:1442 +#: ../../include/diaspora.php:1848 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 msgid "photo" @@ -3245,8 +3265,8 @@ msgstr "Foto" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:452 -#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:453 +#: ../../view/theme/diabook/theme.php:462 ../../include/diaspora.php:1848 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3257,7 +3277,7 @@ msgstr "Status" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:467 ../../include/diaspora.php:1864 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3272,7 +3292,7 @@ msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 -#: ../../mod/display.php:169 ../../include/items.php:3837 +#: ../../mod/display.php:169 ../../include/items.php:3843 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -3281,7 +3301,7 @@ msgid "Access denied." msgstr "Zugriff verweigert." #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:51 ../../boot.php:1735 +#: ../../include/nav.php:51 ../../boot.php:1738 msgid "Photos" msgstr "Bilder" @@ -3310,35 +3330,35 @@ msgstr "Konnte den Originalbeitrag nicht finden." msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: ../../mod/item.php:420 ../../mod/wall_upload.php:135 +#: ../../mod/item.php:424 ../../mod/wall_upload.php:135 #: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Pinnwand-Bilder" -#: ../../mod/item.php:833 +#: ../../mod/item.php:837 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." -#: ../../mod/item.php:858 +#: ../../mod/item.php:862 #, 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:864 #, 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:865 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:867 #, php-format msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." @@ -3437,71 +3457,71 @@ msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wie msgid "Please enter your password for verification:" msgstr "Bitte gib dein Passwort zur Verifikation ein:" -#: ../../mod/message.php:9 ../../include/nav.php:131 +#: ../../mod/message.php:9 ../../include/nav.php:132 msgid "New Message" msgstr "Neue Nachricht" -#: ../../mod/message.php:63 +#: ../../mod/message.php:67 msgid "Unable to locate contact information." msgstr "Konnte die Kontaktinformationen nicht finden." -#: ../../mod/message.php:191 +#: ../../mod/message.php:195 msgid "Message deleted." msgstr "Nachricht gelöscht." -#: ../../mod/message.php:221 +#: ../../mod/message.php:225 msgid "Conversation removed." msgstr "Unterhaltung gelöscht." -#: ../../mod/message.php:327 +#: ../../mod/message.php:334 msgid "No messages." msgstr "Keine Nachrichten." -#: ../../mod/message.php:334 +#: ../../mod/message.php:341 #, php-format msgid "Unknown sender - %s" msgstr "'Unbekannter Absender - %s" -#: ../../mod/message.php:337 +#: ../../mod/message.php:344 #, php-format msgid "You and %s" msgstr "Du und %s" -#: ../../mod/message.php:340 +#: ../../mod/message.php:347 #, php-format msgid "%s and You" msgstr "%s und du" -#: ../../mod/message.php:350 ../../mod/message.php:462 +#: ../../mod/message.php:357 ../../mod/message.php:469 msgid "Delete conversation" msgstr "Unterhaltung löschen" -#: ../../mod/message.php:353 +#: ../../mod/message.php:360 msgid "D, d M Y - g:i A" msgstr "D, d. M Y - g:i A" -#: ../../mod/message.php:356 +#: ../../mod/message.php:363 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "%d Nachricht" msgstr[1] "%d Nachrichten" -#: ../../mod/message.php:391 +#: ../../mod/message.php:398 msgid "Message not available." msgstr "Nachricht nicht verfügbar." -#: ../../mod/message.php:444 +#: ../../mod/message.php:451 msgid "Delete message" msgstr "Nachricht löschen" -#: ../../mod/message.php:464 +#: ../../mod/message.php:471 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst du auf der Profilseite des Absenders antworten." -#: ../../mod/message.php:468 +#: ../../mod/message.php:475 msgid "Send Reply" msgstr "Antwort senden" @@ -3542,7 +3562,7 @@ msgstr "DB Updates" msgid "Logs" msgstr "Protokolle" -#: ../../mod/admin.php:120 ../../include/nav.php:146 +#: ../../mod/admin.php:120 ../../include/nav.php:149 msgid "Admin" msgstr "Administration" @@ -3648,7 +3668,7 @@ msgstr "Regeln" msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567 +#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:676 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "Seitenname" @@ -4024,6 +4044,7 @@ msgstr "Anfragedatum" #: ../../mod/admin.php:692 ../../mod/admin.php:702 #: ../../include/contact_selectors.php:79 +#: ../../include/contact_selectors.php:86 msgid "Email" msgstr "E-Mail" @@ -4159,7 +4180,7 @@ msgstr "FTP Nutzername" msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:21 ../../boot.php:1123 +#: ../../mod/profile.php:21 ../../boot.php:1126 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." @@ -4267,7 +4288,7 @@ msgstr "Anwendungen" msgid "No installed applications." msgstr "Keine Applikationen installiert." -#: ../../mod/search.php:96 ../../include/text.php:685 +#: ../../mod/search.php:99 ../../include/text.php:685 #: ../../include/text.php:686 ../../include/nav.php:91 msgid "Search" msgstr "Suche" @@ -4377,211 +4398,212 @@ msgstr "Neues Profil angelegt." msgid "Profile unavailable to clone." msgstr "Profil nicht zum Duplizieren verfügbar." -#: ../../mod/profiles.php:573 +#: ../../mod/profiles.php:576 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:596 msgid "Edit Profile Details" msgstr "Profil bearbeiten" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:598 msgid "View this profile" msgstr "Dieses Profil anzeigen" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:599 msgid "Create a new profile using these settings" msgstr "Neues Profil anlegen und diese Einstellungen verwenden" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:600 msgid "Clone this profile" msgstr "Dieses Profil duplizieren" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:601 msgid "Delete this profile" msgstr "Dieses Profil löschen" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:602 msgid "Profile Name:" msgstr "Profilname:" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:603 msgid "Your Full Name:" msgstr "Dein kompletter Name:" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:604 msgid "Title/Description:" msgstr "Titel/Beschreibung:" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:605 msgid "Your Gender:" msgstr "Dein Geschlecht:" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:606 #, php-format msgid "Birthday (%s):" msgstr "Geburtstag (%s):" -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:607 msgid "Street Address:" msgstr "Adresse:" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:608 msgid "Locality/City:" msgstr "Wohnort:" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:609 msgid "Postal/Zip Code:" msgstr "Postleitzahl:" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:610 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:611 msgid "Region/State:" msgstr "Region/Bundesstaat:" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:612 msgid "♥ Marital Status:" msgstr "♥ Beziehungsstatus:" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:613 msgid "Who: (if applicable)" msgstr "Wer: (falls anwendbar)" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:614 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:615 msgid "Since [date]:" msgstr "Seit [Datum]:" -#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:617 msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:618 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "Heimatort:" -#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:619 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "Politische Ansichten:" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:620 msgid "Religious Views:" msgstr "Religiöse Ansichten:" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:621 msgid "Public Keywords:" msgstr "Öffentliche Schlüsselwörter:" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:622 msgid "Private Keywords:" msgstr "Private Schlüsselwörter:" -#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:623 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "Likes:" -#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "Dislikes:" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:625 msgid "Example: fishing photography software" msgstr "Beispiel: Fischen Fotografie Software" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:626 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:624 +#: ../../mod/profiles.php:627 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:625 +#: ../../mod/profiles.php:628 msgid "Tell us about yourself..." msgstr "Erzähle uns ein bisschen von dir …" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:629 msgid "Hobbies/Interests" msgstr "Hobbies/Interessen" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:630 msgid "Contact information and Social Networks" msgstr "Kontaktinformationen und Soziale Netzwerke" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:631 msgid "Musical interests" msgstr "Musikalische Interessen" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:632 msgid "Books, literature" msgstr "Literatur/Bücher" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:633 msgid "Television" msgstr "Fernsehen" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:634 msgid "Film/dance/culture/entertainment" msgstr "Filme/Tänze/Kultur/Unterhaltung" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:635 msgid "Love/romance" msgstr "Liebesleben" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:636 msgid "Work/employment" msgstr "Arbeit/Beschäftigung" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:637 msgid "School/education" msgstr "Schule/Ausbildung" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:642 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "Dies ist dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein." -#: ../../mod/profiles.php:649 ../../mod/directory.php:111 +#: ../../mod/profiles.php:652 ../../mod/directory.php:111 +#: ../../addon/forumdirectory/forumdirectory.php:133 msgid "Age: " msgstr "Alter: " -#: ../../mod/profiles.php:688 +#: ../../mod/profiles.php:691 msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:689 ../../boot.php:1241 +#: ../../mod/profiles.php:692 ../../boot.php:1244 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:690 ../../boot.php:1242 +#: ../../mod/profiles.php:693 ../../boot.php:1245 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:701 ../../boot.php:1252 +#: ../../mod/profiles.php:704 ../../boot.php:1255 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:703 ../../boot.php:1255 +#: ../../mod/profiles.php:706 ../../boot.php:1258 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:704 ../../boot.php:1256 +#: ../../mod/profiles.php:707 ../../boot.php:1259 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:906 -#: ../../include/conversation.php:924 +#: ../../mod/filer.php:29 ../../include/conversation.php:909 +#: ../../include/conversation.php:927 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" @@ -4673,7 +4695,7 @@ msgstr "Texteingabe (Diaspora Format): " msgid "diaspora2bb: " msgstr "diaspora2bb: " -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:514 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -4688,42 +4710,50 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 +#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71 +#: ../../view/theme/diabook/theme.php:512 msgid "Global Directory" msgstr "Weltweites Verzeichnis" -#: ../../mod/directory.php:57 +#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79 msgid "Find on this site" msgstr "Auf diesem Server suchen" -#: ../../mod/directory.php:60 +#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82 msgid "Site Directory" msgstr "Verzeichnis" #: ../../mod/directory.php:114 +#: ../../addon/forumdirectory/forumdirectory.php:136 msgid "Gender: " msgstr "Geschlecht:" -#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1277 +#: ../../mod/directory.php:136 +#: ../../addon/forumdirectory/forumdirectory.php:158 +#: ../../include/profile_advanced.php:17 ../../boot.php:1280 msgid "Gender:" msgstr "Geschlecht:" -#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1280 +#: ../../mod/directory.php:138 +#: ../../addon/forumdirectory/forumdirectory.php:160 +#: ../../include/profile_advanced.php:37 ../../boot.php:1283 msgid "Status:" msgstr "Status:" -#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1282 +#: ../../mod/directory.php:140 +#: ../../addon/forumdirectory/forumdirectory.php:162 +#: ../../include/profile_advanced.php:48 ../../boot.php:1285 msgid "Homepage:" msgstr "Homepage:" -#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58 +#: ../../mod/directory.php:142 +#: ../../addon/forumdirectory/forumdirectory.php:164 +#: ../../include/profile_advanced.php:58 msgid "About:" msgstr "Über:" #: ../../mod/directory.php:180 +#: ../../addon/forumdirectory/forumdirectory.php:202 msgid "No entries (some entries may be hidden)." msgstr "Keine Einträge (einige Einträge könnten versteckt sein)." @@ -5192,27 +5222,27 @@ msgstr "StatusNet AutoFollow Einstellungen" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "Automatisch allen StatusNet Followern/Erwähnungen folgen" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:260 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:278 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "Lebenszeit des Caches (in Stunden)" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:265 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:283 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "Cache Statistik" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:268 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:286 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "Anzahl der Einträge" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:270 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:288 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "Größe des Caches" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:272 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:290 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "Cache leeren" @@ -5581,11 +5611,15 @@ msgstr "Planeten Einstellungen" msgid "Enable Planets Plugin" msgstr "Aktiviere Planeten Plugin" +#: ../../addon/forumdirectory/forumdirectory.php:22 +msgid "Forum Directory" +msgstr "Foren Verzeichnis" + #: ../../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:64 ../../boot.php:946 +#: ../../include/nav.php:64 ../../boot.php:949 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -5625,7 +5659,7 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1442 +#: ../../view/theme/diabook/theme.php:450 ../../include/text.php:1440 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -6194,7 +6228,7 @@ msgstr "Erweiterter Kalender mit CalDAV Unterstützung." #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:774 +#: ../../include/enotify.php:28 ../../include/notifier.php:778 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -6548,22 +6582,22 @@ msgstr "Ziehe Dateien hierher, um sie hochzuladen" msgid "Failed" msgstr "Fehlgeschlagen" -#: ../../addon/js_upload/js_upload.php:297 +#: ../../addon/js_upload/js_upload.php:303 #: ../../addon.old/js_upload/js_upload.php:297 msgid "No files were uploaded." msgstr "Keine Dateien hochgeladen." -#: ../../addon/js_upload/js_upload.php:303 +#: ../../addon/js_upload/js_upload.php:309 #: ../../addon.old/js_upload/js_upload.php:303 msgid "Uploaded file is empty" msgstr "Hochgeladene Datei ist leer" -#: ../../addon/js_upload/js_upload.php:326 +#: ../../addon/js_upload/js_upload.php:332 #: ../../addon.old/js_upload/js_upload.php:326 msgid "File has an invalid extension, it should be one of " msgstr "Die Dateierweiterung ist nicht erlaubt, sie muss eine der folgenden sein " -#: ../../addon/js_upload/js_upload.php:337 +#: ../../addon/js_upload/js_upload.php:343 #: ../../addon.old/js_upload/js_upload.php:337 msgid "Upload was cancelled, or server error encountered" msgstr "Upload abgebrochen oder Serverfehler aufgetreten" @@ -7263,7 +7297,7 @@ msgstr "Sende verlinkte #-Tags und @-Namen nach StatusNet" msgid "Clear OAuth configuration" msgstr "OAuth-Konfiguration löschen" -#: ../../addon/statusnet/statusnet.php:568 +#: ../../addon/statusnet/statusnet.php:677 #: ../../addon.old/statusnet/statusnet.php:568 msgid "API URL" msgstr "API-URL" @@ -7497,11 +7531,11 @@ msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter" msgid "Send linked #-tags and @-names to Twitter" msgstr "Sende verlinkte #-Tags und @-Namen nach Twitter" -#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396 +#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396 msgid "Consumer key" msgstr "Consumer Key" -#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397 +#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397 msgid "Consumer secret" msgstr "Consumer Secret" @@ -7640,7 +7674,7 @@ msgid "Color scheme" msgstr "Farbschema" #: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../include/nav.php:116 msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" @@ -7673,101 +7707,101 @@ msgstr "Deine privaten Fotos" msgid "Community Pages" msgstr "Foren" -#: ../../view/theme/diabook/theme.php:377 -#: ../../view/theme/diabook/theme.php:591 +#: ../../view/theme/diabook/theme.php:378 +#: ../../view/theme/diabook/theme.php:592 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Community-Profile" -#: ../../view/theme/diabook/theme.php:398 -#: ../../view/theme/diabook/theme.php:596 +#: ../../view/theme/diabook/theme.php:399 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Letzte Nutzer" -#: ../../view/theme/diabook/theme.php:427 -#: ../../view/theme/diabook/theme.php:598 +#: ../../view/theme/diabook/theme.php:428 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Zuletzt gemocht" -#: ../../view/theme/diabook/theme.php:472 -#: ../../view/theme/diabook/theme.php:597 +#: ../../view/theme/diabook/theme.php:473 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Letzte Fotos" -#: ../../view/theme/diabook/theme.php:509 -#: ../../view/theme/diabook/theme.php:594 +#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:595 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Freunde finden" -#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:511 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:513 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Ähnliche Interessen" -#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:515 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Freunde einladen" -#: ../../view/theme/diabook/theme.php:531 -#: ../../view/theme/diabook/theme.php:590 +#: ../../view/theme/diabook/theme.php:532 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Earth Layers" -#: ../../view/theme/diabook/theme.php:536 +#: ../../view/theme/diabook/theme.php:537 msgid "Set zoomfactor for Earth Layers" msgstr "Zoomfaktor der Earth Layer" -#: ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Longitude (X) der Earth Layer" -#: ../../view/theme/diabook/theme.php:538 +#: ../../view/theme/diabook/theme.php:539 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Latitude (Y) der Earth Layer" -#: ../../view/theme/diabook/theme.php:551 -#: ../../view/theme/diabook/theme.php:592 +#: ../../view/theme/diabook/theme.php:552 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Hilfe oder @NewHere" -#: ../../view/theme/diabook/theme.php:558 -#: ../../view/theme/diabook/theme.php:593 +#: ../../view/theme/diabook/theme.php:559 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Verbinde Dienste" -#: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:595 +#: ../../view/theme/diabook/theme.php:566 +#: ../../view/theme/diabook/theme.php:596 msgid "Last Tweets" msgstr "Neueste Tweets" -#: ../../view/theme/diabook/theme.php:568 +#: ../../view/theme/diabook/theme.php:569 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Twitter Suchbegriff" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:588 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "nicht zeigen" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:588 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "zeigen" -#: ../../view/theme/diabook/theme.php:588 +#: ../../view/theme/diabook/theme.php:589 msgid "Show/hide boxes at right-hand column:" msgstr "Rahmen auf der rechten Seite anzeigen/verbergen" @@ -7941,6 +7975,10 @@ msgstr "XMPP/Chat" msgid "MySpace" msgstr "MySpace" +#: ../../include/contact_selectors.php:87 +msgid "Google+" +msgstr "Google+" + #: ../../include/profile_selectors.php:6 msgid "Male" msgstr "Männlich" @@ -8182,7 +8220,7 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:457 ../../include/notifier.php:767 +#: ../../include/delivery.php:457 ../../include/notifier.php:771 msgid "(no subject)" msgstr "(kein Betreff)" @@ -8401,31 +8439,31 @@ msgstr "November" msgid "December" msgstr "Dezember" -#: ../../include/text.php:1012 +#: ../../include/text.php:1010 msgid "bytes" msgstr "Byte" -#: ../../include/text.php:1039 ../../include/text.php:1051 +#: ../../include/text.php:1037 ../../include/text.php:1049 msgid "Click to open/close" msgstr "Zum öffnen/schließen klicken" -#: ../../include/text.php:1224 ../../include/user.php:236 +#: ../../include/text.php:1222 ../../include/user.php:236 msgid "default" msgstr "Standard" -#: ../../include/text.php:1236 +#: ../../include/text.php:1234 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1446 +#: ../../include/text.php:1444 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1449 +#: ../../include/text.php:1447 msgid "post" msgstr "Beitrag" -#: ../../include/text.php:1604 +#: ../../include/text.php:1602 msgid "Item filed" msgstr "Beitrag abgelegt" @@ -8433,11 +8471,11 @@ msgstr "Beitrag abgelegt" msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:2222 +#: ../../include/diaspora.php:2236 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/network.php:849 +#: ../../include/network.php:847 msgid "view full size" msgstr "Volle Größe anzeigen" @@ -8520,7 +8558,7 @@ msgstr "Neue Gruppe erstellen" msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" -#: ../../include/nav.php:46 ../../boot.php:945 +#: ../../include/nav.php:46 ../../boot.php:948 msgid "Logout" msgstr "Abmelden" @@ -8528,7 +8566,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1721 +#: ../../include/nav.php:49 ../../boot.php:1724 msgid "Status" msgstr "Status" @@ -8576,55 +8614,63 @@ msgstr "Nutzerverzeichnis" msgid "Conversations from your friends" msgstr "Unterhaltungen deiner Kontakte" -#: ../../include/nav.php:121 +#: ../../include/nav.php:114 +msgid "Network Reset" +msgstr "Netzwerk zurücksetzen" + +#: ../../include/nav.php:114 +msgid "Load Network page with no filters" +msgstr "Netzwerk-Seite ohne Filter laden" + +#: ../../include/nav.php:122 msgid "Friend Requests" msgstr "Kontaktanfragen" -#: ../../include/nav.php:123 +#: ../../include/nav.php:124 msgid "See all notifications" msgstr "Alle Benachrichtigungen anzeigen" -#: ../../include/nav.php:124 +#: ../../include/nav.php:125 msgid "Mark all system notifications seen" msgstr "Markiere alle Systembenachrichtigungen als gelesen" -#: ../../include/nav.php:128 +#: ../../include/nav.php:129 msgid "Private mail" msgstr "Private E-Mail" -#: ../../include/nav.php:129 +#: ../../include/nav.php:130 msgid "Inbox" msgstr "Eingang" -#: ../../include/nav.php:130 +#: ../../include/nav.php:131 msgid "Outbox" msgstr "Ausgang" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage" msgstr "Verwalten" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:138 ../../boot.php:1235 +#: ../../include/nav.php:140 ../../boot.php:1238 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:138 ../../boot.php:1235 -msgid "Manage/edit profiles" -msgstr "Profile verwalten/editieren" +#: ../../include/nav.php:140 +msgid "Manage/Edit Profiles" +msgstr "Profile Verwalten/Editieren" -#: ../../include/nav.php:139 +#: ../../include/nav.php:142 msgid "Manage/edit friends and contacts" msgstr "Freunde und Kontakte verwalten/editieren" -#: ../../include/nav.php:146 +#: ../../include/nav.php:149 msgid "Site setup and configuration" msgstr "Einstellungen der Seite und Konfiguration" -#: ../../include/nav.php:170 +#: ../../include/nav.php:173 msgid "Nothing new here" msgstr "Keine Neuigkeiten." @@ -8667,23 +8713,23 @@ msgstr "Beispiel: Robert Morgenstein, Angeln" msgid "Random Profile" msgstr "Zufälliges Profil" -#: ../../include/contact_widgets.php:68 +#: ../../include/contact_widgets.php:70 msgid "Networks" msgstr "Netzwerke" -#: ../../include/contact_widgets.php:71 +#: ../../include/contact_widgets.php:73 msgid "All Networks" msgstr "Alle Netzwerke" -#: ../../include/contact_widgets.php:98 +#: ../../include/contact_widgets.php:103 ../../include/features.php:59 msgid "Saved Folders" msgstr "Gespeicherte Ordner" -#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129 +#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138 msgid "Everything" msgstr "Alles" -#: ../../include/contact_widgets.php:126 +#: ../../include/contact_widgets.php:135 msgid "Categories" msgstr "Kategorien" @@ -8758,12 +8804,12 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: ../../include/datetime.php:472 ../../include/items.php:1689 +#: ../../include/datetime.php:472 ../../include/items.php:1695 #, php-format msgid "%s's birthday" msgstr "%ss Geburtstag" -#: ../../include/datetime.php:473 ../../include/items.php:1690 +#: ../../include/datetime.php:473 ../../include/items.php:1696 #, php-format msgid "Happy Birthday %s" msgstr "Herzlichen Glückwunsch %s" @@ -8772,24 +8818,152 @@ msgstr "Herzlichen Glückwunsch %s" msgid "From: " msgstr "Von: " -#: ../../include/bbcode.php:185 ../../include/bbcode.php:406 +#: ../../include/bbcode.php:202 ../../include/bbcode.php:423 msgid "Image/photo" msgstr "Bild/Foto" -#: ../../include/bbcode.php:371 ../../include/bbcode.php:391 +#: ../../include/bbcode.php:388 ../../include/bbcode.php:408 msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: ../../include/bbcode.php:410 ../../include/bbcode.php:411 +#: ../../include/bbcode.php:427 ../../include/bbcode.php:428 msgid "Encrypted content" msgstr "Verschlüsselter Inhalt" +#: ../../include/features.php:25 +msgid "Multiple Profiles" +msgstr "Mehrere Profile" + +#: ../../include/features.php:25 +msgid "Ability to create multiple profiles" +msgstr "Möglichkeit mehrere Profile zu erstellen" + +#: ../../include/features.php:31 +msgid "Richtext Editor" +msgstr "Web-Editor" + +#: ../../include/features.php:31 +msgid "Enable richtext editor" +msgstr "Den Web-Editor für neue Beiträge aktivieren" + +#: ../../include/features.php:32 +msgid "Post Preview" +msgstr "Beitragsvorschau" + +#: ../../include/features.php:32 +msgid "Allow previewing posts and comments before publishing them" +msgstr "Die Vorschau von Beiträgen und Kommentaren vor dem absenden erlauben." + +#: ../../include/features.php:38 +msgid "Search by Date" +msgstr "Archiv" + +#: ../../include/features.php:38 +msgid "Ability to select posts by date ranges" +msgstr "Möglichkeit die Beiträge nach Datumsbereichen zu sortieren" + +#: ../../include/features.php:39 +msgid "Group Filter" +msgstr "Gruppen Filter" + +#: ../../include/features.php:39 +msgid "Enable widget to display Network posts only from selected group" +msgstr "Widget zur Darstellung der Beiträge nach Kontaktgruppen sortiert aktivieren." + +#: ../../include/features.php:40 +msgid "Network Filter" +msgstr "Netzwerk Filter" + +#: ../../include/features.php:40 +msgid "Enable widget to display Network posts only from selected network" +msgstr "Widget zum filtern der Beiträge in Abhängigkeit des Netzwerks aus dem der Ersteller sendet aktivieren." + +#: ../../include/features.php:41 +msgid "Save search terms for re-use" +msgstr "Speichere Suchanfragen für spätere Wiederholung." + +#: ../../include/features.php:47 +msgid "Network Personal Tab" +msgstr "Netzwerk-Reiter: Persönlich" + +#: ../../include/features.php:47 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "Aktiviert einen Netzwerk-Reiter in dem Nachrichten angezeigt werden mit denen du interagiert hast" + +#: ../../include/features.php:48 +msgid "Network New Tab" +msgstr "Netzwerk-Reiter: Neue" + +#: ../../include/features.php:48 +msgid "Enable tab to display only new Network posts (from the last 12 hours)" +msgstr "Aktiviert einen Netzwerk-Reiter in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden" + +#: ../../include/features.php:49 +msgid "Network Shared Links Tab" +msgstr "Netzwerk-Reiter: Geteilte Links" + +#: ../../include/features.php:49 +msgid "Enable tab to display only Network posts with links in them" +msgstr "Aktiviert einen Netzwerk-Reiter der ausschließlich Nachrichten mit Links enthält" + +#: ../../include/features.php:55 +msgid "Multiple Deletion" +msgstr "Mehrere Beiträge löschen" + +#: ../../include/features.php:55 +msgid "Select and delete multiple posts/comments at once" +msgstr "Mehrere Beiträge/Kommentare markieren und gleichzeitig löschen" + +#: ../../include/features.php:56 +msgid "Edit Sent Posts" +msgstr "Gesendete Beiträge editieren" + +#: ../../include/features.php:56 +msgid "Edit and correct posts and comments after sending" +msgstr "Erlaubt es Beiträge und Kommentare nach dem Senden zu editieren bzw.zu korrigieren." + +#: ../../include/features.php:57 +msgid "Tagging" +msgstr "Tagging" + +#: ../../include/features.php:57 +msgid "Ability to tag existing posts" +msgstr "Möglichkeit bereits existierende Beiträge nachträglich mit Tags zu versehen." + +#: ../../include/features.php:58 +msgid "Post Categories" +msgstr "Beitragskategorien" + +#: ../../include/features.php:58 +msgid "Add categories to your posts" +msgstr "Eigene Beiträge mit Kategorien versehen" + +#: ../../include/features.php:59 +msgid "Ability to file posts under folders" +msgstr "Beiträge in Ordnern speichern aktivieren" + +#: ../../include/features.php:60 +msgid "Dislike Posts" +msgstr "Beiträge 'nicht mögen'" + +#: ../../include/features.php:60 +msgid "Ability to dislike posts/comments" +msgstr "Ermöglicht es Beiträge mit einem Klick 'nicht zu mögen'" + +#: ../../include/features.php:61 +msgid "Star Posts" +msgstr "Beiträge Markieren" + +#: ../../include/features.php:61 +msgid "Ability to mark special posts with a star indicator" +msgstr "Erlaubt es Beiträge mit einem Stern-Indikator zu markieren" + #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln." -#: ../../include/message.php:15 ../../include/message.php:171 +#: ../../include/message.php:15 ../../include/message.php:172 msgid "[no subject]" msgstr "[kein Betreff]" @@ -9038,15 +9212,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen." msgid "following" msgstr "folgen" -#: ../../include/items.php:3357 +#: ../../include/items.php:3363 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:3357 +#: ../../include/items.php:3363 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " -#: ../../include/items.php:4038 +#: ../../include/items.php:4047 msgid "Archives" msgstr "Archiv" @@ -9185,11 +9359,11 @@ 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:599 ../../object/Item.php:220 +#: ../../include/conversation.php:599 ../../object/Item.php:225 msgid "Categories:" msgstr "Kategorien" -#: ../../include/conversation.php:600 ../../object/Item.php:221 +#: ../../include/conversation.php:600 ../../object/Item.php:226 msgid "Filed under:" msgstr "Abgelegt unter:" @@ -9244,31 +9418,31 @@ msgstr "%s mögen das." msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:901 ../../include/conversation.php:919 +#: ../../include/conversation.php:904 ../../include/conversation.php:922 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:903 ../../include/conversation.php:921 +#: ../../include/conversation.php:906 ../../include/conversation.php:924 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:904 ../../include/conversation.php:922 +#: ../../include/conversation.php:907 ../../include/conversation.php:925 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:905 ../../include/conversation.php:923 +#: ../../include/conversation.php:908 ../../include/conversation.php:926 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:907 ../../include/conversation.php:925 +#: ../../include/conversation.php:910 ../../include/conversation.php:928 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:908 +#: ../../include/conversation.php:911 msgid "Delete item(s)?" msgstr "Einträge löschen?" -#: ../../include/conversation.php:987 +#: ../../include/conversation.php:990 msgid "permissions" msgstr "Zugriffsrechte" @@ -9284,108 +9458,116 @@ msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements." msgid "This action is not available under your subscription plan." msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar." -#: ../../boot.php:604 +#: ../../boot.php:607 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:607 +#: ../../boot.php:610 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:816 +#: ../../boot.php:819 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: ../../boot.php:818 +#: ../../boot.php:821 #, php-format msgid "Update Error at %s" msgstr "Updatefehler bei %s" -#: ../../boot.php:919 +#: ../../boot.php:922 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: ../../boot.php:948 +#: ../../boot.php:951 msgid "Nickname or Email address: " msgstr "Spitzname oder E-Mail-Adresse: " -#: ../../boot.php:949 +#: ../../boot.php:952 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:950 +#: ../../boot.php:953 msgid "Remember me" msgstr "Anmeldedaten merken" -#: ../../boot.php:953 +#: ../../boot.php:956 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:959 +#: ../../boot.php:962 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:1084 +#: ../../boot.php:1087 msgid "Requested account is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../boot.php:1161 +#: ../../boot.php:1164 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1227 +#: ../../boot.php:1230 msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1349 ../../boot.php:1435 +#: ../../boot.php:1238 +msgid "Manage/edit profiles" +msgstr "Profile verwalten/editieren" + +#: ../../boot.php:1352 ../../boot.php:1438 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1350 ../../boot.php:1436 +#: ../../boot.php:1353 ../../boot.php:1439 msgid "F d" msgstr "d. F" -#: ../../boot.php:1395 ../../boot.php:1476 +#: ../../boot.php:1398 ../../boot.php:1479 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1407 +#: ../../boot.php:1410 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1408 +#: ../../boot.php:1411 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1469 +#: ../../boot.php:1472 msgid "[No description]" msgstr "[keine Beschreibung]" -#: ../../boot.php:1487 +#: ../../boot.php:1490 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1488 +#: ../../boot.php:1491 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1724 +#: ../../boot.php:1727 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../boot.php:1731 +#: ../../boot.php:1734 msgid "Profile Details" msgstr "Profildetails" -#: ../../boot.php:1748 +#: ../../boot.php:1751 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" -#: ../../boot.php:1755 +#: ../../boot.php:1758 msgid "Only You Can See This" msgstr "Nur du kannst das sehen" +#: ../../object/Item.php:237 +msgid "via" +msgstr "via" + #: ../../index.php:398 msgid "toggle mobile" msgstr "auf/von Mobile Ansicht wechseln" diff --git a/view/de/strings.php b/view/de/strings.php index 0fd4103cef..7bded94a41 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -84,7 +84,6 @@ $a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert."; $a->strings["No photos selected"] = "Keine Bilder ausgewählt"; $a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt."; $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers."; -$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendest %1$.2f Mbyte des Foto-Speichers."; $a->strings["Upload Photos"] = "Bilder hochladen"; $a->strings["New album name: "] = "Name des neuen Albums: "; $a->strings["or existing album name: "] = "oder existierender Albumname: "; @@ -453,10 +452,12 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."; $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:"; $a->strings["Reset"] = "Zurücksetzen"; +$a->strings["Additional features"] = "Zusätzliche Features"; $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; $a->strings["Update"] = "Aktualisierungen"; $a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."; $a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet."; +$a->strings["Features updated"] = "Features aktualisiert"; $a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; $a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."; $a->strings["Password changed."] = "Passwort ändern."; @@ -480,6 +481,9 @@ $a->strings["No name"] = "Kein Name"; $a->strings["Remove authorization"] = "Autorisierung entziehen"; $a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert"; $a->strings["Plugin Settings"] = "Plugin-Einstellungen"; +$a->strings["Off"] = "Aus"; +$a->strings["On"] = "An"; +$a->strings["Additional Features"] = "Zusätzliche Features"; $a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s"; $a->strings["enabled"] = "eingeschaltet"; $a->strings["disabled"] = "ausgeschaltet"; @@ -589,10 +593,10 @@ $a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren"; $a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um dich geht"; $a->strings["New"] = "Neue"; $a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum"; -$a->strings["Starred"] = "Markierte"; -$a->strings["Favourite Posts"] = "Favorisierte Beiträge"; $a->strings["Shared Links"] = "Geteilte Links"; $a->strings["Interesting Links"] = "Interessante Links"; +$a->strings["Starred"] = "Markierte"; +$a->strings["Favourite Posts"] = "Favorisierte Beiträge"; $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.", @@ -1216,6 +1220,7 @@ $a->strings["Randomise Page/Forum list"] = "Zufällige Seiten/Foren Liste"; $a->strings["Show pages/forums on profile page"] = "Foren/Seiten auf der Profilseite anzeigen"; $a->strings["Planets Settings"] = "Planeten Einstellungen"; $a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin"; +$a->strings["Forum Directory"] = "Foren Verzeichnis"; $a->strings["Login"] = "Anmeldung"; $a->strings["OpenID"] = "OpenID"; $a->strings["Latest users"] = "Letzte Benutzer"; @@ -1674,6 +1679,7 @@ $a->strings["Zot!"] = "Zott"; $a->strings["LinkedIn"] = "LinkedIn"; $a->strings["XMPP/IM"] = "XMPP/Chat"; $a->strings["MySpace"] = "MySpace"; +$a->strings["Google+"] = "Google+"; $a->strings["Male"] = "Männlich"; $a->strings["Female"] = "Weiblich"; $a->strings["Currently Male"] = "Momentan männlich"; @@ -1836,6 +1842,8 @@ $a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite"; $a->strings["Directory"] = "Verzeichnis"; $a->strings["People directory"] = "Nutzerverzeichnis"; $a->strings["Conversations from your friends"] = "Unterhaltungen deiner Kontakte"; +$a->strings["Network Reset"] = "Netzwerk zurücksetzen"; +$a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden"; $a->strings["Friend Requests"] = "Kontaktanfragen"; $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; $a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen"; @@ -1845,7 +1853,7 @@ $a->strings["Outbox"] = "Ausgang"; $a->strings["Manage"] = "Verwalten"; $a->strings["Manage other pages"] = "Andere Seiten verwalten"; $a->strings["Profiles"] = "Profile"; -$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; +$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; $a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/editieren"; $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; $a->strings["Nothing new here"] = "Keine Neuigkeiten."; @@ -1889,6 +1897,38 @@ $a->strings["From: "] = "Von: "; $a->strings["Image/photo"] = "Bild/Foto"; $a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; +$a->strings["Multiple Profiles"] = "Mehrere Profile"; +$a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen"; +$a->strings["Richtext Editor"] = "Web-Editor"; +$a->strings["Enable richtext editor"] = "Den Web-Editor für neue Beiträge aktivieren"; +$a->strings["Post Preview"] = "Beitragsvorschau"; +$a->strings["Allow previewing posts and comments before publishing them"] = "Die Vorschau von Beiträgen und Kommentaren vor dem absenden erlauben."; +$a->strings["Search by Date"] = "Archiv"; +$a->strings["Ability to select posts by date ranges"] = "Möglichkeit die Beiträge nach Datumsbereichen zu sortieren"; +$a->strings["Group Filter"] = "Gruppen Filter"; +$a->strings["Enable widget to display Network posts only from selected group"] = "Widget zur Darstellung der Beiträge nach Kontaktgruppen sortiert aktivieren."; +$a->strings["Network Filter"] = "Netzwerk Filter"; +$a->strings["Enable widget to display Network posts only from selected network"] = "Widget zum filtern der Beiträge in Abhängigkeit des Netzwerks aus dem der Ersteller sendet aktivieren."; +$a->strings["Save search terms for re-use"] = "Speichere Suchanfragen für spätere Wiederholung."; +$a->strings["Network Personal Tab"] = "Netzwerk-Reiter: Persönlich"; +$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviert einen Netzwerk-Reiter in dem Nachrichten angezeigt werden mit denen du interagiert hast"; +$a->strings["Network New Tab"] = "Netzwerk-Reiter: Neue"; +$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Aktiviert einen Netzwerk-Reiter in dem ausschließlich neue Beiträge (der letzten 12 Stunden) angezeigt werden"; +$a->strings["Network Shared Links Tab"] = "Netzwerk-Reiter: Geteilte Links"; +$a->strings["Enable tab to display only Network posts with links in them"] = "Aktiviert einen Netzwerk-Reiter der ausschließlich Nachrichten mit Links enthält"; +$a->strings["Multiple Deletion"] = "Mehrere Beiträge löschen"; +$a->strings["Select and delete multiple posts/comments at once"] = "Mehrere Beiträge/Kommentare markieren und gleichzeitig löschen"; +$a->strings["Edit Sent Posts"] = "Gesendete Beiträge editieren"; +$a->strings["Edit and correct posts and comments after sending"] = "Erlaubt es Beiträge und Kommentare nach dem Senden zu editieren bzw.zu korrigieren."; +$a->strings["Tagging"] = "Tagging"; +$a->strings["Ability to tag existing posts"] = "Möglichkeit bereits existierende Beiträge nachträglich mit Tags zu versehen."; +$a->strings["Post Categories"] = "Beitragskategorien"; +$a->strings["Add categories to your posts"] = "Eigene Beiträge mit Kategorien versehen"; +$a->strings["Ability to file posts under folders"] = "Beiträge in Ordnern speichern aktivieren"; +$a->strings["Dislike Posts"] = "Beiträge 'nicht mögen'"; +$a->strings["Ability to dislike posts/comments"] = "Ermöglicht es Beiträge mit einem Klick 'nicht zu mögen'"; +$a->strings["Star Posts"] = "Beiträge Markieren"; +$a->strings["Ability to mark special posts with a star indicator"] = "Erlaubt es Beiträge mit einem Stern-Indikator zu markieren"; $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; $a->strings["[no subject]"] = "[kein Betreff]"; $a->strings["Visible to everybody"] = "Für jeden sichtbar"; @@ -2012,6 +2052,7 @@ $a->strings["Forgot your password?"] = "Passwort vergessen?"; $a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; $a->strings["Edit profile"] = "Profil bearbeiten"; $a->strings["Message"] = "Nachricht"; +$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; $a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; $a->strings["F d"] = "d. F"; $a->strings["[today]"] = "[heute]"; @@ -2024,6 +2065,7 @@ $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; $a->strings["Profile Details"] = "Profildetails"; $a->strings["Events and Calendar"] = "Ereignisse und Kalender"; $a->strings["Only You Can See This"] = "Nur du kannst das sehen"; +$a->strings["via"] = "via"; $a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; $a->strings["Bg settings updated."] = "Bg Einstellungen sind aktualisiert."; $a->strings["Bg Settings"] = "Bg Einstellungen"; diff --git a/view/fr/messages.po b/view/fr/messages.po index 92da96a7f8..5845874cd0 100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-30 10:00-0700\n" -"PO-Revision-Date: 2012-10-31 14:33+0000\n" -"Last-Translator: Domovoy \n" +"POT-Creation-Date: 2012-11-28 10:00-0800\n" +"PO-Revision-Date: 2012-11-28 08:19+0000\n" +"Last-Translator: Olivier \n" "Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,6 +26,7 @@ msgstr "Publication réussie." #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 #: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 +#: ../../mod/update_display.php:22 msgid "[Embedded content - reload page to view]" msgstr "[contenu incorporé - rechargez la page pour le voir]" @@ -39,30 +40,30 @@ msgstr "Impossible d'appliquer les réglages." #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:132 ../../mod/photos.php:994 +#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:146 -#: ../../mod/settings.php:86 ../../mod/settings.php:525 -#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 -#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:147 +#: ../../mod/settings.php:91 ../../mod/settings.php:541 +#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6 +#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../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:126 -#: ../../mod/item.php:142 ../../mod/mood.php:114 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139 +#: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 -#: ../../mod/message.php:38 ../../mod/message.php:168 +#: ../../mod/message.php:38 ../../mod/message.php:172 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 -#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 -#: ../../mod/display.php:141 ../../mod/profiles.php:7 +#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 +#: ../../mod/display.php:165 ../../mod/profiles.php:7 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 -#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977 +#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../addon.old/dav/friendica/layout.fnk.php:354 @@ -94,8 +95,8 @@ msgstr "une photo" msgid "Return to contact editor" msgstr "Retour à l'éditeur de contact" -#: ../../mod/crepair.php:148 ../../mod/settings.php:545 -#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702 +#: ../../mod/crepair.php:148 ../../mod/settings.php:561 +#: ../../mod/settings.php:587 ../../mod/admin.php:692 ../../mod/admin.php:702 msgid "Name" msgstr "Nom" @@ -132,19 +133,19 @@ msgid "New photo from this URL" msgstr "Nouvelle photo depuis cette URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:455 ../../mod/photos.php:1027 -#: ../../mod/photos.php:1103 ../../mod/photos.php:1366 -#: ../../mod/photos.php:1406 ../../mod/photos.php:1449 -#: ../../mod/photos.php:1520 ../../mod/install.php:246 +#: ../../mod/events.php:455 ../../mod/photos.php:1028 +#: ../../mod/photos.php:1100 ../../mod/photos.php:1363 +#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 +#: ../../mod/photos.php:1519 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:348 -#: ../../mod/settings.php:543 ../../mod/settings.php:697 -#: ../../mod/settings.php:769 ../../mod/settings.php:976 -#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 -#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689 -#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112 -#: ../../mod/profiles.php:594 ../../mod/invite.php:119 -#: ../../addon/fromgplus/fromgplus.php:40 +#: ../../mod/content.php:693 ../../mod/contacts.php:352 +#: ../../mod/settings.php:559 ../../mod/settings.php:669 +#: ../../mod/settings.php:738 ../../mod/settings.php:810 +#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137 +#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:443 +#: ../../mod/admin.php:689 ../../mod/admin.php:826 ../../mod/admin.php:1025 +#: ../../mod/admin.php:1112 ../../mod/profiles.php:597 +#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76 @@ -173,18 +174,18 @@ msgstr "Nouvelle photo depuis cette URL" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:685 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:599 +#: ../../view/theme/diabook/theme.php:600 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:570 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -233,20 +234,20 @@ msgstr "Nouvelle photo depuis cette URL" msgid "Submit" msgstr "Envoyer" -#: ../../mod/help.php:30 +#: ../../mod/help.php:79 msgid "Help:" msgstr "Aide:" -#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225 #: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225 msgid "Help" msgstr "Aide" -#: ../../mod/help.php:38 ../../index.php:228 +#: ../../mod/help.php:90 ../../index.php:218 msgid "Not Found" msgstr "Non trouvé" -#: ../../mod/help.php:41 ../../index.php:231 +#: ../../mod/help.php:93 ../../index.php:221 msgid "Page not found." msgstr "Page introuvable." @@ -284,12 +285,12 @@ msgstr "l, F j" msgid "Edit event" msgstr "Editer l'événement" -#: ../../mod/events.php:323 ../../include/text.php:1185 +#: ../../mod/events.php:323 ../../include/text.php:1190 msgid "link to source" msgstr "lien original" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:52 ../../boot.php:1701 +#: ../../include/nav.php:52 ../../boot.php:1748 msgid "Events" msgstr "Événements" @@ -346,8 +347,9 @@ msgid "Description:" msgstr "Description:" #: ../../mod/events.php:448 ../../mod/directory.php:134 +#: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1237 +#: ../../boot.php:1278 msgid "Location:" msgstr "Localisation:" @@ -359,10 +361,10 @@ msgstr "Titre :" msgid "Share this event" msgstr "Partager cet événement" -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 -#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 -#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:996 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145 +#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560 +#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45 +#: ../../include/conversation.php:1009 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Annuler" @@ -387,8 +389,8 @@ msgstr "Utiliser comme photo de profil" #: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530 #, php-format -msgid "%s welcomes %s" -msgstr "%s accueille %s" +msgid "%1$s welcomes %2$s" +msgstr "" #: ../../mod/api.php:76 ../../mod/api.php:102 msgid "Authorize application connection" @@ -409,125 +411,118 @@ msgid "" msgstr "Voulez-vous autoriser cette application à accéder à vos notices et contacts, et/ou à créer des notices à votre place?" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:236 -#: ../../mod/profiles.php:574 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:237 +#: ../../mod/profiles.php:577 msgid "Yes" msgstr "Oui" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836 -#: ../../mod/settings.php:892 ../../mod/settings.php:898 -#: ../../mod/settings.php:906 ../../mod/settings.php:910 -#: ../../mod/settings.php:915 ../../mod/settings.php:921 -#: ../../mod/settings.php:927 ../../mod/settings.php:933 -#: ../../mod/settings.php:963 ../../mod/settings.php:964 -#: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:237 -#: ../../mod/profiles.php:575 +#: ../../mod/settings.php:933 ../../mod/settings.php:939 +#: ../../mod/settings.php:947 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:962 +#: ../../mod/settings.php:968 ../../mod/settings.php:974 +#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 ../../mod/register.php:238 +#: ../../mod/profiles.php:578 msgid "No" msgstr "Non" -#: ../../mod/photos.php:50 ../../boot.php:1694 +#: ../../mod/photos.php:51 ../../boot.php:1741 msgid "Photo Albums" msgstr "Albums photo" -#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008 -#: ../../mod/photos.php:1095 ../../mod/photos.php:1110 +#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 +#: ../../mod/photos.php:1092 ../../mod/photos.php:1107 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:485 +#: ../../view/theme/diabook/theme.php:486 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Photos du contact" -#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1612 +#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612 msgid "Upload New Photos" msgstr "Téléverser de nouvelles photos" -#: ../../mod/photos.php:78 ../../mod/settings.php:23 +#: ../../mod/photos.php:79 ../../mod/settings.php:23 msgid "everybody" msgstr "tout le monde" -#: ../../mod/photos.php:142 +#: ../../mod/photos.php:143 msgid "Contact information unavailable" msgstr "Informations de contact indisponibles" -#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095 -#: ../../mod/photos.php:1110 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092 +#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:487 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" msgstr "Photos du profil" -#: ../../mod/photos.php:163 +#: ../../mod/photos.php:164 msgid "Album not found." msgstr "Album introuvable." -#: ../../mod/photos.php:181 ../../mod/photos.php:1104 +#: ../../mod/photos.php:182 ../../mod/photos.php:1101 msgid "Delete Album" msgstr "Effacer l'album" -#: ../../mod/photos.php:244 ../../mod/photos.php:1367 +#: ../../mod/photos.php:245 ../../mod/photos.php:1364 msgid "Delete Photo" msgstr "Effacer la photo" -#: ../../mod/photos.php:606 -msgid "was tagged in a" -msgstr "a été identifié dans" +#: ../../mod/photos.php:607 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "" -#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 -#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 -#: ../../include/conversation.php:253 -#: ../../addon.old/communityhome/communityhome.php:163 -msgid "photo" -msgstr "photo" +#: ../../mod/photos.php:607 +msgid "a photo" +msgstr "" -#: ../../mod/photos.php:606 -msgid "by" -msgstr "par" - -#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321 #: ../../addon.old/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "L'image dépasse la taille maximale de " -#: ../../mod/photos.php:719 +#: ../../mod/photos.php:720 msgid "Image file is empty." msgstr "Fichier image vide." -#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153 -#: ../../mod/wall_upload.php:110 +#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153 +#: ../../mod/wall_upload.php:112 msgid "Unable to process image." msgstr "Impossible de traiter l'image." -#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301 -#: ../../mod/wall_upload.php:136 +#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301 +#: ../../mod/wall_upload.php:138 msgid "Image upload failed." msgstr "Le téléversement de l'image a échoué." -#: ../../mod/photos.php:864 ../../mod/community.php:18 +#: ../../mod/photos.php:865 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31 +#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31 +#: ../../addon/forumdirectory/forumdirectory.php:53 msgid "Public access denied." msgstr "Accès public refusé." -#: ../../mod/photos.php:874 +#: ../../mod/photos.php:875 msgid "No photos selected" msgstr "Aucune photo sélectionnée" -#: ../../mod/photos.php:975 +#: ../../mod/photos.php:976 msgid "Access to this item is restricted." msgstr "Accès restreint à cet élément." @@ -536,154 +531,149 @@ msgstr "Accès restreint à cet élément." msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "Vous avez utilisé %1$.2f Mo sur %2$.2f d'espace de stockage pour les photos." -#: ../../mod/photos.php:1040 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "Vous avez utilisé %1$.2f Mo d'espace de stockage pour les photos." - -#: ../../mod/photos.php:1046 +#: ../../mod/photos.php:1043 msgid "Upload Photos" msgstr "Téléverser des photos" -#: ../../mod/photos.php:1050 ../../mod/photos.php:1099 +#: ../../mod/photos.php:1047 ../../mod/photos.php:1096 msgid "New album name: " msgstr "Nom du nouvel album: " -#: ../../mod/photos.php:1051 +#: ../../mod/photos.php:1048 msgid "or existing album name: " msgstr "ou nom d'un album existant: " -#: ../../mod/photos.php:1052 +#: ../../mod/photos.php:1049 msgid "Do not show a status post for this upload" msgstr "Ne pas publier de notice pour cet envoi" -#: ../../mod/photos.php:1054 ../../mod/photos.php:1362 +#: ../../mod/photos.php:1051 ../../mod/photos.php:1359 msgid "Permissions" msgstr "Permissions" -#: ../../mod/photos.php:1114 +#: ../../mod/photos.php:1111 msgid "Edit Album" msgstr "Éditer l'album" -#: ../../mod/photos.php:1120 +#: ../../mod/photos.php:1117 msgid "Show Newest First" msgstr "Plus récent d'abord" -#: ../../mod/photos.php:1122 +#: ../../mod/photos.php:1119 msgid "Show Oldest First" msgstr "Plus ancien d'abord" -#: ../../mod/photos.php:1146 ../../mod/photos.php:1595 +#: ../../mod/photos.php:1143 ../../mod/photos.php:1595 msgid "View Photo" msgstr "Voir la photo" -#: ../../mod/photos.php:1181 +#: ../../mod/photos.php:1178 msgid "Permission denied. Access to this item may be restricted." msgstr "Interdit. L'accès à cet élément peut avoir été restreint." -#: ../../mod/photos.php:1183 +#: ../../mod/photos.php:1180 msgid "Photo not available" msgstr "Photo indisponible" -#: ../../mod/photos.php:1239 +#: ../../mod/photos.php:1236 msgid "View photo" msgstr "Voir photo" -#: ../../mod/photos.php:1239 +#: ../../mod/photos.php:1236 msgid "Edit photo" msgstr "Éditer la photo" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1237 msgid "Use as profile photo" msgstr "Utiliser comme photo de profil" -#: ../../mod/photos.php:1246 ../../mod/content.php:603 -#: ../../object/Item.php:103 +#: ../../mod/photos.php:1243 ../../mod/content.php:603 +#: ../../object/Item.php:104 msgid "Private Message" msgstr "Message privé" -#: ../../mod/photos.php:1265 +#: ../../mod/photos.php:1262 msgid "View Full Size" msgstr "Voir en taille réelle" -#: ../../mod/photos.php:1339 +#: ../../mod/photos.php:1336 msgid "Tags: " msgstr "Étiquettes: " -#: ../../mod/photos.php:1342 +#: ../../mod/photos.php:1339 msgid "[Remove any tag]" msgstr "[Retirer toutes les étiquettes]" -#: ../../mod/photos.php:1352 +#: ../../mod/photos.php:1349 msgid "Rotate CW (right)" msgstr "Tourner dans le sens des aiguilles d'une montre (vers la droite)" -#: ../../mod/photos.php:1353 +#: ../../mod/photos.php:1350 msgid "Rotate CCW (left)" msgstr "Tourner dans le sens contraire des aiguilles d'une montre (vers la gauche)" -#: ../../mod/photos.php:1355 +#: ../../mod/photos.php:1352 msgid "New album name" msgstr "Nom du nouvel album" -#: ../../mod/photos.php:1358 +#: ../../mod/photos.php:1355 msgid "Caption" msgstr "Titre" -#: ../../mod/photos.php:1360 +#: ../../mod/photos.php:1357 msgid "Add a Tag" msgstr "Ajouter une étiquette" -#: ../../mod/photos.php:1364 +#: ../../mod/photos.php:1361 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Exemples: @bob, @Barbara_Jensen, @jim@example.com, #Californie, #vacances" -#: ../../mod/photos.php:1384 ../../mod/content.php:667 -#: ../../object/Item.php:196 +#: ../../mod/photos.php:1381 ../../mod/content.php:667 +#: ../../object/Item.php:202 msgid "I like this (toggle)" msgstr "J'aime (bascule)" -#: ../../mod/photos.php:1385 ../../mod/content.php:668 -#: ../../object/Item.php:197 +#: ../../mod/photos.php:1382 ../../mod/content.php:668 +#: ../../object/Item.php:203 msgid "I don't like this (toggle)" msgstr "Je n'aime pas (bascule)" -#: ../../mod/photos.php:1386 ../../include/conversation.php:957 +#: ../../mod/photos.php:1383 ../../include/conversation.php:969 msgid "Share" msgstr "Partager" -#: ../../mod/photos.php:1387 ../../mod/editpost.php:118 -#: ../../mod/content.php:482 ../../mod/content.php:845 -#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:620 -#: ../../include/conversation.php:976 ../../object/Item.php:258 +#: ../../mod/photos.php:1384 ../../mod/editpost.php:121 +#: ../../mod/content.php:482 ../../mod/content.php:848 +#: ../../mod/wallmessage.php:152 ../../mod/message.php:300 +#: ../../mod/message.php:488 ../../include/conversation.php:624 +#: ../../include/conversation.php:988 ../../object/Item.php:269 msgid "Please wait" msgstr "Patientez" -#: ../../mod/photos.php:1403 ../../mod/photos.php:1446 -#: ../../mod/photos.php:1517 ../../mod/content.php:690 -#: ../../object/Item.php:555 +#: ../../mod/photos.php:1400 ../../mod/photos.php:1444 +#: ../../mod/photos.php:1516 ../../mod/content.php:690 +#: ../../object/Item.php:567 msgid "This is you" msgstr "C'est vous" -#: ../../mod/photos.php:1405 ../../mod/photos.php:1448 -#: ../../mod/photos.php:1519 ../../mod/content.php:692 ../../boot.php:585 -#: ../../object/Item.php:557 +#: ../../mod/photos.php:1402 ../../mod/photos.php:1446 +#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608 +#: ../../object/Item.php:266 ../../object/Item.php:569 msgid "Comment" msgstr "Commenter" -#: ../../mod/photos.php:1407 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:994 -#: ../../object/Item.php:567 +#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 +#: ../../mod/photos.php:1520 ../../mod/editpost.php:142 +#: ../../mod/content.php:702 ../../include/conversation.php:1006 +#: ../../object/Item.php:579 msgid "Preview" msgstr "Aperçu" -#: ../../mod/photos.php:1489 ../../mod/content.php:439 -#: ../../mod/content.php:723 ../../mod/settings.php:606 +#: ../../mod/photos.php:1488 ../../mod/content.php:439 +#: ../../mod/content.php:724 ../../mod/settings.php:622 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:565 ../../object/Item.php:117 +#: ../../include/conversation.php:569 ../../object/Item.php:118 msgid "Delete" msgstr "Supprimer" @@ -705,7 +695,7 @@ msgid "Community" msgstr "Communauté" #: ../../mod/community.php:61 ../../mod/community.php:86 -#: ../../mod/search.php:159 ../../mod/search.php:185 +#: ../../mod/search.php:162 ../../mod/search.php:188 msgid "No results." msgstr "Aucun résultat." @@ -745,100 +735,100 @@ msgstr "Aucune extension/greffon/application installée" msgid "Item not found" msgstr "Élément introuvable" -#: ../../mod/editpost.php:36 +#: ../../mod/editpost.php:39 msgid "Edit post" msgstr "Éditer la publication" -#: ../../mod/editpost.php:88 ../../include/conversation.php:943 +#: ../../mod/editpost.php:91 ../../include/conversation.php:955 msgid "Post to Email" msgstr "Publier aussi par courriel" -#: ../../mod/editpost.php:103 ../../mod/content.php:710 -#: ../../mod/settings.php:605 ../../object/Item.php:107 +#: ../../mod/editpost.php:106 ../../mod/content.php:711 +#: ../../mod/settings.php:621 ../../object/Item.php:108 msgid "Edit" msgstr "Éditer" -#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 -#: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:958 +#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150 +#: ../../mod/message.php:298 ../../mod/message.php:485 +#: ../../include/conversation.php:970 msgid "Upload photo" msgstr "Joindre photo" -#: ../../mod/editpost.php:105 ../../include/conversation.php:959 +#: ../../mod/editpost.php:108 ../../include/conversation.php:971 msgid "upload photo" msgstr "envoi image" -#: ../../mod/editpost.php:106 ../../include/conversation.php:960 +#: ../../mod/editpost.php:109 ../../include/conversation.php:972 msgid "Attach file" msgstr "Joindre fichier" -#: ../../mod/editpost.php:107 ../../include/conversation.php:961 +#: ../../mod/editpost.php:110 ../../include/conversation.php:973 msgid "attach file" msgstr "ajout fichier" -#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 -#: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:962 +#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151 +#: ../../mod/message.php:299 ../../mod/message.php:486 +#: ../../include/conversation.php:974 msgid "Insert web link" msgstr "Insérer lien web" -#: ../../mod/editpost.php:109 ../../include/conversation.php:963 +#: ../../mod/editpost.php:112 ../../include/conversation.php:975 msgid "web link" msgstr "lien web" -#: ../../mod/editpost.php:110 ../../include/conversation.php:964 +#: ../../mod/editpost.php:113 ../../include/conversation.php:976 msgid "Insert video link" msgstr "Insérer un lien video" -#: ../../mod/editpost.php:111 ../../include/conversation.php:965 +#: ../../mod/editpost.php:114 ../../include/conversation.php:977 msgid "video link" msgstr "lien vidéo" -#: ../../mod/editpost.php:112 ../../include/conversation.php:966 +#: ../../mod/editpost.php:115 ../../include/conversation.php:978 msgid "Insert audio link" msgstr "Insérer un lien audio" -#: ../../mod/editpost.php:113 ../../include/conversation.php:967 +#: ../../mod/editpost.php:116 ../../include/conversation.php:979 msgid "audio link" msgstr "lien audio" -#: ../../mod/editpost.php:114 ../../include/conversation.php:968 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set your location" msgstr "Définir votre localisation" -#: ../../mod/editpost.php:115 ../../include/conversation.php:969 +#: ../../mod/editpost.php:118 ../../include/conversation.php:981 msgid "set location" msgstr "spéc. localisation" -#: ../../mod/editpost.php:116 ../../include/conversation.php:970 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Clear browser location" msgstr "Effacer la localisation du navigateur" -#: ../../mod/editpost.php:117 ../../include/conversation.php:971 +#: ../../mod/editpost.php:120 ../../include/conversation.php:983 msgid "clear location" msgstr "supp. localisation" -#: ../../mod/editpost.php:119 ../../include/conversation.php:977 +#: ../../mod/editpost.php:122 ../../include/conversation.php:989 msgid "Permission settings" msgstr "Réglages des permissions" -#: ../../mod/editpost.php:127 ../../include/conversation.php:986 +#: ../../mod/editpost.php:130 ../../include/conversation.php:998 msgid "CC: email addresses" msgstr "CC: adresses de courriel" -#: ../../mod/editpost.php:128 ../../include/conversation.php:987 +#: ../../mod/editpost.php:131 ../../include/conversation.php:999 msgid "Public post" msgstr "Notice publique" -#: ../../mod/editpost.php:131 ../../include/conversation.php:973 +#: ../../mod/editpost.php:134 ../../include/conversation.php:985 msgid "Set title" msgstr "Définir un titre" -#: ../../mod/editpost.php:133 ../../include/conversation.php:975 +#: ../../mod/editpost.php:136 ../../include/conversation.php:987 msgid "Categories (comma-separated list)" msgstr "Catégories (séparées par des virgules)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:989 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1001 msgid "Example: bob@example.com, mary@example.com" msgstr "Exemple: bob@exemple.com, mary@exemple.com" @@ -923,7 +913,7 @@ msgstr "URL de profil invalide." msgid "Disallowed profile URL." msgstr "URL de profil interdite." -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123 +#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124 msgid "Failed to update contact record." msgstr "Échec de mise-à-jour du contact." @@ -959,7 +949,7 @@ msgstr "Merci de confirmer votre demande d'introduction auprès de %s." msgid "Confirm" msgstr "Confirmer" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356 msgid "[Name Withheld]" msgstr "[Nom non-publié]" @@ -1011,7 +1001,7 @@ msgstr "Friendica" msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640 +#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" @@ -1031,6 +1021,64 @@ msgstr "Votre adresse d'identité:" msgid "Submit Request" msgstr "Envoyer la requête" +#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138 +msgid "Account settings" +msgstr "Compte" + +#: ../../mod/uexport.php:14 ../../mod/settings.php:40 +msgid "Display settings" +msgstr "Affichage" + +#: ../../mod/uexport.php:20 ../../mod/settings.php:46 +msgid "Connector settings" +msgstr "Connecteurs" + +#: ../../mod/uexport.php:25 ../../mod/settings.php:51 +msgid "Plugin settings" +msgstr "Extensions" + +#: ../../mod/uexport.php:30 ../../mod/settings.php:56 +msgid "Connected apps" +msgstr "Applications connectées" + +#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61 +msgid "Export personal data" +msgstr "Exporter" + +#: ../../mod/uexport.php:40 ../../mod/settings.php:66 +msgid "Remove account" +msgstr "Supprimer le compte" + +#: ../../mod/uexport.php:48 ../../mod/settings.php:74 +#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 +#: ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:615 +#: ../../include/nav.php:138 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon.old/mathjax/mathjax.php:36 +msgid "Settings" +msgstr "Réglages" + +#: ../../mod/uexport.php:72 +msgid "Export account" +msgstr "Exporter le compte" + +#: ../../mod/uexport.php:72 +msgid "" +"Export your account info and contacts. Use this to make a backup of your " +"account and/or to move it to another server." +msgstr "Exportez votre compte, vos infos et vos contacts. Vous pourrez utiliser le résultat comme sauvegarde et/ou pour le ré-importer sur un autre serveur." + +#: ../../mod/uexport.php:73 +msgid "Export all" +msgstr "Tout exporter" + +#: ../../mod/uexport.php:73 +msgid "" +"Export your accout info, contacts and all your items as json. Could be a " +"very big file, and could take a lot of time. Use this to make a full backup " +"of your account (photos are not exported)" +msgstr "Exportez votre compte, vos infos, vos contacts et toutes vos publications (en JSON). Le fichier résultant peut être extrêmement volumineux, et sa production peut durer longtemps. Vous pourrez l'utiliser pour faire une sauvegarde complète (à part les photos)." + #: ../../mod/install.php:117 msgid "Friendica Social Communications Server - Setup" msgstr "Serveur de communications sociales Friendica - Installation" @@ -1352,7 +1400,7 @@ msgid "is interested in:" msgstr "s'intéresse à:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1175 +#: ../../include/contact_widgets.php:9 ../../boot.php:1216 msgid "Connect" msgstr "Relier" @@ -1369,49 +1417,49 @@ msgstr "Informations de confidentialité indisponibles." msgid "Visible to:" msgstr "Visible par:" -#: ../../mod/content.php:119 ../../mod/network.php:544 +#: ../../mod/content.php:119 ../../mod/network.php:594 msgid "No such group" msgstr "Groupe inexistant" -#: ../../mod/content.php:130 ../../mod/network.php:555 +#: ../../mod/content.php:130 ../../mod/network.php:605 msgid "Group is empty" msgstr "Groupe vide" -#: ../../mod/content.php:134 ../../mod/network.php:559 +#: ../../mod/content.php:134 ../../mod/network.php:609 msgid "Group: " msgstr "Groupe: " -#: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:564 ../../object/Item.php:116 +#: ../../mod/content.php:438 ../../mod/content.php:723 +#: ../../include/conversation.php:568 ../../object/Item.php:117 msgid "Select" msgstr "Sélectionner" -#: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:583 -#: ../../object/Item.php:227 ../../object/Item.php:228 +#: ../../mod/content.php:455 ../../mod/content.php:817 +#: ../../mod/content.php:818 ../../include/conversation.php:587 +#: ../../object/Item.php:234 ../../object/Item.php:235 #, php-format msgid "View %s's profile @ %s" msgstr "Voir le profil de %s @ %s" -#: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:603 ../../object/Item.php:240 +#: ../../mod/content.php:465 ../../mod/content.php:829 +#: ../../include/conversation.php:607 ../../object/Item.php:248 #, php-format msgid "%s from %s" msgstr "%s de %s" -#: ../../mod/content.php:480 ../../include/conversation.php:618 +#: ../../mod/content.php:480 ../../include/conversation.php:622 msgid "View in context" msgstr "Voir dans le contexte" -#: ../../mod/content.php:586 ../../object/Item.php:277 +#: ../../mod/content.php:586 ../../object/Item.php:288 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: ../../mod/content.php:588 ../../include/text.php:1441 -#: ../../object/Item.php:279 ../../object/Item.php:292 +#: ../../mod/content.php:588 ../../include/text.php:1446 +#: ../../object/Item.php:290 ../../object/Item.php:303 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1419,97 +1467,97 @@ msgstr[1] "commentaire" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:586 -#: ../../object/Item.php:280 ../../addon.old/page/page.php:77 +#: ../../include/contact_widgets.php:204 ../../boot.php:609 +#: ../../object/Item.php:291 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "montrer plus" -#: ../../mod/content.php:667 ../../object/Item.php:196 +#: ../../mod/content.php:667 ../../object/Item.php:202 msgid "like" msgstr "aime" -#: ../../mod/content.php:668 ../../object/Item.php:197 +#: ../../mod/content.php:668 ../../object/Item.php:203 msgid "dislike" msgstr "n'aime pas" -#: ../../mod/content.php:670 ../../object/Item.php:199 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "Share this" msgstr "Partager" -#: ../../mod/content.php:670 ../../object/Item.php:199 +#: ../../mod/content.php:670 ../../object/Item.php:205 msgid "share" msgstr "partager" -#: ../../mod/content.php:694 ../../object/Item.php:559 +#: ../../mod/content.php:694 ../../object/Item.php:571 msgid "Bold" msgstr "Gras" -#: ../../mod/content.php:695 ../../object/Item.php:560 +#: ../../mod/content.php:695 ../../object/Item.php:572 msgid "Italic" msgstr "Italique" -#: ../../mod/content.php:696 ../../object/Item.php:561 +#: ../../mod/content.php:696 ../../object/Item.php:573 msgid "Underline" msgstr "Souligné" -#: ../../mod/content.php:697 ../../object/Item.php:562 +#: ../../mod/content.php:697 ../../object/Item.php:574 msgid "Quote" msgstr "Citation" -#: ../../mod/content.php:698 ../../object/Item.php:563 +#: ../../mod/content.php:698 ../../object/Item.php:575 msgid "Code" msgstr "Code" -#: ../../mod/content.php:699 ../../object/Item.php:564 +#: ../../mod/content.php:699 ../../object/Item.php:576 msgid "Image" msgstr "Image" -#: ../../mod/content.php:700 ../../object/Item.php:565 +#: ../../mod/content.php:700 ../../object/Item.php:577 msgid "Link" msgstr "Lien" -#: ../../mod/content.php:701 ../../object/Item.php:566 +#: ../../mod/content.php:701 ../../object/Item.php:578 msgid "Video" msgstr "Vidéo" -#: ../../mod/content.php:735 ../../object/Item.php:180 +#: ../../mod/content.php:736 ../../object/Item.php:181 msgid "add star" msgstr "mett en avant" -#: ../../mod/content.php:736 ../../object/Item.php:181 +#: ../../mod/content.php:737 ../../object/Item.php:182 msgid "remove star" msgstr "ne plus mettre en avant" -#: ../../mod/content.php:737 ../../object/Item.php:182 +#: ../../mod/content.php:738 ../../object/Item.php:183 msgid "toggle star status" msgstr "mettre en avant" -#: ../../mod/content.php:740 ../../object/Item.php:185 +#: ../../mod/content.php:741 ../../object/Item.php:186 msgid "starred" msgstr "mis en avant" -#: ../../mod/content.php:741 ../../object/Item.php:186 +#: ../../mod/content.php:742 ../../object/Item.php:191 msgid "add tag" msgstr "ajouter un tag" -#: ../../mod/content.php:745 ../../object/Item.php:120 +#: ../../mod/content.php:746 ../../object/Item.php:121 msgid "save to folder" msgstr "sauver vers dossier" -#: ../../mod/content.php:817 ../../object/Item.php:229 +#: ../../mod/content.php:819 ../../object/Item.php:236 msgid "to" msgstr "à" -#: ../../mod/content.php:818 ../../object/Item.php:230 +#: ../../mod/content.php:820 ../../object/Item.php:238 msgid "Wall-to-Wall" msgstr "Inter-mur" -#: ../../mod/content.php:819 ../../object/Item.php:231 +#: ../../mod/content.php:821 ../../object/Item.php:239 msgid "via Wall-To-Wall:" msgstr "en Inter-mur:" -#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179 +#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179 #: ../../addon.old/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -1525,8 +1573,8 @@ msgid "Discard" msgstr "Rejeter" #: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:321 -#: ../../mod/contacts.php:375 +#: ../../mod/notifications.php:209 ../../mod/contacts.php:325 +#: ../../mod/contacts.php:379 msgid "Ignore" msgstr "Ignorer" @@ -1538,21 +1586,21 @@ msgstr "Système" msgid "Network" msgstr "Réseau" -#: ../../mod/notifications.php:88 ../../mod/network.php:407 +#: ../../mod/notifications.php:88 ../../mod/network.php:444 msgid "Personal" msgstr "Personnel" #: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 -#: ../../include/nav.php:77 ../../include/nav.php:115 +#: ../../include/nav.php:77 ../../include/nav.php:116 msgid "Home" msgstr "Profil" -#: ../../mod/notifications.php:98 ../../include/nav.php:121 +#: ../../mod/notifications.php:98 ../../include/nav.php:122 msgid "Introductions" msgstr "Introductions" -#: ../../mod/notifications.php:103 ../../mod/message.php:176 -#: ../../include/nav.php:128 +#: ../../mod/notifications.php:103 ../../mod/message.php:180 +#: ../../include/nav.php:129 msgid "Messages" msgstr "Messages" @@ -1578,7 +1626,7 @@ msgid "suggested by %s" msgstr "suggéré(e) par %s" #: ../../mod/notifications.php:156 ../../mod/notifications.php:203 -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:385 msgid "Hide this contact from others" msgstr "Cacher ce contact aux autres" @@ -1635,7 +1683,7 @@ msgstr "Nouvel abonné" msgid "No introductions." msgstr "Aucune demande d'introduction." -#: ../../mod/notifications.php:219 ../../include/nav.php:122 +#: ../../mod/notifications.php:219 ../../include/nav.php:123 msgid "Notifications" msgstr "Notifications" @@ -1700,307 +1748,309 @@ msgstr "Aucune notification de la page d'accueil." msgid "Home Notifications" msgstr "Notifications de page d'accueil" -#: ../../mod/contacts.php:84 ../../mod/contacts.php:164 +#: ../../mod/contacts.php:85 ../../mod/contacts.php:165 msgid "Could not access contact record." msgstr "Impossible d'accéder à l'enregistrement du contact." -#: ../../mod/contacts.php:98 +#: ../../mod/contacts.php:99 msgid "Could not locate selected profile." msgstr "Impossible de localiser le profil séléctionné." -#: ../../mod/contacts.php:121 +#: ../../mod/contacts.php:122 msgid "Contact updated." msgstr "Contact mis-à-jour." -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been blocked" msgstr "Le contact a été bloqué" -#: ../../mod/contacts.php:186 +#: ../../mod/contacts.php:187 msgid "Contact has been unblocked" msgstr "Le contact n'est plus bloqué" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been ignored" msgstr "Le contact a été ignoré" -#: ../../mod/contacts.php:200 +#: ../../mod/contacts.php:201 msgid "Contact has been unignored" msgstr "Le contact n'est plus ignoré" -#: ../../mod/contacts.php:216 +#: ../../mod/contacts.php:220 msgid "Contact has been archived" msgstr "Contact archivé" -#: ../../mod/contacts.php:216 +#: ../../mod/contacts.php:220 msgid "Contact has been unarchived" msgstr "Contact désarchivé" -#: ../../mod/contacts.php:229 +#: ../../mod/contacts.php:233 msgid "Contact has been removed." msgstr "Ce contact a été retiré." -#: ../../mod/contacts.php:263 +#: ../../mod/contacts.php:267 #, php-format msgid "You are mutual friends with %s" msgstr "Vous êtes ami (et réciproquement) avec %s" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:271 #, php-format msgid "You are sharing with %s" msgstr "Vous partagez avec %s" -#: ../../mod/contacts.php:272 +#: ../../mod/contacts.php:276 #, php-format msgid "%s is sharing with you" msgstr "%s partage avec vous" -#: ../../mod/contacts.php:289 +#: ../../mod/contacts.php:293 msgid "Private communications are not available for this contact." msgstr "Les communications privées ne sont pas disponibles pour ce contact." -#: ../../mod/contacts.php:292 +#: ../../mod/contacts.php:296 msgid "Never" msgstr "Jamais" -#: ../../mod/contacts.php:296 +#: ../../mod/contacts.php:300 msgid "(Update was successful)" msgstr "(Mise à jour effectuée avec succès)" -#: ../../mod/contacts.php:296 +#: ../../mod/contacts.php:300 msgid "(Update was not successful)" msgstr "(Mise à jour échouée)" -#: ../../mod/contacts.php:298 +#: ../../mod/contacts.php:302 msgid "Suggest friends" msgstr "Suggérer amitié/contact" -#: ../../mod/contacts.php:302 +#: ../../mod/contacts.php:306 #, php-format msgid "Network type: %s" msgstr "Type de réseau %s" -#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190 +#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "%d contact en commun" msgstr[1] "%d contacts en commun" -#: ../../mod/contacts.php:310 +#: ../../mod/contacts.php:314 msgid "View all contacts" msgstr "Voir tous les contacts" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:374 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 #: ../../mod/admin.php:698 msgid "Unblock" msgstr "Débloquer" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:374 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 #: ../../mod/admin.php:697 msgid "Block" msgstr "Bloquer" -#: ../../mod/contacts.php:318 +#: ../../mod/contacts.php:322 msgid "Toggle Blocked status" msgstr "(dés)activer l'état \"bloqué\"" -#: ../../mod/contacts.php:321 ../../mod/contacts.php:375 +#: ../../mod/contacts.php:325 ../../mod/contacts.php:379 msgid "Unignore" msgstr "Ne plus ignorer" -#: ../../mod/contacts.php:324 +#: ../../mod/contacts.php:328 msgid "Toggle Ignored status" msgstr "(dés)activer l'état \"ignoré\"" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:332 msgid "Unarchive" msgstr "Désarchiver" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:332 msgid "Archive" msgstr "Archiver" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:335 msgid "Toggle Archive status" msgstr "(dés)activer l'état \"archivé\"" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:338 msgid "Repair" msgstr "Réparer" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:341 msgid "Advanced Contact Settings" msgstr "Réglages avancés du contact" -#: ../../mod/contacts.php:343 +#: ../../mod/contacts.php:347 msgid "Communications lost with this contact!" msgstr "Communications perdues avec ce contact !" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:350 msgid "Contact Editor" msgstr "Éditeur de contact" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:353 msgid "Profile Visibility" msgstr "Visibilité du profil" -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:354 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Merci de choisir le profil que vous souhaitez montrer à %s lorsqu'il vous rend visite de manière sécurisée." -#: ../../mod/contacts.php:351 +#: ../../mod/contacts.php:355 msgid "Contact Information / Notes" msgstr "Informations de contact / Notes" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:356 msgid "Edit contact notes" msgstr "Éditer les notes des contacts" -#: ../../mod/contacts.php:357 ../../mod/contacts.php:549 +#: ../../mod/contacts.php:361 ../../mod/contacts.php:553 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Visiter le profil de %s [%s]" -#: ../../mod/contacts.php:358 +#: ../../mod/contacts.php:362 msgid "Block/Unblock contact" msgstr "Bloquer/débloquer ce contact" -#: ../../mod/contacts.php:359 +#: ../../mod/contacts.php:363 msgid "Ignore contact" msgstr "Ignorer ce contact" -#: ../../mod/contacts.php:360 +#: ../../mod/contacts.php:364 msgid "Repair URL settings" msgstr "Réparer les réglages d'URL" -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:365 msgid "View conversations" msgstr "Voir les conversations" -#: ../../mod/contacts.php:363 +#: ../../mod/contacts.php:367 msgid "Delete contact" msgstr "Effacer ce contact" -#: ../../mod/contacts.php:367 +#: ../../mod/contacts.php:371 msgid "Last update:" msgstr "Dernière mise-à-jour :" -#: ../../mod/contacts.php:369 +#: ../../mod/contacts.php:373 msgid "Update public posts" msgstr "Met ses entrées publiques à jour: " -#: ../../mod/contacts.php:371 ../../mod/admin.php:1170 +#: ../../mod/contacts.php:375 ../../mod/admin.php:1170 msgid "Update now" msgstr "Mettre à jour" -#: ../../mod/contacts.php:378 +#: ../../mod/contacts.php:382 msgid "Currently blocked" msgstr "Actuellement bloqué" -#: ../../mod/contacts.php:379 +#: ../../mod/contacts.php:383 msgid "Currently ignored" msgstr "Actuellement ignoré" -#: ../../mod/contacts.php:380 +#: ../../mod/contacts.php:384 msgid "Currently archived" msgstr "Actuellement archivé" -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:385 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Les réponses et \"j'aime\" à vos contenus publics peuvent être toujours visibles" -#: ../../mod/contacts.php:434 +#: ../../mod/contacts.php:438 msgid "Suggestions" msgstr "Suggestions" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:441 msgid "Suggest potential friends" msgstr "Suggérer des amis potentiels" -#: ../../mod/contacts.php:440 ../../mod/group.php:191 +#: ../../mod/contacts.php:444 ../../mod/group.php:191 msgid "All Contacts" msgstr "Tous les contacts" -#: ../../mod/contacts.php:443 +#: ../../mod/contacts.php:447 msgid "Show all contacts" msgstr "Montrer tous les contacts" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:450 msgid "Unblocked" msgstr "Non-bloqués" -#: ../../mod/contacts.php:449 +#: ../../mod/contacts.php:453 msgid "Only show unblocked contacts" msgstr "Ne montrer que les contacts non-bloqués" -#: ../../mod/contacts.php:453 +#: ../../mod/contacts.php:457 msgid "Blocked" msgstr "Bloqués" -#: ../../mod/contacts.php:456 +#: ../../mod/contacts.php:460 msgid "Only show blocked contacts" msgstr "Ne montrer que les contacts bloqués" -#: ../../mod/contacts.php:460 +#: ../../mod/contacts.php:464 msgid "Ignored" msgstr "Ignorés" -#: ../../mod/contacts.php:463 +#: ../../mod/contacts.php:467 msgid "Only show ignored contacts" msgstr "Ne montrer que les contacts ignorés" -#: ../../mod/contacts.php:467 +#: ../../mod/contacts.php:471 msgid "Archived" msgstr "Archivés" -#: ../../mod/contacts.php:470 +#: ../../mod/contacts.php:474 msgid "Only show archived contacts" msgstr "Ne montrer que les contacts archivés" -#: ../../mod/contacts.php:474 +#: ../../mod/contacts.php:478 msgid "Hidden" msgstr "Cachés" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:481 msgid "Only show hidden contacts" msgstr "Ne montrer que les contacts masqués" -#: ../../mod/contacts.php:525 +#: ../../mod/contacts.php:529 msgid "Mutual Friendship" msgstr "Relation réciproque" -#: ../../mod/contacts.php:529 +#: ../../mod/contacts.php:533 msgid "is a fan of yours" msgstr "Vous suit" -#: ../../mod/contacts.php:533 +#: ../../mod/contacts.php:537 msgid "you are a fan of" msgstr "Vous le/la suivez" -#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Éditer le contact" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 -#: ../../include/nav.php:139 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:88 +#: ../../include/nav.php:142 msgid "Contacts" msgstr "Contacts" -#: ../../mod/contacts.php:575 +#: ../../mod/contacts.php:579 msgid "Search your contacts" msgstr "Rechercher dans vos contacts" -#: ../../mod/contacts.php:576 ../../mod/directory.php:59 +#: ../../mod/contacts.php:580 ../../mod/directory.php:59 +#: ../../addon/forumdirectory/forumdirectory.php:81 msgid "Finding: " msgstr "Trouvé: " -#: ../../mod/contacts.php:577 ../../mod/directory.php:61 +#: ../../mod/contacts.php:581 ../../mod/directory.php:61 +#: ../../addon/forumdirectory/forumdirectory.php:83 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Trouver" @@ -2019,13 +2069,13 @@ msgid "Password reset requested at %s" msgstr "Requête de réinitialisation de mot de passe à %s" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:90 ../../mod/register.php:144 +#: ../../mod/register.php:91 ../../mod/register.php:145 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 -#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 +#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2039,7 +2089,7 @@ msgid "" "Password reset failed." msgstr "Impossible d'honorer cette demande. (Vous l'avez peut-être déjà utilisée par le passé.) La réinitialisation a échoué." -#: ../../mod/lostpass.php:83 ../../boot.php:936 +#: ../../mod/lostpass.php:83 ../../boot.php:963 msgid "Password Reset" msgstr "Réinitialiser le mot de passe" @@ -2083,106 +2133,77 @@ msgstr "Pseudo ou Courriel: " msgid "Reset" msgstr "Réinitialiser" -#: ../../mod/settings.php:30 ../../include/nav.php:137 -msgid "Account settings" -msgstr "Compte" - #: ../../mod/settings.php:35 -msgid "Display settings" -msgstr "Affichage" +msgid "Additional features" +msgstr "" -#: ../../mod/settings.php:41 -msgid "Connector settings" -msgstr "Connecteurs" - -#: ../../mod/settings.php:46 -msgid "Plugin settings" -msgstr "Extensions" - -#: ../../mod/settings.php:51 -msgid "Connected apps" -msgstr "Applications connectées" - -#: ../../mod/settings.php:56 -msgid "Export personal data" -msgstr "Exporter" - -#: ../../mod/settings.php:61 -msgid "Remove account" -msgstr "Supprimer le compte" - -#: ../../mod/settings.php:69 ../../mod/newmember.php:22 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 -#: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 -#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 -#: ../../addon.old/mathjax/mathjax.php:36 -msgid "Settings" -msgstr "Réglages" - -#: ../../mod/settings.php:113 +#: ../../mod/settings.php:118 msgid "Missing some important data!" msgstr "Il manque certaines informations importantes!" -#: ../../mod/settings.php:116 ../../mod/settings.php:569 +#: ../../mod/settings.php:121 ../../mod/settings.php:585 msgid "Update" msgstr "Mises-à-jour" -#: ../../mod/settings.php:221 +#: ../../mod/settings.php:226 msgid "Failed to connect with email account using the settings provided." msgstr "Impossible de se connecter au compte courriel configuré." -#: ../../mod/settings.php:226 +#: ../../mod/settings.php:231 msgid "Email settings updated." msgstr "Réglages de courriel mis-à-jour." -#: ../../mod/settings.php:290 +#: ../../mod/settings.php:246 +msgid "Features updated" +msgstr "" + +#: ../../mod/settings.php:306 msgid "Passwords do not match. Password unchanged." msgstr "Les mots de passe ne correspondent pas. Aucun changement appliqué." -#: ../../mod/settings.php:295 +#: ../../mod/settings.php:311 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Les mots de passe vides sont interdits. Aucun changement appliqué." -#: ../../mod/settings.php:306 +#: ../../mod/settings.php:322 msgid "Password changed." msgstr "Mots de passe changés." -#: ../../mod/settings.php:308 +#: ../../mod/settings.php:324 msgid "Password update failed. Please try again." msgstr "Le changement de mot de passe a échoué. Merci de recommencer." -#: ../../mod/settings.php:373 +#: ../../mod/settings.php:389 msgid " Please use a shorter name." msgstr " Merci d'utiliser un nom plus court." -#: ../../mod/settings.php:375 +#: ../../mod/settings.php:391 msgid " Name too short." msgstr " Nom trop court." -#: ../../mod/settings.php:381 +#: ../../mod/settings.php:397 msgid " Not valid email." msgstr " Email invalide." -#: ../../mod/settings.php:383 +#: ../../mod/settings.php:399 msgid " Cannot change to that email." msgstr " Impossible de changer pour cet email." -#: ../../mod/settings.php:437 +#: ../../mod/settings.php:453 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "Ce forum privé n'a pas de paramètres de vie privée. Utilisation des paramètres de confidentialité par défaut." -#: ../../mod/settings.php:441 +#: ../../mod/settings.php:457 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "Ce forum privé n'a pas de paramètres de vie privée ni de paramètres de confidentialité par défaut." -#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495 +#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495 #: ../../addon/fbpost/fbpost.php:144 #: ../../addon/remote_permissions/remote_permissions.php:204 #: ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:389 +#: ../../addon/twitter/twitter.php:501 #: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/fbpost/fbpost.php:144 #: ../../addon.old/impressum/impressum.php:78 @@ -2192,443 +2213,455 @@ msgstr "Ce forum privé n'a pas de paramètres de vie privée ni de paramètres msgid "Settings updated." msgstr "Réglages mis à jour." -#: ../../mod/settings.php:542 ../../mod/settings.php:568 -#: ../../mod/settings.php:604 +#: ../../mod/settings.php:558 ../../mod/settings.php:584 +#: ../../mod/settings.php:620 msgid "Add application" msgstr "Ajouter une application" -#: ../../mod/settings.php:546 ../../mod/settings.php:572 -#: ../../addon/statusnet/statusnet.php:570 +#: ../../mod/settings.php:562 ../../mod/settings.php:588 +#: ../../addon/statusnet/statusnet.php:679 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "Clé utilisateur" -#: ../../mod/settings.php:547 ../../mod/settings.php:573 -#: ../../addon/statusnet/statusnet.php:569 +#: ../../mod/settings.php:563 ../../mod/settings.php:589 +#: ../../addon/statusnet/statusnet.php:678 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "Secret utilisateur" -#: ../../mod/settings.php:548 ../../mod/settings.php:574 +#: ../../mod/settings.php:564 ../../mod/settings.php:590 msgid "Redirect" msgstr "Rediriger" -#: ../../mod/settings.php:549 ../../mod/settings.php:575 +#: ../../mod/settings.php:565 ../../mod/settings.php:591 msgid "Icon url" msgstr "URL de l'icône" -#: ../../mod/settings.php:560 +#: ../../mod/settings.php:576 msgid "You can't edit this application." msgstr "Vous ne pouvez pas éditer cette application." -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:619 msgid "Connected Apps" msgstr "Applications connectées" -#: ../../mod/settings.php:607 +#: ../../mod/settings.php:623 msgid "Client key starts with" msgstr "La clé cliente commence par" -#: ../../mod/settings.php:608 +#: ../../mod/settings.php:624 msgid "No name" msgstr "Sans nom" -#: ../../mod/settings.php:609 +#: ../../mod/settings.php:625 msgid "Remove authorization" msgstr "Révoquer l'autorisation" -#: ../../mod/settings.php:620 +#: ../../mod/settings.php:637 msgid "No Plugin settings configured" msgstr "Pas de réglages d'extensions configurés" -#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123 #: ../../addon.old/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Extensions" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:659 +msgid "Off" +msgstr "" + +#: ../../mod/settings.php:659 +msgid "On" +msgstr "" + +#: ../../mod/settings.php:667 +msgid "Additional Features" +msgstr "" + +#: ../../mod/settings.php:681 ../../mod/settings.php:682 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Le support natif pour la connectivité %s est %s" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "enabled" msgstr "activé" -#: ../../mod/settings.php:640 ../../mod/settings.php:641 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "disabled" msgstr "désactivé" -#: ../../mod/settings.php:641 +#: ../../mod/settings.php:682 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:714 msgid "Email access is disabled on this site." msgstr "L'accès courriel est désactivé sur ce site." -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:720 msgid "Connector Settings" msgstr "Connecteurs" -#: ../../mod/settings.php:684 +#: ../../mod/settings.php:725 msgid "Email/Mailbox Setup" msgstr "Réglages de courriel/boîte à lettre" -#: ../../mod/settings.php:685 +#: ../../mod/settings.php:726 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Si vous souhaitez communiquer avec vos contacts \"courriel\" (facultatif), merci de nous indiquer comment vous connecter à votre boîte." -#: ../../mod/settings.php:686 +#: ../../mod/settings.php:727 msgid "Last successful email check:" msgstr "Dernière vérification réussie des courriels:" -#: ../../mod/settings.php:688 +#: ../../mod/settings.php:729 msgid "IMAP server name:" msgstr "Nom du serveur IMAP:" -#: ../../mod/settings.php:689 +#: ../../mod/settings.php:730 msgid "IMAP port:" msgstr "Port IMAP:" -#: ../../mod/settings.php:690 +#: ../../mod/settings.php:731 msgid "Security:" msgstr "Sécurité:" -#: ../../mod/settings.php:690 ../../mod/settings.php:695 +#: ../../mod/settings.php:731 ../../mod/settings.php:736 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "Aucun(e)" -#: ../../mod/settings.php:691 +#: ../../mod/settings.php:732 msgid "Email login name:" msgstr "Nom de connexion:" -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:733 msgid "Email password:" msgstr "Mot de passe:" -#: ../../mod/settings.php:693 +#: ../../mod/settings.php:734 msgid "Reply-to address:" msgstr "Adresse de réponse:" -#: ../../mod/settings.php:694 +#: ../../mod/settings.php:735 msgid "Send public posts to all email contacts:" msgstr "Les notices publiques vont à tous les contacts courriel:" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Action after import:" msgstr "Action après import:" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Mark as seen" msgstr "Marquer comme vu" -#: ../../mod/settings.php:695 +#: ../../mod/settings.php:736 msgid "Move to folder" msgstr "Déplacer vers" -#: ../../mod/settings.php:696 +#: ../../mod/settings.php:737 msgid "Move to folder:" msgstr "Déplacer vers:" -#: ../../mod/settings.php:727 ../../mod/admin.php:402 +#: ../../mod/settings.php:768 ../../mod/admin.php:402 msgid "No special theme for mobile devices" msgstr "Pas de thème particulier pour les terminaux mobiles" -#: ../../mod/settings.php:767 +#: ../../mod/settings.php:808 msgid "Display Settings" msgstr "Affichage" -#: ../../mod/settings.php:773 ../../mod/settings.php:784 +#: ../../mod/settings.php:814 ../../mod/settings.php:825 msgid "Display Theme:" msgstr "Thème d'affichage:" -#: ../../mod/settings.php:774 +#: ../../mod/settings.php:815 msgid "Mobile Theme:" msgstr "Thème mobile:" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Update browser every xx seconds" msgstr "Mettre-à-jour l'affichage toutes les xx secondes" -#: ../../mod/settings.php:775 +#: ../../mod/settings.php:816 msgid "Minimum of 10 seconds, no maximum" msgstr "Délai minimum de 10 secondes, pas de maximum" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Number of items to display per page:" msgstr "Nombre d’éléments par page:" -#: ../../mod/settings.php:776 +#: ../../mod/settings.php:817 msgid "Maximum of 100 items" msgstr "Maximum de 100 éléments" -#: ../../mod/settings.php:777 +#: ../../mod/settings.php:818 msgid "Don't show emoticons" msgstr "Ne pas afficher les émoticônes (smileys grahiques)" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:894 msgid "Normal Account Page" msgstr "Compte normal" -#: ../../mod/settings.php:854 +#: ../../mod/settings.php:895 msgid "This account is a normal personal profile" msgstr "Ce compte correspond à un profil normal, pour une seule personne (physique, généralement)" -#: ../../mod/settings.php:857 +#: ../../mod/settings.php:898 msgid "Soapbox Page" msgstr "Compte \"boîte à savon\"" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:899 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans 'en lecture seule'" -#: ../../mod/settings.php:861 +#: ../../mod/settings.php:902 msgid "Community Forum/Celebrity Account" msgstr "Compte de communauté/célébrité" -#: ../../mod/settings.php:862 +#: ../../mod/settings.php:903 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des fans en 'lecture/écriture'" -#: ../../mod/settings.php:865 +#: ../../mod/settings.php:906 msgid "Automatic Friend Page" msgstr "Compte d'\"amitié automatique\"" -#: ../../mod/settings.php:866 +#: ../../mod/settings.php:907 msgid "Automatically approve all connection/friend requests as friends" msgstr "Accepter automatiquement toutes les demandes d'amitié/connexion comme étant des amis" -#: ../../mod/settings.php:869 +#: ../../mod/settings.php:910 msgid "Private Forum [Experimental]" msgstr "Forum privé [expérimental]" -#: ../../mod/settings.php:870 +#: ../../mod/settings.php:911 msgid "Private forum - approved members only" msgstr "Forum privé - modéré en inscription" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:882 +#: ../../mod/settings.php:923 msgid "(Optional) Allow this OpenID to login to this account." msgstr "&nbsp;(Facultatif) Autoriser cet OpenID à se connecter à ce compte." -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:933 msgid "Publish your default profile in your local site directory?" msgstr "Publier votre profil par défaut sur l'annuaire local de ce site?" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:939 msgid "Publish your default profile in the global social directory?" msgstr "Publier votre profil par défaut sur l'annuaire social global?" -#: ../../mod/settings.php:906 +#: ../../mod/settings.php:947 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Cacher votre liste de contacts/amis des visiteurs de votre profil par défaut?" -#: ../../mod/settings.php:910 +#: ../../mod/settings.php:951 msgid "Hide your profile details from unknown viewers?" msgstr "Cacher les détails du profil aux visiteurs inconnus?" -#: ../../mod/settings.php:915 +#: ../../mod/settings.php:956 msgid "Allow friends to post to your profile page?" msgstr "Autoriser vos amis à publier sur votre profil?" -#: ../../mod/settings.php:921 +#: ../../mod/settings.php:962 msgid "Allow friends to tag your posts?" msgstr "Autoriser vos amis à tagguer vos notices?" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:968 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Autoriser les suggestions d'amis potentiels aux nouveaux arrivants?" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:974 msgid "Permit unknown people to send you private mail?" msgstr "Autoriser les messages privés d'inconnus?" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:982 msgid "Profile is not published." msgstr "Ce profil n'est pas publié." -#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248 +#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248 msgid "or" msgstr "ou" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:990 msgid "Your Identity Address is" msgstr "L'adresse de votre identité est" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "Automatically expire posts after this many days:" msgstr "Les publications expirent automatiquement après (en jours) :" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:1001 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Si ce champ est vide, les notices n'expireront pas. Les notices expirées seront supprimées" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:1002 msgid "Advanced expiration settings" msgstr "Réglages avancés de l'expiration" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:1003 msgid "Advanced Expiration" msgstr "Expiration (avancé)" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:1004 msgid "Expire posts:" msgstr "Faire expirer les contenus:" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:1005 msgid "Expire personal notes:" msgstr "Faire expirer les notes personnelles:" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:1006 msgid "Expire starred posts:" msgstr "Faire expirer les contenus marqués:" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:1007 msgid "Expire photos:" msgstr "Faire expirer les photos:" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:1008 msgid "Only expire posts by others:" msgstr "Faire expirer seulement les messages des autres :" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:1015 msgid "Account Settings" msgstr "Compte" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:1023 msgid "Password Settings" msgstr "Réglages de mot de passe" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:1024 msgid "New Password:" msgstr "Nouveau mot de passe:" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Confirm:" msgstr "Confirmer:" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1025 msgid "Leave password fields blank unless changing" msgstr "Laissez les champs de mot de passe vierges, sauf si vous désirez les changer" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:1029 msgid "Basic Settings" msgstr "Réglages basiques" -#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Nom complet:" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1031 msgid "Email Address:" msgstr "Adresse courriel:" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1032 msgid "Your Timezone:" msgstr "Votre fuseau horaire:" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1033 msgid "Default Post Location:" msgstr "Publication par défaut depuis :" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1034 msgid "Use Browser Location:" msgstr "Utiliser la localisation géographique du navigateur:" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1037 msgid "Security and Privacy Settings" msgstr "Réglages de sécurité et vie privée" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1039 msgid "Maximum Friend Requests/Day:" msgstr "Nombre maximal de requêtes d'amitié/jour:" -#: ../../mod/settings.php:998 ../../mod/settings.php:1017 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1058 msgid "(to prevent spam abuse)" msgstr "(pour limiter l'impact du spam)" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1040 msgid "Default Post Permissions" msgstr "Permissions par défaut sur les articles" -#: ../../mod/settings.php:1000 +#: ../../mod/settings.php:1041 msgid "(click to open/close)" msgstr "(cliquer pour ouvrir/fermer)" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1058 msgid "Maximum private messages per day from unknown people:" msgstr "Maximum de messages privés d'inconnus par jour:" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1061 msgid "Notification Settings" msgstr "Réglages de notification" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1062 msgid "By default post a status message when:" msgstr "Par défaut, poster un statut quand:" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1063 msgid "accepting a friend request" msgstr "j'accepte un ami" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1064 msgid "joining a forum/community" msgstr "joignant un forum/une communauté" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1065 msgid "making an interesting profile change" msgstr "je fais une modification intéressante de mon profil" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1066 msgid "Send a notification email when:" msgstr "Envoyer un courriel de notification quand:" -#: ../../mod/settings.php:1026 +#: ../../mod/settings.php:1067 msgid "You receive an introduction" msgstr "Vous recevez une introduction" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1068 msgid "Your introductions are confirmed" msgstr "Vos introductions sont confirmées" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1069 msgid "Someone writes on your profile wall" msgstr "Quelqu'un écrit sur votre mur" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1070 msgid "Someone writes a followup comment" msgstr "Quelqu'un vous commente" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1071 msgid "You receive a private message" msgstr "Vous recevez un message privé" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1072 msgid "You receive a friend suggestion" msgstr "Vous avez reçu une suggestion d'ami" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1073 msgid "You are tagged in a post" msgstr "Vous avez été repéré dans une publication" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1074 msgid "You are poked/prodded/etc. in a post" msgstr "Vous avez été sollicité dans une publication" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1077 msgid "Advanced Account/Page Type Settings" msgstr "Paramètres avancés de compte/page" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1078 msgid "Change the behaviour of this account for special situations" msgstr "Modifier le comportement de ce compte dans certaines situations" @@ -2650,63 +2683,64 @@ msgstr "Choisir une identité à gérer: " msgid "Search Results For:" msgstr "Résultats pour:" -#: ../../mod/network.php:221 ../../mod/search.php:18 +#: ../../mod/network.php:224 ../../mod/search.php:21 msgid "Remove term" msgstr "Retirer le terme" -#: ../../mod/network.php:230 ../../mod/search.php:27 +#: ../../mod/network.php:233 ../../mod/search.php:30 +#: ../../include/features.php:41 msgid "Saved Searches" msgstr "Recherches" -#: ../../mod/network.php:231 ../../include/group.php:275 +#: ../../mod/network.php:234 ../../include/group.php:275 msgid "add" msgstr "ajouter" -#: ../../mod/network.php:394 +#: ../../mod/network.php:397 msgid "Commented Order" msgstr "Tri par commentaires" -#: ../../mod/network.php:397 +#: ../../mod/network.php:400 msgid "Sort by Comment Date" msgstr "Trier par date de commentaire" -#: ../../mod/network.php:400 +#: ../../mod/network.php:403 msgid "Posted Order" msgstr "Tri par publications" -#: ../../mod/network.php:403 +#: ../../mod/network.php:406 msgid "Sort by Post Date" msgstr "Trier par date de publication" -#: ../../mod/network.php:410 +#: ../../mod/network.php:447 msgid "Posts that mention or involve you" msgstr "Publications qui vous concernent" -#: ../../mod/network.php:413 +#: ../../mod/network.php:453 msgid "New" msgstr "Nouveau" -#: ../../mod/network.php:416 +#: ../../mod/network.php:456 msgid "Activity Stream - by date" msgstr "Flux d'activités - par date" -#: ../../mod/network.php:419 -msgid "Starred" -msgstr "Mis en avant" - -#: ../../mod/network.php:422 -msgid "Favourite Posts" -msgstr "Publications favorites" - -#: ../../mod/network.php:425 +#: ../../mod/network.php:462 msgid "Shared Links" msgstr "Liens partagés" -#: ../../mod/network.php:428 +#: ../../mod/network.php:465 msgid "Interesting Links" msgstr "Liens intéressants" -#: ../../mod/network.php:496 +#: ../../mod/network.php:471 +msgid "Starred" +msgstr "Mis en avant" + +#: ../../mod/network.php:474 +msgid "Favourite Posts" +msgstr "Publications favorites" + +#: ../../mod/network.php:546 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2714,32 +2748,32 @@ msgid_plural "" msgstr[0] "Attention: Ce groupe contient %s membre d'un réseau non-sûr." msgstr[1] "Attention: Ce groupe contient %s membres d'un réseau non-sûr." -#: ../../mod/network.php:499 +#: ../../mod/network.php:549 msgid "Private messages to this group are at risk of public disclosure." msgstr "Les messages privés envoyés à ce groupe s'exposent à une diffusion incontrôlée." -#: ../../mod/network.php:569 +#: ../../mod/network.php:619 msgid "Contact: " msgstr "Contact: " -#: ../../mod/network.php:571 +#: ../../mod/network.php:621 msgid "Private messages to this person are at risk of public disclosure." msgstr "Les messages privés envoyés à ce contact s'exposent à une diffusion incontrôlée." -#: ../../mod/network.php:576 +#: ../../mod/network.php:626 msgid "Invalid contact." msgstr "Contact invalide." -#: ../../mod/notes.php:44 ../../boot.php:1708 +#: ../../mod/notes.php:44 ../../boot.php:1755 msgid "Personal Notes" msgstr "Notes personnelles" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:263 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:281 #: ../../addon/fbpost/fbpost.php:267 #: ../../addon/dav/friendica/layout.fnk.php:441 -#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688 #: ../../addon.old/facebook/facebook.php:770 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon.old/fbpost/fbpost.php:267 @@ -2748,12 +2782,43 @@ msgstr "Notes personnelles" msgid "Save" msgstr "Sauver" +#: ../../mod/uimport.php:50 ../../mod/register.php:190 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain." + +#: ../../mod/uimport.php:64 +msgid "Import" +msgstr "Importer" + +#: ../../mod/uimport.php:66 +msgid "Move account" +msgstr "Migrer le compte" + +#: ../../mod/uimport.php:67 +msgid "" +"You can import an account from another Friendica server.
\r\n" +" You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.
\r\n" +" This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora" +msgstr "" + +#: ../../mod/uimport.php:70 +msgid "Account file" +msgstr "Fichier du compte" + +#: ../../mod/uimport.php:70 +msgid "" +"To export your accont, go to \"Settings->Export your porsonal data\" and " +"select \"Export account\"" +msgstr "" + #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 #, php-format msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "Nombre de messages de mur quotidiens pour %s dépassé. Échec du message." -#: ../../mod/wallmessage.php:56 ../../mod/message.php:59 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:63 msgid "No recipient selected." msgstr "Pas de destinataire sélectionné." @@ -2761,15 +2826,15 @@ msgstr "Pas de destinataire sélectionné." msgid "Unable to check your home location." msgstr "Impossible de vérifier votre localisation." -#: ../../mod/wallmessage.php:62 ../../mod/message.php:66 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:70 msgid "Message could not be sent." msgstr "Impossible d'envoyer le message." -#: ../../mod/wallmessage.php:65 ../../mod/message.php:69 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:73 msgid "Message collection failure." msgstr "Récupération des messages infructueuse." -#: ../../mod/wallmessage.php:68 ../../mod/message.php:72 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:76 msgid "Message sent." msgstr "Message envoyé." @@ -2778,12 +2843,12 @@ msgid "No recipient." msgstr "Pas de destinataire." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 -#: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../mod/message.php:249 ../../mod/message.php:257 +#: ../../include/conversation.php:905 ../../include/conversation.php:923 msgid "Please enter a link URL:" msgstr "Entrez un lien web:" -#: ../../mod/wallmessage.php:138 ../../mod/message.php:278 +#: ../../mod/wallmessage.php:138 ../../mod/message.php:285 msgid "Send Private Message" msgstr "Envoyer un message privé" @@ -2794,18 +2859,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "Si vous souhaitez que %s réponde, merci de vérifier vos réglages pour autoriser les messages privés venant d'inconnus." -#: ../../mod/wallmessage.php:140 ../../mod/message.php:279 -#: ../../mod/message.php:469 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:286 +#: ../../mod/message.php:476 msgid "To:" msgstr "À:" -#: ../../mod/wallmessage.php:141 ../../mod/message.php:284 -#: ../../mod/message.php:471 +#: ../../mod/wallmessage.php:141 ../../mod/message.php:291 +#: ../../mod/message.php:478 msgid "Subject:" msgstr "Sujet:" -#: ../../mod/wallmessage.php:147 ../../mod/message.php:288 -#: ../../mod/message.php:474 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:147 ../../mod/message.php:295 +#: ../../mod/message.php:481 ../../mod/invite.php:113 msgid "Your message:" msgstr "Votre message:" @@ -2862,7 +2927,7 @@ msgstr "Vérifiez les autres réglages, tout particulièrement ceux liés à la #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1684 +#: ../../boot.php:1731 msgid "Profile" msgstr "Profil" @@ -3033,7 +3098,7 @@ msgstr "Groupe introuvable." msgid "Group name changed." msgstr "Groupe renommé." -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332 msgid "Permission denied" msgstr "Permission refusée" @@ -3085,95 +3150,89 @@ msgstr "Tous les contacts (ayant un accès sécurisé)" msgid "No contacts." msgstr "Aucun contact." -#: ../../mod/viewcontacts.php:76 ../../include/text.php:618 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:625 msgid "View Contacts" msgstr "Voir les contacts" -#: ../../mod/register.php:88 ../../mod/regmod.php:52 +#: ../../mod/register.php:89 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "Détails d'inscription pour %s" -#: ../../mod/register.php:96 +#: ../../mod/register.php:97 msgid "" "Registration successful. Please check your email for further instructions." msgstr "Inscription réussie. Vérifiez vos emails pour la suite des instructions." -#: ../../mod/register.php:100 +#: ../../mod/register.php:101 msgid "Failed to send email message. Here is the message that failed." msgstr "Impossible d'envoyer un email. Voici le message qui a échoué." -#: ../../mod/register.php:105 +#: ../../mod/register.php:106 msgid "Your registration can not be processed." msgstr "Votre inscription ne peut être traitée." -#: ../../mod/register.php:142 +#: ../../mod/register.php:143 #, php-format msgid "Registration request at %s" msgstr "Demande d'inscription à %s" -#: ../../mod/register.php:151 +#: ../../mod/register.php:152 msgid "Your registration is pending approval by the site owner." msgstr "Votre inscription attend une validation du propriétaire du site." -#: ../../mod/register.php:189 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain." - -#: ../../mod/register.php:217 +#: ../../mod/register.php:218 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "Vous pouvez (si vous le souhaitez) remplir ce formulaire via OpenID. Fournissez votre OpenID et cliquez \"S'inscrire\"." -#: ../../mod/register.php:218 +#: ../../mod/register.php:219 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez le reste." -#: ../../mod/register.php:219 +#: ../../mod/register.php:220 msgid "Your OpenID (optional): " msgstr "Votre OpenID (facultatif): " -#: ../../mod/register.php:233 +#: ../../mod/register.php:234 msgid "Include your profile in member directory?" msgstr "Inclure votre profil dans l'annuaire des membres?" -#: ../../mod/register.php:255 +#: ../../mod/register.php:256 msgid "Membership on this site is by invitation only." msgstr "L'inscription à ce site se fait uniquement sur invitation." -#: ../../mod/register.php:256 +#: ../../mod/register.php:257 msgid "Your invitation ID: " msgstr "Votre ID d'invitation: " -#: ../../mod/register.php:259 ../../mod/admin.php:444 +#: ../../mod/register.php:260 ../../mod/admin.php:444 msgid "Registration" msgstr "Inscription" -#: ../../mod/register.php:267 +#: ../../mod/register.php:268 msgid "Your Full Name (e.g. Joe Smith): " msgstr "Votre nom complet (p.ex. Michel Dupont): " -#: ../../mod/register.php:268 +#: ../../mod/register.php:269 msgid "Your Email Address: " msgstr "Votre adresse courriel: " -#: ../../mod/register.php:269 +#: ../../mod/register.php:270 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be " "'nickname@$sitename'." msgstr "Choisissez un pseudo. Celui devra commencer par une lettre. L'adresse de votre profil en découlera sous la forme '<strong>pseudo@$sitename</strong>'." -#: ../../mod/register.php:270 +#: ../../mod/register.php:271 msgid "Choose a nickname: " msgstr "Choisir un pseudo: " -#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923 msgid "Register" msgstr "S'inscrire" @@ -3181,12 +3240,21 @@ msgstr "S'inscrire" msgid "People Search" msgstr "Recherche de personnes" +#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../view/theme/diabook/theme.php:458 ../../include/text.php:1442 +#: ../../include/diaspora.php:1848 ../../include/conversation.php:125 +#: ../../include/conversation.php:253 +#: ../../addon.old/communityhome/communityhome.php:163 +msgid "photo" +msgstr "photo" + #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:452 -#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:453 +#: ../../view/theme/diabook/theme.php:462 ../../include/diaspora.php:1848 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3197,7 +3265,7 @@ msgstr "le statut" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:467 ../../include/diaspora.php:1864 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3211,8 +3279,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s n'aime pas %3$s de %2$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3780 +#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 +#: ../../mod/display.php:169 ../../include/items.php:3843 msgid "Item not found." msgstr "Élément introuvable." @@ -3221,7 +3289,7 @@ msgid "Access denied." msgstr "Accès refusé." #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:51 ../../boot.php:1691 +#: ../../include/nav.php:51 ../../boot.php:1738 msgid "Photos" msgstr "Photos" @@ -3242,43 +3310,43 @@ msgstr "Inscription révoquée pour %s" msgid "Please login." msgstr "Merci de vous connecter." -#: ../../mod/item.php:91 +#: ../../mod/item.php:104 msgid "Unable to locate original post." msgstr "Impossible de localiser l'article original." -#: ../../mod/item.php:275 +#: ../../mod/item.php:288 msgid "Empty post discarded." msgstr "Article vide défaussé." -#: ../../mod/item.php:407 ../../mod/wall_upload.php:133 -#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149 +#: ../../mod/item.php:424 ../../mod/wall_upload.php:135 +#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Photos du mur" -#: ../../mod/item.php:820 +#: ../../mod/item.php:837 msgid "System error. Post not saved." msgstr "Erreur système. Publication non sauvée." -#: ../../mod/item.php:845 +#: ../../mod/item.php:862 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social " "network." msgstr "Ce message vous a été envoyé par %s, membre du réseau social Friendica." -#: ../../mod/item.php:847 +#: ../../mod/item.php:864 #, php-format msgid "You may visit them online at %s" msgstr "Vous pouvez leur rendre visite sur %s" -#: ../../mod/item.php:848 +#: ../../mod/item.php:865 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "Merci de contacter l’émetteur en répondant à cette publication si vous ne souhaitez pas recevoir ces messages." -#: ../../mod/item.php:850 +#: ../../mod/item.php:867 #, php-format msgid "%s posted an update." msgstr "%s a publié une mise à jour." @@ -3316,7 +3384,7 @@ msgstr "Rechargez la page avec la touche Maj pressée, ou bien effacez le cache msgid "Unable to process image" msgstr "Impossible de traiter l'image" -#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88 +#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90 #, php-format msgid "Image exceeds size limit of %d" msgstr "L'image dépasse la taille limite de %d" @@ -3377,71 +3445,71 @@ msgstr "Ceci supprimera totalement votre compte. Cette opération est irréversi msgid "Please enter your password for verification:" msgstr "Merci de saisir votre mot de passe pour vérification:" -#: ../../mod/message.php:9 ../../include/nav.php:131 +#: ../../mod/message.php:9 ../../include/nav.php:132 msgid "New Message" msgstr "Nouveau message" -#: ../../mod/message.php:63 +#: ../../mod/message.php:67 msgid "Unable to locate contact information." msgstr "Impossible de localiser les informations du contact." -#: ../../mod/message.php:191 +#: ../../mod/message.php:195 msgid "Message deleted." msgstr "Message supprimé." -#: ../../mod/message.php:221 +#: ../../mod/message.php:225 msgid "Conversation removed." msgstr "Conversation supprimée." -#: ../../mod/message.php:327 +#: ../../mod/message.php:334 msgid "No messages." msgstr "Aucun message." -#: ../../mod/message.php:334 +#: ../../mod/message.php:341 #, php-format msgid "Unknown sender - %s" msgstr "Émetteur inconnu - %s" -#: ../../mod/message.php:337 +#: ../../mod/message.php:344 #, php-format msgid "You and %s" msgstr "Vous et %s" -#: ../../mod/message.php:340 +#: ../../mod/message.php:347 #, php-format msgid "%s and You" msgstr "%s et vous" -#: ../../mod/message.php:350 ../../mod/message.php:462 +#: ../../mod/message.php:357 ../../mod/message.php:469 msgid "Delete conversation" msgstr "Effacer conversation" -#: ../../mod/message.php:353 +#: ../../mod/message.php:360 msgid "D, d M Y - g:i A" msgstr "D, d M Y - g:i A" -#: ../../mod/message.php:356 +#: ../../mod/message.php:363 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "%d message" msgstr[1] "%d messages" -#: ../../mod/message.php:391 +#: ../../mod/message.php:398 msgid "Message not available." msgstr "Message indisponible." -#: ../../mod/message.php:444 +#: ../../mod/message.php:451 msgid "Delete message" msgstr "Effacer message" -#: ../../mod/message.php:464 +#: ../../mod/message.php:471 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Pas de communications sécurisées possibles. Vous serez peut-être en mesure de répondre depuis la page de profil de l'émetteur." -#: ../../mod/message.php:468 +#: ../../mod/message.php:475 msgid "Send Reply" msgstr "Répondre" @@ -3482,7 +3550,7 @@ msgstr "Mise-à-jour de la base" msgid "Logs" msgstr "Journaux" -#: ../../mod/admin.php:120 ../../include/nav.php:146 +#: ../../mod/admin.php:120 ../../include/nav.php:149 msgid "Admin" msgstr "Admin" @@ -3588,7 +3656,7 @@ msgstr "Politiques" msgid "Advanced" msgstr "Avancé" -#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567 +#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:676 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "Nom du site" @@ -3964,6 +4032,7 @@ msgstr "Date de la demande" #: ../../mod/admin.php:692 ../../mod/admin.php:702 #: ../../include/contact_selectors.php:79 +#: ../../include/contact_selectors.php:86 msgid "Email" msgstr "Courriel" @@ -4099,11 +4168,11 @@ msgstr "Utilisateur FTP" msgid "FTP Password" msgstr "Mot de passe FTP" -#: ../../mod/profile.php:21 ../../boot.php:1085 +#: ../../mod/profile.php:21 ../../boot.php:1126 msgid "Requested profile is not available." msgstr "Le profil demandé n'est pas disponible." -#: ../../mod/profile.php:155 ../../mod/display.php:77 +#: ../../mod/profile.php:155 ../../mod/display.php:87 msgid "Access to this profile has been restricted." msgstr "L'accès au profil a été restreint." @@ -4169,8 +4238,8 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "Compte introuvable, et l'inscription OpenID n'est pas autorisée sur ce site." -#: ../../mod/openid.php:93 ../../include/auth.php:98 -#: ../../include/auth.php:161 +#: ../../mod/openid.php:93 ../../include/auth.php:110 +#: ../../include/auth.php:173 msgid "Login failed." msgstr "Échec de connexion." @@ -4195,7 +4264,7 @@ msgstr "" msgid "link" msgstr "lien" -#: ../../mod/display.php:138 +#: ../../mod/display.php:162 msgid "Item has been removed." msgstr "Cet élément a été enlevé." @@ -4207,8 +4276,8 @@ msgstr "Applications" msgid "No installed applications." msgstr "Pas d'application installée." -#: ../../mod/search.php:96 ../../include/text.php:678 -#: ../../include/text.php:679 ../../include/nav.php:91 +#: ../../mod/search.php:99 ../../include/text.php:685 +#: ../../include/text.php:686 ../../include/nav.php:91 msgid "Search" msgstr "Recherche" @@ -4317,211 +4386,212 @@ msgstr "Nouveau profil créé." msgid "Profile unavailable to clone." msgstr "Ce profil ne peut être cloné." -#: ../../mod/profiles.php:573 +#: ../../mod/profiles.php:576 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Cacher ma liste d'amis/contacts des visiteurs de ce profil?" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:596 msgid "Edit Profile Details" msgstr "Éditer les détails du profil" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:598 msgid "View this profile" msgstr "Voir ce profil" -#: ../../mod/profiles.php:596 +#: ../../mod/profiles.php:599 msgid "Create a new profile using these settings" msgstr "Créer un nouveau profil en utilisant ces réglages" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:600 msgid "Clone this profile" msgstr "Cloner ce profil" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:601 msgid "Delete this profile" msgstr "Supprimer ce profil" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:602 msgid "Profile Name:" msgstr "Nom du profil:" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:603 msgid "Your Full Name:" msgstr "Votre nom complet:" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:604 msgid "Title/Description:" msgstr "Titre/Description:" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:605 msgid "Your Gender:" msgstr "Votre genre:" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:606 #, php-format msgid "Birthday (%s):" msgstr "Anniversaire (%s):" -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:607 msgid "Street Address:" msgstr "Adresse postale:" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:608 msgid "Locality/City:" msgstr "Ville/Localité:" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:609 msgid "Postal/Zip Code:" msgstr "Code postal:" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:610 msgid "Country:" msgstr "Pays:" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:611 msgid "Region/State:" msgstr "Région/État:" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:612 msgid "♥ Marital Status:" msgstr "♥ Statut marital:" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:613 msgid "Who: (if applicable)" msgstr "Qui: (si pertinent)" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:614 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Exemples: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:615 msgid "Since [date]:" msgstr "Depuis [date] :" -#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "Préférence sexuelle:" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:617 msgid "Homepage URL:" msgstr "Page personnelle:" -#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:618 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr " Ville d'origine:" -#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:619 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "Opinions politiques:" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:620 msgid "Religious Views:" msgstr "Opinions religieuses:" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:621 msgid "Public Keywords:" msgstr "Mots-clés publics:" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:622 msgid "Private Keywords:" msgstr "Mots-clés privés:" -#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:623 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "J'aime :" -#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "Je n'aime pas :" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:625 msgid "Example: fishing photography software" msgstr "Exemple: football dessin programmation" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:626 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "(Utilisés pour vous suggérer des amis potentiels, peuvent être vus par autrui)" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:627 msgid "(Used for searching profiles, never shown to others)" msgstr "(Utilisés pour rechercher dans les profils, ne seront jamais montrés à autrui)" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:628 msgid "Tell us about yourself..." msgstr "Parlez-nous de vous..." -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:629 msgid "Hobbies/Interests" msgstr "Passe-temps/Centres d'intérêt" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:630 msgid "Contact information and Social Networks" msgstr "Coordonnées/Réseaux sociaux" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:631 msgid "Musical interests" msgstr "Goûts musicaux" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:632 msgid "Books, literature" msgstr "Lectures" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:633 msgid "Television" msgstr "Télévision" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:634 msgid "Film/dance/culture/entertainment" msgstr "Cinéma/Danse/Culture/Divertissement" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:635 msgid "Love/romance" msgstr "Amour/Romance" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:636 msgid "Work/employment" msgstr "Activité professionnelle/Occupation" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:637 msgid "School/education" msgstr "Études/Formation" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:642 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "Ceci est votre profil public.
Il peut être visible par n'importe quel utilisateur d'Internet." -#: ../../mod/profiles.php:649 ../../mod/directory.php:111 +#: ../../mod/profiles.php:652 ../../mod/directory.php:111 +#: ../../addon/forumdirectory/forumdirectory.php:133 msgid "Age: " msgstr "Age: " -#: ../../mod/profiles.php:688 +#: ../../mod/profiles.php:691 msgid "Edit/Manage Profiles" msgstr "Editer/gérer les profils" -#: ../../mod/profiles.php:689 ../../boot.php:1203 +#: ../../mod/profiles.php:692 ../../boot.php:1244 msgid "Change profile photo" msgstr "Changer de photo de profil" -#: ../../mod/profiles.php:690 ../../boot.php:1204 +#: ../../mod/profiles.php:693 ../../boot.php:1245 msgid "Create New Profile" msgstr "Créer un nouveau profil" -#: ../../mod/profiles.php:701 ../../boot.php:1214 +#: ../../mod/profiles.php:704 ../../boot.php:1255 msgid "Profile Image" msgstr "Image du profil" -#: ../../mod/profiles.php:703 ../../boot.php:1217 +#: ../../mod/profiles.php:706 ../../boot.php:1258 msgid "visible to everybody" msgstr "visible par tous" -#: ../../mod/profiles.php:704 ../../boot.php:1218 +#: ../../mod/profiles.php:707 ../../boot.php:1259 msgid "Edit visibility" msgstr "Changer la visibilité" -#: ../../mod/filer.php:29 ../../include/conversation.php:898 -#: ../../include/conversation.php:915 +#: ../../mod/filer.php:29 ../../include/conversation.php:909 +#: ../../include/conversation.php:927 msgid "Save to Folder:" msgstr "Sauver dans le Dossier:" @@ -4613,7 +4683,7 @@ msgstr "Texte source (format Diaspora) :" msgid "diaspora2bb: " msgstr "diaspora2bb :" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:514 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Suggestions d'amitiés/contacts" @@ -4628,42 +4698,50 @@ msgstr "Aucune suggestion. Si ce site est récent, merci de recommencer dans 24h msgid "Ignore/Hide" msgstr "Ignorer/cacher" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 +#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71 +#: ../../view/theme/diabook/theme.php:512 msgid "Global Directory" msgstr "Annuaire global" -#: ../../mod/directory.php:57 +#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79 msgid "Find on this site" msgstr "Trouver sur ce site" -#: ../../mod/directory.php:60 +#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82 msgid "Site Directory" msgstr "Annuaire local" #: ../../mod/directory.php:114 +#: ../../addon/forumdirectory/forumdirectory.php:136 msgid "Gender: " msgstr "Genre: " -#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1239 +#: ../../mod/directory.php:136 +#: ../../addon/forumdirectory/forumdirectory.php:158 +#: ../../include/profile_advanced.php:17 ../../boot.php:1280 msgid "Gender:" msgstr "Genre:" -#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1242 +#: ../../mod/directory.php:138 +#: ../../addon/forumdirectory/forumdirectory.php:160 +#: ../../include/profile_advanced.php:37 ../../boot.php:1283 msgid "Status:" msgstr "Statut:" -#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1244 +#: ../../mod/directory.php:140 +#: ../../addon/forumdirectory/forumdirectory.php:162 +#: ../../include/profile_advanced.php:48 ../../boot.php:1285 msgid "Homepage:" msgstr "Page personnelle:" -#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58 +#: ../../mod/directory.php:142 +#: ../../addon/forumdirectory/forumdirectory.php:164 +#: ../../include/profile_advanced.php:58 msgid "About:" msgstr "À propos:" #: ../../mod/directory.php:180 +#: ../../addon/forumdirectory/forumdirectory.php:202 msgid "No entries (some entries may be hidden)." msgstr "Aucune entrée (certaines peuvent être cachées)." @@ -5132,27 +5210,27 @@ msgstr "Réglages de suivi automatique sur StatusNet" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "Suivre automatiquement les personnes qui vous suivent ou vous mentionnent sur Statusnet" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:260 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:278 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "Durée de vie du cache (en heures)" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:265 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:283 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "Statistiques du cache" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:268 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:286 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "Nombre d'éléments" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:270 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:288 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "Taille du cache" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:272 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:290 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "Vider le cache" @@ -5521,11 +5599,15 @@ msgstr "Réglages des Planets" msgid "Enable Planets Plugin" msgstr "Activer Planets" +#: ../../addon/forumdirectory/forumdirectory.php:22 +msgid "Forum Directory" +msgstr "" + #: ../../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:64 ../../boot.php:923 +#: ../../include/nav.php:64 ../../boot.php:949 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -5565,7 +5647,7 @@ msgid "Latest likes" msgstr "Dernières approbations" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 +#: ../../view/theme/diabook/theme.php:450 ../../include/text.php:1440 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5719,7 +5801,7 @@ msgstr "Jours" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5730,7 +5812,7 @@ msgstr "Dimanche" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5738,35 +5820,35 @@ msgid "Monday" msgstr "Lundi" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Mardi" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Mercredi" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Jeudi" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Vendredi" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -6134,7 +6216,7 @@ msgstr "Calendrier étendu avec support CalDAV" #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:710 +#: ../../include/enotify.php:28 ../../include/notifier.php:778 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -6488,22 +6570,22 @@ msgstr "Déposer des fichiers ici pour les téléverser" msgid "Failed" msgstr "Échec" -#: ../../addon/js_upload/js_upload.php:297 +#: ../../addon/js_upload/js_upload.php:303 #: ../../addon.old/js_upload/js_upload.php:297 msgid "No files were uploaded." msgstr "Aucun fichier n'a été téléversé." -#: ../../addon/js_upload/js_upload.php:303 +#: ../../addon/js_upload/js_upload.php:309 #: ../../addon.old/js_upload/js_upload.php:303 msgid "Uploaded file is empty" msgstr "Le fichier téléversé est vide" -#: ../../addon/js_upload/js_upload.php:326 +#: ../../addon/js_upload/js_upload.php:332 #: ../../addon.old/js_upload/js_upload.php:326 msgid "File has an invalid extension, it should be one of " msgstr "Le fichier a une extension invalide, elle devrait être parmi " -#: ../../addon/js_upload/js_upload.php:337 +#: ../../addon/js_upload/js_upload.php:343 #: ../../addon.old/js_upload/js_upload.php:337 msgid "Upload was cancelled, or server error encountered" msgstr "Téléversement annulé, ou erreur de serveur" @@ -7203,7 +7285,7 @@ msgstr "Envoyer les liens vers les #-tags et les @-noms sur StatusNet" msgid "Clear OAuth configuration" msgstr "Effacer la configuration OAuth" -#: ../../addon/statusnet/statusnet.php:568 +#: ../../addon/statusnet/statusnet.php:677 #: ../../addon.old/statusnet/statusnet.php:568 msgid "API URL" msgstr "URL de l'API" @@ -7437,11 +7519,11 @@ msgstr "Envoyer les éléments publics sur Twitter par défaut" msgid "Send linked #-tags and @-names to Twitter" msgstr "Envoyer les liens vers les #-tags et les @-noms sur Twitter" -#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396 +#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396 msgid "Consumer key" msgstr "Clé utilisateur" -#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397 +#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397 msgid "Consumer secret" msgstr "Secret utilisateur" @@ -7580,7 +7662,7 @@ msgid "Color scheme" msgstr "Palette de couleurs" #: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 -#: ../../include/nav.php:115 +#: ../../include/nav.php:116 msgid "Your posts and conversations" msgstr "Vos notices et conversations" @@ -7613,101 +7695,101 @@ msgstr "Vos photos personnelles" msgid "Community Pages" msgstr "Pages de Communauté" -#: ../../view/theme/diabook/theme.php:377 -#: ../../view/theme/diabook/theme.php:591 +#: ../../view/theme/diabook/theme.php:378 +#: ../../view/theme/diabook/theme.php:592 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Profils communautaires" -#: ../../view/theme/diabook/theme.php:398 -#: ../../view/theme/diabook/theme.php:596 +#: ../../view/theme/diabook/theme.php:399 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Derniers utilisateurs" -#: ../../view/theme/diabook/theme.php:427 -#: ../../view/theme/diabook/theme.php:598 +#: ../../view/theme/diabook/theme.php:428 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Dernièrement aimé" -#: ../../view/theme/diabook/theme.php:472 -#: ../../view/theme/diabook/theme.php:597 +#: ../../view/theme/diabook/theme.php:473 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Dernières photos" -#: ../../view/theme/diabook/theme.php:509 -#: ../../view/theme/diabook/theme.php:594 +#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:595 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Trouver des amis" -#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:511 msgid "Local Directory" msgstr "Annuaire local" -#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:513 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Intérêts similaires" -#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:515 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Inviter des amis" -#: ../../view/theme/diabook/theme.php:531 -#: ../../view/theme/diabook/theme.php:590 +#: ../../view/theme/diabook/theme.php:532 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Géolocalisation" -#: ../../view/theme/diabook/theme.php:536 +#: ../../view/theme/diabook/theme.php:537 msgid "Set zoomfactor for Earth Layers" msgstr "Régler le niveau de zoom pour la géolocalisation" -#: ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Régler la longitude (X) pour la géolocalisation" -#: ../../view/theme/diabook/theme.php:538 +#: ../../view/theme/diabook/theme.php:539 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Régler la latitude (Y) pour la géolocalisation" -#: ../../view/theme/diabook/theme.php:551 -#: ../../view/theme/diabook/theme.php:592 +#: ../../view/theme/diabook/theme.php:552 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Aide ou @NewHere?" -#: ../../view/theme/diabook/theme.php:558 -#: ../../view/theme/diabook/theme.php:593 +#: ../../view/theme/diabook/theme.php:559 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Connecter des services" -#: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:595 +#: ../../view/theme/diabook/theme.php:566 +#: ../../view/theme/diabook/theme.php:596 msgid "Last Tweets" msgstr "Derniers tweets" -#: ../../view/theme/diabook/theme.php:568 +#: ../../view/theme/diabook/theme.php:569 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Rechercher un terme twitter" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:588 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "cacher" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:588 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "montrer" -#: ../../view/theme/diabook/theme.php:588 +#: ../../view/theme/diabook/theme.php:589 msgid "Show/hide boxes at right-hand column:" msgstr "Montrer/cacher les boîtes dans la colonne de droite :" @@ -7881,6 +7963,10 @@ msgstr "XMPP/IM" msgid "MySpace" msgstr "MySpace" +#: ../../include/contact_selectors.php:87 +msgid "Google+" +msgstr "" + #: ../../include/profile_selectors.php:6 msgid "Male" msgstr "Masculin" @@ -8122,7 +8208,7 @@ msgstr "Débute:" msgid "Finishes:" msgstr "Finit:" -#: ../../include/delivery.php:457 ../../include/notifier.php:703 +#: ../../include/delivery.php:457 ../../include/notifier.php:771 msgid "(no subject)" msgstr "(sans titre)" @@ -8154,218 +8240,218 @@ msgstr "Plus récent" msgid "older" msgstr "Plus ancien" -#: ../../include/text.php:597 +#: ../../include/text.php:604 msgid "No contacts" msgstr "Aucun contact" -#: ../../include/text.php:606 +#: ../../include/text.php:613 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "%d contact" msgstr[1] "%d contacts" -#: ../../include/text.php:719 +#: ../../include/text.php:726 msgid "poke" msgstr "titiller" -#: ../../include/text.php:719 ../../include/conversation.php:210 +#: ../../include/text.php:726 ../../include/conversation.php:210 msgid "poked" msgstr "a titillé" -#: ../../include/text.php:720 +#: ../../include/text.php:727 msgid "ping" msgstr "attirer l'attention" -#: ../../include/text.php:720 +#: ../../include/text.php:727 msgid "pinged" msgstr "a attiré l'attention de" -#: ../../include/text.php:721 +#: ../../include/text.php:728 msgid "prod" msgstr "aiguillonner" -#: ../../include/text.php:721 +#: ../../include/text.php:728 msgid "prodded" msgstr "a aiguillonné" -#: ../../include/text.php:722 +#: ../../include/text.php:729 msgid "slap" msgstr "gifler" -#: ../../include/text.php:722 +#: ../../include/text.php:729 msgid "slapped" msgstr "a giflé" -#: ../../include/text.php:723 +#: ../../include/text.php:730 msgid "finger" msgstr "tripoter" -#: ../../include/text.php:723 +#: ../../include/text.php:730 msgid "fingered" msgstr "a tripoté" -#: ../../include/text.php:724 +#: ../../include/text.php:731 msgid "rebuff" msgstr "rabrouer" -#: ../../include/text.php:724 +#: ../../include/text.php:731 msgid "rebuffed" msgstr "a rabroué" -#: ../../include/text.php:736 +#: ../../include/text.php:743 msgid "happy" msgstr "heureuse" -#: ../../include/text.php:737 +#: ../../include/text.php:744 msgid "sad" msgstr "triste" -#: ../../include/text.php:738 +#: ../../include/text.php:745 msgid "mellow" msgstr "suave" -#: ../../include/text.php:739 +#: ../../include/text.php:746 msgid "tired" msgstr "fatiguée" -#: ../../include/text.php:740 +#: ../../include/text.php:747 msgid "perky" msgstr "guillerette" -#: ../../include/text.php:741 +#: ../../include/text.php:748 msgid "angry" msgstr "colérique" -#: ../../include/text.php:742 +#: ../../include/text.php:749 msgid "stupified" msgstr "stupéfaite" -#: ../../include/text.php:743 +#: ../../include/text.php:750 msgid "puzzled" msgstr "perplexe" -#: ../../include/text.php:744 +#: ../../include/text.php:751 msgid "interested" msgstr "intéressée" -#: ../../include/text.php:745 +#: ../../include/text.php:752 msgid "bitter" msgstr "amère" -#: ../../include/text.php:746 +#: ../../include/text.php:753 msgid "cheerful" msgstr "entraînante" -#: ../../include/text.php:747 +#: ../../include/text.php:754 msgid "alive" msgstr "vivante" -#: ../../include/text.php:748 +#: ../../include/text.php:755 msgid "annoyed" msgstr "ennuyée" -#: ../../include/text.php:749 +#: ../../include/text.php:756 msgid "anxious" msgstr "anxieuse" -#: ../../include/text.php:750 +#: ../../include/text.php:757 msgid "cranky" msgstr "excentrique" -#: ../../include/text.php:751 +#: ../../include/text.php:758 msgid "disturbed" msgstr "dérangée" -#: ../../include/text.php:752 +#: ../../include/text.php:759 msgid "frustrated" msgstr "frustrée" -#: ../../include/text.php:753 +#: ../../include/text.php:760 msgid "motivated" msgstr "motivée" -#: ../../include/text.php:754 +#: ../../include/text.php:761 msgid "relaxed" msgstr "détendue" -#: ../../include/text.php:755 +#: ../../include/text.php:762 msgid "surprised" msgstr "surprise" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "January" msgstr "Janvier" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "February" msgstr "Février" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "March" msgstr "Mars" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "April" msgstr "Avril" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "May" msgstr "Mai" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "June" msgstr "Juin" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "July" msgstr "Juillet" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "August" msgstr "Août" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "September" msgstr "Septembre" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "October" msgstr "Octobre" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "November" msgstr "Novembre" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "December" msgstr "Décembre" -#: ../../include/text.php:1005 +#: ../../include/text.php:1010 msgid "bytes" msgstr "octets" -#: ../../include/text.php:1032 ../../include/text.php:1044 +#: ../../include/text.php:1037 ../../include/text.php:1049 msgid "Click to open/close" msgstr "Cliquer pour ouvrir/fermer" -#: ../../include/text.php:1217 ../../include/user.php:236 +#: ../../include/text.php:1222 ../../include/user.php:236 msgid "default" msgstr "défaut" -#: ../../include/text.php:1229 +#: ../../include/text.php:1234 msgid "Select an alternate language" msgstr "Choisir une langue alternative" -#: ../../include/text.php:1439 +#: ../../include/text.php:1444 msgid "activity" msgstr "activité" -#: ../../include/text.php:1442 +#: ../../include/text.php:1447 msgid "post" msgstr "publication" -#: ../../include/text.php:1597 +#: ../../include/text.php:1602 msgid "Item filed" msgstr "Élément classé" @@ -8373,11 +8459,11 @@ msgstr "Élément classé" msgid "Sharing notification from Diaspora network" msgstr "Notification de partage du réseau Diaspora" -#: ../../include/diaspora.php:2222 +#: ../../include/diaspora.php:2236 msgid "Attachments:" msgstr "Pièces jointes : " -#: ../../include/network.php:849 +#: ../../include/network.php:847 msgid "view full size" msgstr "voir en pleine taille" @@ -8389,6 +8475,46 @@ msgstr "Contenu incorporé" msgid "Embedding disabled" msgstr "Incorporation désactivée" +#: ../../include/uimport.php:61 +msgid "Error decoding account file" +msgstr "" + +#: ../../include/uimport.php:67 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "" + +#: ../../include/uimport.php:72 +msgid "Error! I can't import this file: DB schema version is not compatible." +msgstr "" + +#: ../../include/uimport.php:81 +msgid "Error! Cannot check nickname" +msgstr "" + +#: ../../include/uimport.php:85 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "" + +#: ../../include/uimport.php:104 +msgid "User creation error" +msgstr "" + +#: ../../include/uimport.php:122 +msgid "User profile creation error" +msgstr "" + +#: ../../include/uimport.php:167 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/uimport.php:245 +msgid "Done. You can now login with your username and password" +msgstr "" + #: ../../include/group.php:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -8420,7 +8546,7 @@ msgstr "Créer un nouveau groupe" msgid "Contacts not in any group" msgstr "Contacts n'appartenant à aucun groupe" -#: ../../include/nav.php:46 ../../boot.php:922 +#: ../../include/nav.php:46 ../../boot.php:948 msgid "Logout" msgstr "Se déconnecter" @@ -8428,7 +8554,7 @@ msgstr "Se déconnecter" msgid "End this session" msgstr "Mettre fin à cette session" -#: ../../include/nav.php:49 ../../boot.php:1677 +#: ../../include/nav.php:49 ../../boot.php:1724 msgid "Status" msgstr "Statut" @@ -8476,55 +8602,63 @@ msgstr "Annuaire des utilisateurs" msgid "Conversations from your friends" msgstr "Conversations de vos amis" -#: ../../include/nav.php:121 +#: ../../include/nav.php:114 +msgid "Network Reset" +msgstr "" + +#: ../../include/nav.php:114 +msgid "Load Network page with no filters" +msgstr "" + +#: ../../include/nav.php:122 msgid "Friend Requests" msgstr "Demande d'amitié" -#: ../../include/nav.php:123 +#: ../../include/nav.php:124 msgid "See all notifications" msgstr "Voir toute notification" -#: ../../include/nav.php:124 +#: ../../include/nav.php:125 msgid "Mark all system notifications seen" msgstr "Marquer toutes les notifications système comme 'vues'" -#: ../../include/nav.php:128 +#: ../../include/nav.php:129 msgid "Private mail" msgstr "Messages privés" -#: ../../include/nav.php:129 +#: ../../include/nav.php:130 msgid "Inbox" msgstr "Messages entrants" -#: ../../include/nav.php:130 +#: ../../include/nav.php:131 msgid "Outbox" msgstr "Messages sortants" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage" msgstr "Gérer" -#: ../../include/nav.php:134 +#: ../../include/nav.php:135 msgid "Manage other pages" msgstr "Gérer les autres pages" -#: ../../include/nav.php:138 ../../boot.php:1197 +#: ../../include/nav.php:140 ../../boot.php:1238 msgid "Profiles" msgstr "Profils" -#: ../../include/nav.php:138 ../../boot.php:1197 -msgid "Manage/edit profiles" -msgstr "Gérer/éditer les profils" +#: ../../include/nav.php:140 +msgid "Manage/Edit Profiles" +msgstr "" -#: ../../include/nav.php:139 +#: ../../include/nav.php:142 msgid "Manage/edit friends and contacts" msgstr "Gérer/éditer les amitiés et contacts" -#: ../../include/nav.php:146 +#: ../../include/nav.php:149 msgid "Site setup and configuration" msgstr "Démarrage et configuration du site" -#: ../../include/nav.php:170 +#: ../../include/nav.php:173 msgid "Nothing new here" msgstr "Rien de neuf ici" @@ -8567,37 +8701,37 @@ msgstr "Exemples: Robert Morgenstein, Pêche" msgid "Random Profile" msgstr "Profil au hasard" -#: ../../include/contact_widgets.php:68 +#: ../../include/contact_widgets.php:70 msgid "Networks" msgstr "Réseaux" -#: ../../include/contact_widgets.php:71 +#: ../../include/contact_widgets.php:73 msgid "All Networks" msgstr "Tous réseaux" -#: ../../include/contact_widgets.php:98 +#: ../../include/contact_widgets.php:103 ../../include/features.php:59 msgid "Saved Folders" msgstr "Dossiers sauvegardés" -#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129 +#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138 msgid "Everything" msgstr "Tout" -#: ../../include/contact_widgets.php:126 +#: ../../include/contact_widgets.php:135 msgid "Categories" msgstr "Catégories" -#: ../../include/auth.php:35 +#: ../../include/auth.php:36 msgid "Logged out." msgstr "Déconnecté." -#: ../../include/auth.php:114 +#: ../../include/auth.php:126 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "Nous avons eu un souci avec l'OpenID que vous avez fourni. merci de vérifier l'orthographe correcte de ce dernier." -#: ../../include/auth.php:114 +#: ../../include/auth.php:126 msgid "The error message was:" msgstr "Le message d'erreur était :" @@ -8658,12 +8792,12 @@ msgstr "secondes" msgid "%1$d %2$s ago" msgstr "%1$d %2$s auparavant" -#: ../../include/datetime.php:472 ../../include/items.php:1689 +#: ../../include/datetime.php:472 ../../include/items.php:1695 #, php-format msgid "%s's birthday" msgstr "Anniversaire de %s's" -#: ../../include/datetime.php:473 ../../include/items.php:1690 +#: ../../include/datetime.php:473 ../../include/items.php:1696 #, php-format msgid "Happy Birthday %s" msgstr "Joyeux anniversaire, %s !" @@ -8672,24 +8806,152 @@ msgstr "Joyeux anniversaire, %s !" msgid "From: " msgstr "De: " -#: ../../include/bbcode.php:185 ../../include/bbcode.php:406 +#: ../../include/bbcode.php:202 ../../include/bbcode.php:423 msgid "Image/photo" msgstr "Image/photo" -#: ../../include/bbcode.php:371 ../../include/bbcode.php:391 +#: ../../include/bbcode.php:388 ../../include/bbcode.php:408 msgid "$1 wrote:" msgstr "$1 a écrit:" -#: ../../include/bbcode.php:410 ../../include/bbcode.php:411 +#: ../../include/bbcode.php:427 ../../include/bbcode.php:428 msgid "Encrypted content" msgstr "Contenu chiffré" +#: ../../include/features.php:25 +msgid "Multiple Profiles" +msgstr "" + +#: ../../include/features.php:25 +msgid "Ability to create multiple profiles" +msgstr "" + +#: ../../include/features.php:31 +msgid "Richtext Editor" +msgstr "" + +#: ../../include/features.php:31 +msgid "Enable richtext editor" +msgstr "" + +#: ../../include/features.php:32 +msgid "Post Preview" +msgstr "" + +#: ../../include/features.php:32 +msgid "Allow previewing posts and comments before publishing them" +msgstr "" + +#: ../../include/features.php:38 +msgid "Search by Date" +msgstr "" + +#: ../../include/features.php:38 +msgid "Ability to select posts by date ranges" +msgstr "" + +#: ../../include/features.php:39 +msgid "Group Filter" +msgstr "" + +#: ../../include/features.php:39 +msgid "Enable widget to display Network posts only from selected group" +msgstr "" + +#: ../../include/features.php:40 +msgid "Network Filter" +msgstr "" + +#: ../../include/features.php:40 +msgid "Enable widget to display Network posts only from selected network" +msgstr "" + +#: ../../include/features.php:41 +msgid "Save search terms for re-use" +msgstr "" + +#: ../../include/features.php:47 +msgid "Network Personal Tab" +msgstr "" + +#: ../../include/features.php:47 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "" + +#: ../../include/features.php:48 +msgid "Network New Tab" +msgstr "" + +#: ../../include/features.php:48 +msgid "Enable tab to display only new Network posts (from the last 12 hours)" +msgstr "" + +#: ../../include/features.php:49 +msgid "Network Shared Links Tab" +msgstr "" + +#: ../../include/features.php:49 +msgid "Enable tab to display only Network posts with links in them" +msgstr "" + +#: ../../include/features.php:55 +msgid "Multiple Deletion" +msgstr "" + +#: ../../include/features.php:55 +msgid "Select and delete multiple posts/comments at once" +msgstr "" + +#: ../../include/features.php:56 +msgid "Edit Sent Posts" +msgstr "" + +#: ../../include/features.php:56 +msgid "Edit and correct posts and comments after sending" +msgstr "" + +#: ../../include/features.php:57 +msgid "Tagging" +msgstr "" + +#: ../../include/features.php:57 +msgid "Ability to tag existing posts" +msgstr "" + +#: ../../include/features.php:58 +msgid "Post Categories" +msgstr "" + +#: ../../include/features.php:58 +msgid "Add categories to your posts" +msgstr "" + +#: ../../include/features.php:59 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:60 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:60 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:61 +msgid "Star Posts" +msgstr "" + +#: ../../include/features.php:61 +msgid "Ability to mark special posts with a star indicator" +msgstr "" + #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "Impossible de localiser les informations DNS pour le serveur de base de données '%s'" -#: ../../include/message.php:15 ../../include/message.php:171 +#: ../../include/message.php:15 ../../include/message.php:172 msgid "[no subject]" msgstr "[pas de sujet]" @@ -8938,15 +9200,15 @@ msgstr "Impossible de récupérer les informations du contact." msgid "following" msgstr "following" -#: ../../include/items.php:3300 +#: ../../include/items.php:3363 msgid "A new person is sharing with you at " msgstr "Une nouvelle personne partage avec vous à " -#: ../../include/items.php:3300 +#: ../../include/items.php:3363 msgid "You have a new follower at " msgstr "Vous avez un nouvel abonné à " -#: ../../include/items.php:3981 +#: ../../include/items.php:4047 msgid "Archives" msgstr "Archives" @@ -9030,44 +9292,44 @@ msgstr "Merci d'illustrer votre profil d'une image." msgid "Welcome back " msgstr "Bienvenue à nouveau, " -#: ../../include/security.php:354 +#: ../../include/security.php:357 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé." -#: ../../include/Contact.php:111 +#: ../../include/Contact.php:115 msgid "stopped following" msgstr "retiré de la liste de suivi" -#: ../../include/Contact.php:220 ../../include/conversation.php:791 +#: ../../include/Contact.php:225 ../../include/conversation.php:795 msgid "Poke" msgstr "Sollicitations (pokes)" -#: ../../include/Contact.php:221 ../../include/conversation.php:785 +#: ../../include/Contact.php:226 ../../include/conversation.php:789 msgid "View Status" msgstr "Voir les statuts" -#: ../../include/Contact.php:222 ../../include/conversation.php:786 +#: ../../include/Contact.php:227 ../../include/conversation.php:790 msgid "View Profile" msgstr "Voir le profil" -#: ../../include/Contact.php:223 ../../include/conversation.php:787 +#: ../../include/Contact.php:228 ../../include/conversation.php:791 msgid "View Photos" msgstr "Voir les photos" -#: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/Contact.php:229 ../../include/Contact.php:242 +#: ../../include/conversation.php:792 msgid "Network Posts" msgstr "Posts du Réseau" -#: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/Contact.php:230 ../../include/Contact.php:242 +#: ../../include/conversation.php:793 msgid "Edit Contact" msgstr "Éditer le contact" -#: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:790 +#: ../../include/Contact.php:231 ../../include/Contact.php:242 +#: ../../include/conversation.php:794 msgid "Send PM" msgstr "Message privé" @@ -9085,86 +9347,90 @@ msgstr "publication/élément" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s a marqué le %3$s de %2$s comme favori" -#: ../../include/conversation.php:595 ../../object/Item.php:218 +#: ../../include/conversation.php:599 ../../object/Item.php:225 msgid "Categories:" msgstr "Catégories:" -#: ../../include/conversation.php:596 ../../object/Item.php:219 +#: ../../include/conversation.php:600 ../../object/Item.php:226 msgid "Filed under:" msgstr "Rangé sous:" -#: ../../include/conversation.php:681 +#: ../../include/conversation.php:685 msgid "remove" msgstr "enlever" -#: ../../include/conversation.php:685 +#: ../../include/conversation.php:689 msgid "Delete Selected Items" msgstr "Supprimer les éléments sélectionnés" -#: ../../include/conversation.php:784 +#: ../../include/conversation.php:788 msgid "Follow Thread" msgstr "Suivre le fil" -#: ../../include/conversation.php:853 +#: ../../include/conversation.php:857 #, php-format msgid "%s likes this." msgstr "%s aime ça." -#: ../../include/conversation.php:853 +#: ../../include/conversation.php:857 #, php-format msgid "%s doesn't like this." msgstr "%s n'aime pas ça." -#: ../../include/conversation.php:857 +#: ../../include/conversation.php:861 #, php-format msgid "%2$d people like this." msgstr "%2$d personnes aiment ça." -#: ../../include/conversation.php:859 +#: ../../include/conversation.php:863 #, php-format msgid "%2$d people don't like this." msgstr "%2$d personnes n'aiment pas ça." -#: ../../include/conversation.php:865 +#: ../../include/conversation.php:869 msgid "and" msgstr "et" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:875 #, php-format msgid ", and %d other people" msgstr ", et %d autres personnes" -#: ../../include/conversation.php:869 +#: ../../include/conversation.php:877 #, php-format msgid "%s like this." msgstr "%s aiment ça." -#: ../../include/conversation.php:869 +#: ../../include/conversation.php:877 #, php-format msgid "%s don't like this." msgstr "%s n'aiment pas ça." -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:904 ../../include/conversation.php:922 msgid "Visible to everybody" msgstr "Visible par tout le monde" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:906 ../../include/conversation.php:924 msgid "Please enter a video link/URL:" msgstr "Entrez un lien/URL video :" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:907 ../../include/conversation.php:925 msgid "Please enter an audio link/URL:" msgstr "Entrez un lien/URL audio :" -#: ../../include/conversation.php:897 ../../include/conversation.php:914 +#: ../../include/conversation.php:908 ../../include/conversation.php:926 msgid "Tag term:" msgstr "Tag : " -#: ../../include/conversation.php:899 ../../include/conversation.php:916 +#: ../../include/conversation.php:910 ../../include/conversation.php:928 msgid "Where are you right now?" msgstr "Où êtes-vous présentemment?" -#: ../../include/conversation.php:978 +#: ../../include/conversation.php:911 +msgid "Delete item(s)?" +msgstr "" + +#: ../../include/conversation.php:990 msgid "permissions" msgstr "permissions" @@ -9180,105 +9446,117 @@ msgstr "Cette action dépasse les limites définies par votre abonnement." msgid "This action is not available under your subscription plan." msgstr "Cette action n'est pas disponible avec votre abonnement." -#: ../../boot.php:584 +#: ../../boot.php:607 msgid "Delete this item?" msgstr "Effacer cet élément?" -#: ../../boot.php:587 +#: ../../boot.php:610 msgid "show fewer" msgstr "montrer moins" -#: ../../boot.php:794 +#: ../../boot.php:819 #, php-format msgid "Update %s failed. See error logs." msgstr "Mise-à-jour %s échouée. Voir les journaux d'erreur." -#: ../../boot.php:796 +#: ../../boot.php:821 #, php-format msgid "Update Error at %s" msgstr "Erreur de mise-à-jour à %s" -#: ../../boot.php:897 +#: ../../boot.php:922 msgid "Create a New Account" msgstr "Créer un nouveau compte" -#: ../../boot.php:925 +#: ../../boot.php:951 msgid "Nickname or Email address: " msgstr "Pseudo ou courriel: " -#: ../../boot.php:926 +#: ../../boot.php:952 msgid "Password: " msgstr "Mot de passe: " -#: ../../boot.php:929 +#: ../../boot.php:953 +msgid "Remember me" +msgstr "" + +#: ../../boot.php:956 msgid "Or login using OpenID: " msgstr "Ou connectez-vous via OpenID: " -#: ../../boot.php:935 +#: ../../boot.php:962 msgid "Forgot your password?" msgstr "Mot de passe oublié?" -#: ../../boot.php:1046 +#: ../../boot.php:1087 msgid "Requested account is not available." msgstr "Le compte demandé n'est pas disponible." -#: ../../boot.php:1123 +#: ../../boot.php:1164 msgid "Edit profile" msgstr "Editer le profil" -#: ../../boot.php:1189 +#: ../../boot.php:1230 msgid "Message" msgstr "Message" -#: ../../boot.php:1311 ../../boot.php:1397 +#: ../../boot.php:1238 +msgid "Manage/edit profiles" +msgstr "Gérer/éditer les profils" + +#: ../../boot.php:1352 ../../boot.php:1438 msgid "g A l F d" msgstr "g A | F d" -#: ../../boot.php:1312 ../../boot.php:1398 +#: ../../boot.php:1353 ../../boot.php:1439 msgid "F d" msgstr "F d" -#: ../../boot.php:1357 ../../boot.php:1438 +#: ../../boot.php:1398 ../../boot.php:1479 msgid "[today]" msgstr "[aujourd'hui]" -#: ../../boot.php:1369 +#: ../../boot.php:1410 msgid "Birthday Reminders" msgstr "Rappels d'anniversaires" -#: ../../boot.php:1370 +#: ../../boot.php:1411 msgid "Birthdays this week:" msgstr "Anniversaires cette semaine:" -#: ../../boot.php:1431 +#: ../../boot.php:1472 msgid "[No description]" msgstr "[Sans description]" -#: ../../boot.php:1449 +#: ../../boot.php:1490 msgid "Event Reminders" msgstr "Rappels d'événements" -#: ../../boot.php:1450 +#: ../../boot.php:1491 msgid "Events this week:" msgstr "Evénements cette semaine:" -#: ../../boot.php:1680 +#: ../../boot.php:1727 msgid "Status Messages and Posts" msgstr "Messages d'état et publications" -#: ../../boot.php:1687 +#: ../../boot.php:1734 msgid "Profile Details" msgstr "Détails du profil" -#: ../../boot.php:1704 +#: ../../boot.php:1751 msgid "Events and Calendar" msgstr "Événements et agenda" -#: ../../boot.php:1711 +#: ../../boot.php:1758 msgid "Only You Can See This" msgstr "Vous seul pouvez voir ça" -#: ../../index.php:380 +#: ../../object/Item.php:237 +msgid "via" +msgstr "" + +#: ../../index.php:398 msgid "toggle mobile" msgstr "activ. mobile" diff --git a/view/fr/strings.php b/view/fr/strings.php index 41d76a8ced..63e044849a 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -58,7 +58,7 @@ $a->strings["Tag removed"] = "Étiquette enlevée"; $a->strings["Remove Item Tag"] = "Enlever l'étiquette de l'élément"; $a->strings["Select a tag to remove: "] = "Choisir une étiquette à enlever: "; $a->strings["Remove"] = "Utiliser comme photo de profil"; -$a->strings["%s welcomes %s"] = "%s accueille %s"; +$a->strings["%1\$s welcomes %2\$s"] = ""; $a->strings["Authorize application connection"] = "Autoriser l'application à se connecter"; $a->strings["Return to your app and insert this Securty Code:"] = "Retournez à votre application et saisissez ce Code de Sécurité : "; $a->strings["Please login to continue."] = "Merci de vous connecter pour continuer."; @@ -74,9 +74,8 @@ $a->strings["Profile Photos"] = "Photos du profil"; $a->strings["Album not found."] = "Album introuvable."; $a->strings["Delete Album"] = "Effacer l'album"; $a->strings["Delete Photo"] = "Effacer la photo"; -$a->strings["was tagged in a"] = "a été identifié dans"; -$a->strings["photo"] = "photo"; -$a->strings["by"] = "par"; +$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = ""; +$a->strings["a photo"] = ""; $a->strings["Image exceeds size limit of "] = "L'image dépasse la taille maximale de "; $a->strings["Image file is empty."] = "Fichier image vide."; $a->strings["Unable to process image."] = "Impossible de traiter l'image."; @@ -85,7 +84,6 @@ $a->strings["Public access denied."] = "Accès public refusé."; $a->strings["No photos selected"] = "Aucune photo sélectionnée"; $a->strings["Access to this item is restricted."] = "Accès restreint à cet élément."; $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Vous avez utilisé %1$.2f Mo sur %2$.2f d'espace de stockage pour les photos."; -$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Vous avez utilisé %1$.2f Mo d'espace de stockage pour les photos."; $a->strings["Upload Photos"] = "Téléverser des photos"; $a->strings["New album name: "] = "Nom du nouvel album: "; $a->strings["or existing album name: "] = "ou nom d'un album existant: "; @@ -199,6 +197,18 @@ $a->strings["Diaspora"] = "Diaspora"; $a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - merci de ne pas utiliser ce formulaire. Entrez plutôt %s dans votre barre de recherche Diaspora."; $a->strings["Your Identity Address:"] = "Votre adresse d'identité:"; $a->strings["Submit Request"] = "Envoyer la requête"; +$a->strings["Account settings"] = "Compte"; +$a->strings["Display settings"] = "Affichage"; +$a->strings["Connector settings"] = "Connecteurs"; +$a->strings["Plugin settings"] = "Extensions"; +$a->strings["Connected apps"] = "Applications connectées"; +$a->strings["Export personal data"] = "Exporter"; +$a->strings["Remove account"] = "Supprimer le compte"; +$a->strings["Settings"] = "Réglages"; +$a->strings["Export account"] = "Exporter le compte"; +$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportez votre compte, vos infos et vos contacts. Vous pourrez utiliser le résultat comme sauvegarde et/ou pour le ré-importer sur un autre serveur."; +$a->strings["Export all"] = "Tout exporter"; +$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportez votre compte, vos infos, vos contacts et toutes vos publications (en JSON). Le fichier résultant peut être extrêmement volumineux, et sa production peut durer longtemps. Vous pourrez l'utiliser pour faire une sauvegarde complète (à part les photos)."; $a->strings["Friendica Social Communications Server - Setup"] = "Serveur de communications sociales Friendica - Installation"; $a->strings["Could not connect to database."] = "Impossible de se connecter à la base."; $a->strings["Could not create table."] = "Impossible de créer une table."; @@ -442,18 +452,12 @@ $a->strings["Forgot your Password?"] = "Mot de passe oublié?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Entrez votre adresse de courriel et validez pour réinitialiser votre mot de passe. Vous recevrez la suite des instructions par courriel."; $a->strings["Nickname or Email: "] = "Pseudo ou Courriel: "; $a->strings["Reset"] = "Réinitialiser"; -$a->strings["Account settings"] = "Compte"; -$a->strings["Display settings"] = "Affichage"; -$a->strings["Connector settings"] = "Connecteurs"; -$a->strings["Plugin settings"] = "Extensions"; -$a->strings["Connected apps"] = "Applications connectées"; -$a->strings["Export personal data"] = "Exporter"; -$a->strings["Remove account"] = "Supprimer le compte"; -$a->strings["Settings"] = "Réglages"; +$a->strings["Additional features"] = ""; $a->strings["Missing some important data!"] = "Il manque certaines informations importantes!"; $a->strings["Update"] = "Mises-à-jour"; $a->strings["Failed to connect with email account using the settings provided."] = "Impossible de se connecter au compte courriel configuré."; $a->strings["Email settings updated."] = "Réglages de courriel mis-à-jour."; +$a->strings["Features updated"] = ""; $a->strings["Passwords do not match. Password unchanged."] = "Les mots de passe ne correspondent pas. Aucun changement appliqué."; $a->strings["Empty passwords are not allowed. Password unchanged."] = "Les mots de passe vides sont interdits. Aucun changement appliqué."; $a->strings["Password changed."] = "Mots de passe changés."; @@ -477,6 +481,9 @@ $a->strings["No name"] = "Sans nom"; $a->strings["Remove authorization"] = "Révoquer l'autorisation"; $a->strings["No Plugin settings configured"] = "Pas de réglages d'extensions configurés"; $a->strings["Plugin Settings"] = "Extensions"; +$a->strings["Off"] = ""; +$a->strings["On"] = ""; +$a->strings["Additional Features"] = ""; $a->strings["Built-in support for %s connectivity is %s"] = "Le support natif pour la connectivité %s est %s"; $a->strings["enabled"] = "activé"; $a->strings["disabled"] = "désactivé"; @@ -586,10 +593,10 @@ $a->strings["Sort by Post Date"] = "Trier par date de publication"; $a->strings["Posts that mention or involve you"] = "Publications qui vous concernent"; $a->strings["New"] = "Nouveau"; $a->strings["Activity Stream - by date"] = "Flux d'activités - par date"; -$a->strings["Starred"] = "Mis en avant"; -$a->strings["Favourite Posts"] = "Publications favorites"; $a->strings["Shared Links"] = "Liens partagés"; $a->strings["Interesting Links"] = "Liens intéressants"; +$a->strings["Starred"] = "Mis en avant"; +$a->strings["Favourite Posts"] = "Publications favorites"; $a->strings["Warning: This group contains %s member from an insecure network."] = array( 0 => "Attention: Ce groupe contient %s membre d'un réseau non-sûr.", 1 => "Attention: Ce groupe contient %s membres d'un réseau non-sûr.", @@ -600,6 +607,12 @@ $a->strings["Private messages to this person are at risk of public disclosure."] $a->strings["Invalid contact."] = "Contact invalide."; $a->strings["Personal Notes"] = "Notes personnelles"; $a->strings["Save"] = "Sauver"; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain."; +$a->strings["Import"] = "Importer"; +$a->strings["Move account"] = "Migrer le compte"; +$a->strings["You can import an account from another Friendica server.
\r\n You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.
\r\n This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = ""; +$a->strings["Account file"] = "Fichier du compte"; +$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = ""; $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Nombre de messages de mur quotidiens pour %s dépassé. Échec du message."; $a->strings["No recipient selected."] = "Pas de destinataire sélectionné."; $a->strings["Unable to check your home location."] = "Impossible de vérifier votre localisation."; @@ -675,7 +688,6 @@ $a->strings["Failed to send email message. Here is the message that failed."] = $a->strings["Your registration can not be processed."] = "Votre inscription ne peut être traitée."; $a->strings["Registration request at %s"] = "Demande d'inscription à %s"; $a->strings["Your registration is pending approval by the site owner."] = "Votre inscription attend une validation du propriétaire du site."; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Le nombre d'inscriptions quotidiennes pour ce site a été dépassé. Merci de réessayer demain."; $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Vous pouvez (si vous le souhaitez) remplir ce formulaire via OpenID. Fournissez votre OpenID et cliquez \"S'inscrire\"."; $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si vous n'êtes pas familier avec OpenID, laissez ce champ vide et remplissez le reste."; $a->strings["Your OpenID (optional): "] = "Votre OpenID (facultatif): "; @@ -689,6 +701,7 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y $a->strings["Choose a nickname: "] = "Choisir un pseudo: "; $a->strings["Register"] = "S'inscrire"; $a->strings["People Search"] = "Recherche de personnes"; +$a->strings["photo"] = "photo"; $a->strings["status"] = "le statut"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s aime %3\$s de %2\$s"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s n'aime pas %3\$s de %2\$s"; @@ -1207,6 +1220,7 @@ $a->strings["Randomise Page/Forum list"] = "Rendre aléatoire la liste des pages $a->strings["Show pages/forums on profile page"] = "Montrer les forums sur le profil"; $a->strings["Planets Settings"] = "Réglages des Planets"; $a->strings["Enable Planets Plugin"] = "Activer Planets"; +$a->strings["Forum Directory"] = ""; $a->strings["Login"] = "Connexion"; $a->strings["OpenID"] = "OpenID"; $a->strings["Latest users"] = "Derniers utilisateurs"; @@ -1665,6 +1679,7 @@ $a->strings["Zot!"] = "Zot!"; $a->strings["LinkedIn"] = "LinkedIn"; $a->strings["XMPP/IM"] = "XMPP/IM"; $a->strings["MySpace"] = "MySpace"; +$a->strings["Google+"] = ""; $a->strings["Male"] = "Masculin"; $a->strings["Female"] = "Féminin"; $a->strings["Currently Male"] = "Actuellement masculin"; @@ -1794,6 +1809,18 @@ $a->strings["Attachments:"] = "Pièces jointes : "; $a->strings["view full size"] = "voir en pleine taille"; $a->strings["Embedded content"] = "Contenu incorporé"; $a->strings["Embedding disabled"] = "Incorporation désactivée"; +$a->strings["Error decoding account file"] = ""; +$a->strings["Error! No version data in file! This is not a Friendica account file?"] = ""; +$a->strings["Error! I can't import this file: DB schema version is not compatible."] = ""; +$a->strings["Error! Cannot check nickname"] = ""; +$a->strings["User '%s' already exists on this server!"] = ""; +$a->strings["User creation error"] = ""; +$a->strings["User profile creation error"] = ""; +$a->strings["%d contact not imported"] = array( + 0 => "", + 1 => "", +); +$a->strings["Done. You can now login with your username and password"] = ""; $a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un groupe supprimé a été recréé. Les permissions existantes pourraient s'appliquer à ce groupe et aux futurs membres. Si ce n'est pas le comportement attendu, merci de re-créer un autre groupe sous un autre nom."; $a->strings["Default privacy group for new contacts"] = "Paramètres de confidentialité par défaut pour les nouveaux contacts"; $a->strings["Everybody"] = "Tout le monde"; @@ -1815,6 +1842,8 @@ $a->strings["Conversations on this site"] = "Conversations ayant cours sur ce si $a->strings["Directory"] = "Annuaire"; $a->strings["People directory"] = "Annuaire des utilisateurs"; $a->strings["Conversations from your friends"] = "Conversations de vos amis"; +$a->strings["Network Reset"] = ""; +$a->strings["Load Network page with no filters"] = ""; $a->strings["Friend Requests"] = "Demande d'amitié"; $a->strings["See all notifications"] = "Voir toute notification"; $a->strings["Mark all system notifications seen"] = "Marquer toutes les notifications système comme 'vues'"; @@ -1824,7 +1853,7 @@ $a->strings["Outbox"] = "Messages sortants"; $a->strings["Manage"] = "Gérer"; $a->strings["Manage other pages"] = "Gérer les autres pages"; $a->strings["Profiles"] = "Profils"; -$a->strings["Manage/edit profiles"] = "Gérer/éditer les profils"; +$a->strings["Manage/Edit Profiles"] = ""; $a->strings["Manage/edit friends and contacts"] = "Gérer/éditer les amitiés et contacts"; $a->strings["Site setup and configuration"] = "Démarrage et configuration du site"; $a->strings["Nothing new here"] = "Rien de neuf ici"; @@ -1868,6 +1897,38 @@ $a->strings["From: "] = "De: "; $a->strings["Image/photo"] = "Image/photo"; $a->strings["$1 wrote:"] = "$1 a écrit:"; $a->strings["Encrypted content"] = "Contenu chiffré"; +$a->strings["Multiple Profiles"] = ""; +$a->strings["Ability to create multiple profiles"] = ""; +$a->strings["Richtext Editor"] = ""; +$a->strings["Enable richtext editor"] = ""; +$a->strings["Post Preview"] = ""; +$a->strings["Allow previewing posts and comments before publishing them"] = ""; +$a->strings["Search by Date"] = ""; +$a->strings["Ability to select posts by date ranges"] = ""; +$a->strings["Group Filter"] = ""; +$a->strings["Enable widget to display Network posts only from selected group"] = ""; +$a->strings["Network Filter"] = ""; +$a->strings["Enable widget to display Network posts only from selected network"] = ""; +$a->strings["Save search terms for re-use"] = ""; +$a->strings["Network Personal Tab"] = ""; +$a->strings["Enable tab to display only Network posts that you've interacted on"] = ""; +$a->strings["Network New Tab"] = ""; +$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = ""; +$a->strings["Network Shared Links Tab"] = ""; +$a->strings["Enable tab to display only Network posts with links in them"] = ""; +$a->strings["Multiple Deletion"] = ""; +$a->strings["Select and delete multiple posts/comments at once"] = ""; +$a->strings["Edit Sent Posts"] = ""; +$a->strings["Edit and correct posts and comments after sending"] = ""; +$a->strings["Tagging"] = ""; +$a->strings["Ability to tag existing posts"] = ""; +$a->strings["Post Categories"] = ""; +$a->strings["Add categories to your posts"] = ""; +$a->strings["Ability to file posts under folders"] = ""; +$a->strings["Dislike Posts"] = ""; +$a->strings["Ability to dislike posts/comments"] = ""; +$a->strings["Star Posts"] = ""; +$a->strings["Ability to mark special posts with a star indicator"] = ""; $a->strings["Cannot locate DNS info for database server '%s'"] = "Impossible de localiser les informations DNS pour le serveur de base de données '%s'"; $a->strings["[no subject]"] = "[pas de sujet]"; $a->strings["Visible to everybody"] = "Visible par tout le monde"; @@ -1973,6 +2034,7 @@ $a->strings["Please enter a video link/URL:"] = "Entrez un lien/URL video :"; $a->strings["Please enter an audio link/URL:"] = "Entrez un lien/URL audio :"; $a->strings["Tag term:"] = "Tag : "; $a->strings["Where are you right now?"] = "Où êtes-vous présentemment?"; +$a->strings["Delete item(s)?"] = ""; $a->strings["permissions"] = "permissions"; $a->strings["Click here to upgrade."] = "Cliquez ici pour mettre à jour."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Cette action dépasse les limites définies par votre abonnement."; @@ -1984,11 +2046,13 @@ $a->strings["Update Error at %s"] = "Erreur de mise-à-jour à %s"; $a->strings["Create a New Account"] = "Créer un nouveau compte"; $a->strings["Nickname or Email address: "] = "Pseudo ou courriel: "; $a->strings["Password: "] = "Mot de passe: "; +$a->strings["Remember me"] = ""; $a->strings["Or login using OpenID: "] = "Ou connectez-vous via OpenID: "; $a->strings["Forgot your password?"] = "Mot de passe oublié?"; $a->strings["Requested account is not available."] = "Le compte demandé n'est pas disponible."; $a->strings["Edit profile"] = "Editer le profil"; $a->strings["Message"] = "Message"; +$a->strings["Manage/edit profiles"] = "Gérer/éditer les profils"; $a->strings["g A l F d"] = "g A | F d"; $a->strings["F d"] = "F d"; $a->strings["[today]"] = "[aujourd'hui]"; @@ -2001,6 +2065,7 @@ $a->strings["Status Messages and Posts"] = "Messages d'état et publications"; $a->strings["Profile Details"] = "Détails du profil"; $a->strings["Events and Calendar"] = "Événements et agenda"; $a->strings["Only You Can See This"] = "Vous seul pouvez voir ça"; +$a->strings["via"] = ""; $a->strings["toggle mobile"] = "activ. mobile"; $a->strings["Bg settings updated."] = "Réglages d'arrière-plan mis à jour."; $a->strings["Bg Settings"] = "Réglages d'arrière-plan"; diff --git a/view/jot.tpl b/view/jot.tpl index 0f21766812..61d7273070 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -16,7 +16,9 @@
+ {{ if $placeholdercategory }}
+ {{ endif }}
diff --git a/view/pl/messages.po b/view/pl/messages.po index d2884fe16c..3ad43e6fda 100644 --- a/view/pl/messages.po +++ b/view/pl/messages.po @@ -15,6 +15,8 @@ # , 2012. # , 2012. # , 2012. +# , 2012. +# , 2012. # , 2012. # , 2012. # , 2012. @@ -23,9 +25,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-11-11 10:00-0800\n" -"PO-Revision-Date: 2012-11-13 08:34+0000\n" -"Last-Translator: Pitruss \n" +"POT-Creation-Date: 2012-11-22 10:00-0800\n" +"PO-Revision-Date: 2012-11-24 14:35+0000\n" +"Last-Translator: Molka \n" "Language-Team: Polish (http://www.transifex.com/projects/p/friendica/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +77,7 @@ msgstr "Nie udało się zaktualizować kontaktu." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -195,10 +197,10 @@ msgstr "Nowe zdjęcie z tej ścieżki" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:599 +#: ../../view/theme/diabook/theme.php:645 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:564 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -298,12 +300,12 @@ msgstr "d, M d " msgid "Edit event" msgstr "Edytuj wydarzenie" -#: ../../mod/events.php:323 ../../include/text.php:1185 +#: ../../mod/events.php:323 ../../include/text.php:1190 msgid "link to source" msgstr "link do źródła" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:52 ../../boot.php:1745 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 +#: ../../include/nav.php:52 ../../boot.php:1746 msgid "Events" msgstr "Wydarzenia" @@ -361,7 +363,7 @@ msgstr "Opis:" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1275 +#: ../../boot.php:1276 msgid "Location:" msgstr "Lokalizacja" @@ -446,7 +448,7 @@ msgstr "Tak" msgid "No" msgstr "Nie" -#: ../../mod/photos.php:51 ../../boot.php:1738 +#: ../../mod/photos.php:51 ../../boot.php:1739 msgid "Photo Albums" msgstr "Albumy zdjęć" @@ -454,7 +456,7 @@ msgstr "Albumy zdjęć" #: ../../mod/photos.php:1096 ../../mod/photos.php:1111 #: ../../mod/photos.php:1566 ../../mod/photos.php:1578 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:485 +#: ../../view/theme/diabook/theme.php:529 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Zdjęcia kontaktu" @@ -477,7 +479,7 @@ msgstr "Informacje o kontakcie nie dostępne." #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:530 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -604,7 +606,7 @@ msgid "Use as profile photo" msgstr "Ustaw jako zdjęcie profilowe" #: ../../mod/photos.php:1247 ../../mod/content.php:603 -#: ../../object/Item.php:103 +#: ../../object/Item.php:104 msgid "Private Message" msgstr "Wiadomość prywatna" @@ -646,12 +648,12 @@ msgid "" msgstr "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" #: ../../mod/photos.php:1385 ../../mod/content.php:667 -#: ../../object/Item.php:196 +#: ../../object/Item.php:197 msgid "I like this (toggle)" msgstr "Lubię to (zmień)" #: ../../mod/photos.php:1386 ../../mod/content.php:668 -#: ../../object/Item.php:197 +#: ../../object/Item.php:198 msgid "I don't like this (toggle)" msgstr "Nie lubię (zmień)" @@ -660,36 +662,36 @@ msgid "Share" msgstr "Podziel się" #: ../../mod/photos.php:1388 ../../mod/editpost.php:118 -#: ../../mod/content.php:482 ../../mod/content.php:846 +#: ../../mod/content.php:482 ../../mod/content.php:848 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/message.php:481 ../../include/conversation.php:624 -#: ../../include/conversation.php:985 ../../object/Item.php:258 +#: ../../include/conversation.php:985 ../../object/Item.php:263 msgid "Please wait" msgstr "Proszę czekać" #: ../../mod/photos.php:1404 ../../mod/photos.php:1448 #: ../../mod/photos.php:1520 ../../mod/content.php:690 -#: ../../object/Item.php:556 +#: ../../object/Item.php:561 msgid "This is you" msgstr "To jesteś ty" #: ../../mod/photos.php:1406 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:605 -#: ../../object/Item.php:558 +#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:606 +#: ../../object/Item.php:260 ../../object/Item.php:563 msgid "Comment" msgstr "Komentarz" #: ../../mod/photos.php:1408 ../../mod/photos.php:1452 #: ../../mod/photos.php:1524 ../../mod/editpost.php:139 #: ../../mod/content.php:702 ../../include/conversation.php:1003 -#: ../../object/Item.php:568 +#: ../../object/Item.php:573 msgid "Preview" msgstr "Podgląd" #: ../../mod/photos.php:1492 ../../mod/content.php:439 #: ../../mod/content.php:724 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:569 ../../object/Item.php:117 +#: ../../include/conversation.php:569 ../../object/Item.php:118 msgid "Delete" msgstr "Usuń" @@ -705,7 +707,7 @@ msgstr "Ostatnio dodane zdjęcia" msgid "Not available." msgstr "Niedostępne." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 #: ../../include/nav.php:101 msgid "Community" msgstr "Społeczność" @@ -760,7 +762,7 @@ msgid "Post to Email" msgstr "Wyślij poprzez email" #: ../../mod/editpost.php:103 ../../mod/content.php:711 -#: ../../mod/settings.php:605 ../../object/Item.php:107 +#: ../../mod/settings.php:605 ../../object/Item.php:108 msgid "Edit" msgstr "Edytuj" @@ -946,7 +948,7 @@ msgstr "Proszę zalogować się do potwierdzenia wstępu." msgid "" "Incorrect identity currently logged in. Please login to " "this profile." -msgstr "" +msgstr "Niepoprawna tożsamość obecnego użytkownika. Proszę zalogować się na tego użytkownika. " #: ../../mod/dfrn_request.php:669 msgid "Hide this contact" @@ -966,7 +968,7 @@ msgstr "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s." msgid "Confirm" msgstr "Potwierdź" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356 msgid "[Name Withheld]" msgstr "[Nazwa wstrzymana]" @@ -1069,8 +1071,9 @@ msgstr "Usuń konto" #: ../../mod/uexport.php:48 ../../mod/settings.php:69 #: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 -#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:387 +#: ../../view/theme/diabook/theme.php:661 ../../include/nav.php:137 +#: ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" msgstr "Ustawienia" @@ -1269,7 +1272,7 @@ msgstr "" #: ../../mod/install.php:380 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "" +msgstr "Błąd: moduł Apache webserver mod-rewrite jest potrzebny, jednakże nie jest zainstalowany." #: ../../mod/install.php:388 msgid "Error: libCURL PHP module required but not installed." @@ -1278,7 +1281,7 @@ msgstr "Błąd: libCURL PHP wymagany moduł, lecz nie zainstalowany." #: ../../mod/install.php:392 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." -msgstr "" +msgstr "Błąd: moduł graficzny GD z PHP potrzebuje wsparcia technicznego JPEG, jednakże on nie jest zainstalowany." #: ../../mod/install.php:396 msgid "Error: openssl PHP module required but not installed." @@ -1417,7 +1420,7 @@ msgid "is interested in:" msgstr "interesuje się:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1213 +#: ../../include/contact_widgets.php:9 ../../boot.php:1214 msgid "Connect" msgstr "Połącz" @@ -1447,19 +1450,19 @@ msgid "Group: " msgstr "Grupa:" #: ../../mod/content.php:438 ../../mod/content.php:723 -#: ../../include/conversation.php:568 ../../object/Item.php:116 +#: ../../include/conversation.php:568 ../../object/Item.php:117 msgid "Select" msgstr "Wybierz" -#: ../../mod/content.php:455 ../../mod/content.php:816 -#: ../../mod/content.php:817 ../../include/conversation.php:587 -#: ../../object/Item.php:227 ../../object/Item.php:228 +#: ../../mod/content.php:455 ../../mod/content.php:817 +#: ../../mod/content.php:818 ../../include/conversation.php:587 +#: ../../object/Item.php:229 ../../object/Item.php:230 #, php-format msgid "View %s's profile @ %s" msgstr "Pokaż %s's profil @ %s" -#: ../../mod/content.php:465 ../../mod/content.php:828 -#: ../../include/conversation.php:607 ../../object/Item.php:240 +#: ../../mod/content.php:465 ../../mod/content.php:829 +#: ../../include/conversation.php:607 ../../object/Item.php:243 #, php-format msgid "%s from %s" msgstr "%s od %s" @@ -1468,7 +1471,7 @@ msgstr "%s od %s" msgid "View in context" msgstr "Zobacz w kontekście" -#: ../../mod/content.php:586 ../../object/Item.php:277 +#: ../../mod/content.php:586 ../../object/Item.php:282 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1476,8 +1479,8 @@ msgstr[0] " %d komentarz" msgstr[1] " %d komentarzy" msgstr[2] " %d komentarzy" -#: ../../mod/content.php:588 ../../include/text.php:1441 -#: ../../object/Item.php:279 ../../object/Item.php:292 +#: ../../mod/content.php:588 ../../include/text.php:1446 +#: ../../object/Item.php:284 ../../object/Item.php:297 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1486,93 +1489,93 @@ msgstr[2] "komentarz" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:606 -#: ../../object/Item.php:280 ../../addon.old/page/page.php:77 +#: ../../include/contact_widgets.php:195 ../../boot.php:607 +#: ../../object/Item.php:285 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "Pokaż więcej" -#: ../../mod/content.php:667 ../../object/Item.php:196 +#: ../../mod/content.php:667 ../../object/Item.php:197 msgid "like" msgstr "polub" -#: ../../mod/content.php:668 ../../object/Item.php:197 +#: ../../mod/content.php:668 ../../object/Item.php:198 msgid "dislike" msgstr "Nie lubię" -#: ../../mod/content.php:670 ../../object/Item.php:199 +#: ../../mod/content.php:670 ../../object/Item.php:200 msgid "Share this" msgstr "Udostępnij to" -#: ../../mod/content.php:670 ../../object/Item.php:199 +#: ../../mod/content.php:670 ../../object/Item.php:200 msgid "share" msgstr "udostępnij" -#: ../../mod/content.php:694 ../../object/Item.php:560 +#: ../../mod/content.php:694 ../../object/Item.php:565 msgid "Bold" msgstr "Pogrubienie" -#: ../../mod/content.php:695 ../../object/Item.php:561 +#: ../../mod/content.php:695 ../../object/Item.php:566 msgid "Italic" msgstr "Kursywa" -#: ../../mod/content.php:696 ../../object/Item.php:562 +#: ../../mod/content.php:696 ../../object/Item.php:567 msgid "Underline" msgstr "Podkreślenie" -#: ../../mod/content.php:697 ../../object/Item.php:563 +#: ../../mod/content.php:697 ../../object/Item.php:568 msgid "Quote" msgstr "Cytat" -#: ../../mod/content.php:698 ../../object/Item.php:564 +#: ../../mod/content.php:698 ../../object/Item.php:569 msgid "Code" msgstr "Kod" -#: ../../mod/content.php:699 ../../object/Item.php:565 +#: ../../mod/content.php:699 ../../object/Item.php:570 msgid "Image" msgstr "Obraz" -#: ../../mod/content.php:700 ../../object/Item.php:566 +#: ../../mod/content.php:700 ../../object/Item.php:571 msgid "Link" msgstr "Link" -#: ../../mod/content.php:701 ../../object/Item.php:567 +#: ../../mod/content.php:701 ../../object/Item.php:572 msgid "Video" msgstr "Video" -#: ../../mod/content.php:736 ../../object/Item.php:180 +#: ../../mod/content.php:736 ../../object/Item.php:181 msgid "add star" msgstr "dodaj gwiazdkę" -#: ../../mod/content.php:737 ../../object/Item.php:181 +#: ../../mod/content.php:737 ../../object/Item.php:182 msgid "remove star" msgstr "anuluj gwiazdkę" -#: ../../mod/content.php:738 ../../object/Item.php:182 +#: ../../mod/content.php:738 ../../object/Item.php:183 msgid "toggle star status" msgstr "włącz status gwiazdy" -#: ../../mod/content.php:741 ../../object/Item.php:185 +#: ../../mod/content.php:741 ../../object/Item.php:186 msgid "starred" msgstr "" -#: ../../mod/content.php:742 ../../object/Item.php:186 +#: ../../mod/content.php:742 ../../object/Item.php:187 msgid "add tag" msgstr "dodaj tag" -#: ../../mod/content.php:746 ../../object/Item.php:120 +#: ../../mod/content.php:746 ../../object/Item.php:121 msgid "save to folder" msgstr "zapisz w folderze" -#: ../../mod/content.php:818 ../../object/Item.php:229 +#: ../../mod/content.php:819 ../../object/Item.php:231 msgid "to" msgstr "do" -#: ../../mod/content.php:819 ../../object/Item.php:230 +#: ../../mod/content.php:820 ../../object/Item.php:233 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:820 ../../object/Item.php:231 +#: ../../mod/content.php:821 ../../object/Item.php:234 msgid "via Wall-To-Wall:" msgstr "" @@ -1609,7 +1612,7 @@ msgstr "Sieć" msgid "Personal" msgstr "Osobiste" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Dom" @@ -1797,7 +1800,7 @@ msgstr "Kontakt nie jest ignorowany" #: ../../mod/contacts.php:219 msgid "Contact has been archived" -msgstr "" +msgstr "Kontakt został zarchiwizowany" #: ../../mod/contacts.php:219 msgid "Contact has been unarchived" @@ -1976,7 +1979,7 @@ msgstr "Obecnie zignorowany" #: ../../mod/contacts.php:383 msgid "Currently archived" -msgstr "" +msgstr "Obecnie zarchiwizowany" #: ../../mod/contacts.php:384 msgid "" @@ -2055,7 +2058,7 @@ msgstr "jesteś fanem" msgid "Edit contact" msgstr "Edytuj kontakt" -#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88 +#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakty" @@ -2092,8 +2095,8 @@ msgstr "Prośba o reset hasła na %s" #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359 -#: ../../boot.php:821 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 +#: ../../boot.php:822 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2107,7 +2110,7 @@ msgid "" "Password reset failed." msgstr "Prośba nie może być zweryfikowana. (Mogłeś już ją poprzednio wysłać.) Reset hasła nie powiódł się." -#: ../../mod/lostpass.php:83 ../../boot.php:960 +#: ../../mod/lostpass.php:83 ../../boot.php:961 msgid "Password Reset" msgstr "Zresetuj hasło" @@ -2449,7 +2452,7 @@ msgstr "OpenID:" #: ../../mod/settings.php:882 msgid "(Optional) Allow this OpenID to login to this account." -msgstr "" +msgstr "Przeznacz to OpenID do logowania się na to konto." #: ../../mod/settings.php:892 msgid "Publish your default profile in your local site directory?" @@ -2501,7 +2504,7 @@ msgstr "" #: ../../mod/settings.php:960 msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "" +msgstr "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte." #: ../../mod/settings.php:961 msgid "Advanced expiration settings" @@ -2589,7 +2592,7 @@ msgstr "(aby zapobiec spamowaniu)" #: ../../mod/settings.php:999 msgid "Default Post Permissions" -msgstr "" +msgstr "Domyślne prawa dostępu wiadomości" #: ../../mod/settings.php:1000 msgid "(click to open/close)" @@ -2675,7 +2678,7 @@ msgstr "" #: ../../mod/manage.php:99 msgid "Select an identity to manage: " -msgstr "" +msgstr "Wybierz tożsamość do zarządzania:" #: ../../mod/network.php:181 msgid "Search Results For:" @@ -2762,7 +2765,7 @@ msgstr "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione " msgid "Invalid contact." msgstr "Zły kontakt" -#: ../../mod/notes.php:44 ../../boot.php:1752 +#: ../../mod/notes.php:44 ../../boot.php:1753 msgid "Personal Notes" msgstr "Osobiste notatki" @@ -2771,7 +2774,7 @@ msgstr "Osobiste notatki" #: ../../addon/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon/fbpost/fbpost.php:267 #: ../../addon/dav/friendica/layout.fnk.php:441 -#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688 #: ../../addon.old/facebook/facebook.php:770 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon.old/fbpost/fbpost.php:267 @@ -2780,26 +2783,32 @@ msgstr "Osobiste notatki" msgid "Save" msgstr "Zapisz" -#: ../../mod/uimport.php:41 +#: ../../mod/uimport.php:50 ../../mod/register.php:190 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro." + +#: ../../mod/uimport.php:64 msgid "Import" msgstr "" -#: ../../mod/uimport.php:43 +#: ../../mod/uimport.php:66 msgid "Move account" msgstr "" -#: ../../mod/uimport.php:44 +#: ../../mod/uimport.php:67 msgid "" "You can import an account from another Friendica server.
\r\n" " You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.
\r\n" " This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora" msgstr "" -#: ../../mod/uimport.php:47 +#: ../../mod/uimport.php:70 msgid "Account file" msgstr "" -#: ../../mod/uimport.php:47 +#: ../../mod/uimport.php:70 msgid "" "To export your accont, go to \"Settings->Export your porsonal data\" and " "select \"Export account\"" @@ -2917,9 +2926,9 @@ msgid "" msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1728 +#: ../../boot.php:1729 msgid "Profile" msgstr "Profil" @@ -3142,7 +3151,7 @@ msgstr "Wszystkie kontakty (z bezpiecznym dostępem do profilu)" msgid "No contacts." msgstr "brak kontaktów" -#: ../../mod/viewcontacts.php:76 ../../include/text.php:618 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:625 msgid "View Contacts" msgstr "widok kontaktów" @@ -3173,12 +3182,6 @@ msgstr "Prośba o rejestrację u %s" msgid "Your registration is pending approval by the site owner." msgstr "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny." -#: ../../mod/register.php:190 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro." - #: ../../mod/register.php:218 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " @@ -3230,7 +3233,7 @@ msgstr "Wybierz login. Login musi zaczynać się literą. Adres twojego profilu msgid "Choose a nickname: " msgstr "Wybierz pseudonim:" -#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:920 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:921 msgid "Register" msgstr "Zarejestruj" @@ -3240,8 +3243,8 @@ msgstr "Szukaj osób" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 +#: ../../view/theme/diabook/theme.php:501 ../../include/text.php:1442 +#: ../../include/diaspora.php:1848 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 msgid "photo" @@ -3251,8 +3254,8 @@ msgstr "zdjęcie" #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:452 -#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:496 +#: ../../view/theme/diabook/theme.php:505 ../../include/diaspora.php:1848 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3263,7 +3266,7 @@ msgstr "status" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:510 ../../include/diaspora.php:1864 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3278,7 +3281,7 @@ msgstr "%1$s nie lubi %2$s's %3$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 -#: ../../mod/display.php:169 ../../include/items.php:3837 +#: ../../mod/display.php:169 ../../include/items.php:3843 msgid "Item not found." msgstr "Element nie znaleziony." @@ -3286,8 +3289,8 @@ msgstr "Element nie znaleziony." msgid "Access denied." msgstr "Brak dostępu" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:51 ../../boot.php:1735 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../include/nav.php:51 ../../boot.php:1736 msgid "Photos" msgstr "Zdjęcia" @@ -3490,9 +3493,9 @@ msgstr "D, d M R - g:m AM/PM" #, php-format msgid "%d message" msgid_plural "%d messages" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] " %d wiadomość" +msgstr[1] " %d wiadomości" +msgstr[2] " %d wiadomości" #: ../../mod/message.php:391 msgid "Message not available." @@ -3575,7 +3578,7 @@ msgstr "Konto społeczności/gwiazdy" #: ../../mod/admin.php:186 ../../mod/admin.php:672 msgid "Automatic Friend Account" -msgstr "" +msgstr "Automatyczny przyjaciel konta" #: ../../mod/admin.php:187 msgid "Blog Account" @@ -4168,7 +4171,7 @@ msgstr "Użytkownik FTP" msgid "FTP Password" msgstr "FTP Hasło" -#: ../../mod/profile.php:21 ../../boot.php:1123 +#: ../../mod/profile.php:21 ../../boot.php:1124 msgid "Requested profile is not available." msgstr "Żądany profil jest niedostępny" @@ -4276,8 +4279,8 @@ msgstr "Aplikacje" msgid "No installed applications." msgstr "Brak zainstalowanych aplikacji." -#: ../../mod/search.php:96 ../../include/text.php:678 -#: ../../include/text.php:679 ../../include/nav.php:91 +#: ../../mod/search.php:96 ../../include/text.php:685 +#: ../../include/text.php:686 ../../include/nav.php:91 msgid "Search" msgstr "Szukaj" @@ -4328,7 +4331,7 @@ msgstr "Orientacja seksualna" #: ../../mod/profiles.php:206 msgid "Homepage" -msgstr "" +msgstr "Strona Główna" #: ../../mod/profiles.php:210 msgid "Interests" @@ -4569,23 +4572,23 @@ msgstr "Wiek: " msgid "Edit/Manage Profiles" msgstr "Edytuj/Zarządzaj Profilami" -#: ../../mod/profiles.php:689 ../../boot.php:1241 +#: ../../mod/profiles.php:689 ../../boot.php:1242 msgid "Change profile photo" msgstr "Zmień zdjęcie profilowe" -#: ../../mod/profiles.php:690 ../../boot.php:1242 +#: ../../mod/profiles.php:690 ../../boot.php:1243 msgid "Create New Profile" msgstr "Stwórz nowy profil" -#: ../../mod/profiles.php:701 ../../boot.php:1252 +#: ../../mod/profiles.php:701 ../../boot.php:1253 msgid "Profile Image" msgstr "Obraz profilowy" -#: ../../mod/profiles.php:703 ../../boot.php:1255 +#: ../../mod/profiles.php:703 ../../boot.php:1256 msgid "visible to everybody" msgstr "widoczne dla wszystkich" -#: ../../mod/profiles.php:704 ../../boot.php:1256 +#: ../../mod/profiles.php:704 ../../boot.php:1257 msgid "Edit visibility" msgstr "Edytuj widoczność" @@ -4682,7 +4685,7 @@ msgstr "" msgid "diaspora2bb: " msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:557 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Osoby, które możesz znać" @@ -4697,7 +4700,7 @@ msgstr "" msgid "Ignore/Hide" msgstr "Ignoruj/Ukryj" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:555 msgid "Global Directory" msgstr "Globalne Położenie" @@ -4714,17 +4717,17 @@ msgid "Gender: " msgstr "Płeć: " #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1277 +#: ../../boot.php:1278 msgid "Gender:" msgstr "Płeć:" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1280 +#: ../../boot.php:1281 msgid "Status:" msgstr "Status" #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1282 +#: ../../boot.php:1283 msgid "Homepage:" msgstr "Strona główna:" @@ -5268,7 +5271,7 @@ msgstr[2] " %d osób tego nie lubi" #: ../../addon/widgets/widget_friendheader.php:40 #: ../../addon.old/widgets/widget_friendheader.php:40 msgid "Get added to this list!" -msgstr "" +msgstr "Zostań dodany do listy!" #: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56 msgid "Generate new key" @@ -5597,7 +5600,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:946 +#: ../../include/nav.php:64 ../../boot.php:947 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -5637,7 +5640,7 @@ msgid "Latest likes" msgstr "Ostatnie polubienia" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 +#: ../../view/theme/diabook/theme.php:493 ../../include/text.php:1440 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5791,7 +5794,7 @@ msgstr "Dni" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5802,7 +5805,7 @@ msgstr "Niedziela" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5810,35 +5813,35 @@ msgid "Monday" msgstr "Poniedziałek" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Wtorek" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Środa" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Czwartek" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Piątek" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -6424,7 +6427,7 @@ msgstr "Wygrałem!" #: ../../addon/randplace/randplace.php:169 #: ../../addon.old/randplace/randplace.php:169 msgid "Randplace Settings" -msgstr "" +msgstr "Ustawienia Randplace" #: ../../addon/randplace/randplace.php:171 #: ../../addon.old/randplace/randplace.php:171 @@ -7137,7 +7140,7 @@ msgstr "Wyślij do sieci StatusNet" msgid "" "Please contact your site administrator.
The provided API URL is not " "valid." -msgstr "" +msgstr "Proszę się skontaktować z administratorem strony.
API URL nie jest poprawne" #: ../../addon/statusnet/statusnet.php:204 #: ../../addon.old/statusnet/statusnet.php:204 @@ -7224,7 +7227,7 @@ msgstr "Anuluj proces łączenia" #: ../../addon/statusnet/statusnet.php:321 #: ../../addon.old/statusnet/statusnet.php:321 msgid "Current StatusNet API is" -msgstr "" +msgstr "Aktualnym StatusNet API jest" #: ../../addon/statusnet/statusnet.php:322 #: ../../addon.old/statusnet/statusnet.php:322 @@ -7651,135 +7654,137 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Twoje posty i rozmowy" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 msgid "Your profile page" msgstr "Twoja strona profilowa" -#: ../../view/theme/diabook/theme.php:88 +#: ../../view/theme/diabook/theme.php:89 msgid "Your contacts" msgstr "Twoje kontakty" -#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 msgid "Your photos" msgstr "Twoje zdjęcia" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 msgid "Your events" msgstr "Twoje wydarzenia" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 msgid "Personal notes" msgstr "Osobiste notatki" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Twoje osobiste zdjęcia" -#: ../../view/theme/diabook/theme.php:93 +#: ../../view/theme/diabook/theme.php:94 +#: ../../view/theme/diabook/theme.php:386 +#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Strony społecznościowe" -#: ../../view/theme/diabook/theme.php:377 -#: ../../view/theme/diabook/theme.php:591 +#: ../../view/theme/diabook/theme.php:421 +#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:398 -#: ../../view/theme/diabook/theme.php:596 +#: ../../view/theme/diabook/theme.php:442 +#: ../../view/theme/diabook/theme.php:642 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Ostatni użytkownicy" -#: ../../view/theme/diabook/theme.php:427 -#: ../../view/theme/diabook/theme.php:598 +#: ../../view/theme/diabook/theme.php:471 +#: ../../view/theme/diabook/theme.php:644 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:472 -#: ../../view/theme/diabook/theme.php:597 +#: ../../view/theme/diabook/theme.php:516 +#: ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Ostatnie zdjęcia" -#: ../../view/theme/diabook/theme.php:509 -#: ../../view/theme/diabook/theme.php:594 +#: ../../view/theme/diabook/theme.php:553 +#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Znajdź znajomych" -#: ../../view/theme/diabook/theme.php:510 +#: ../../view/theme/diabook/theme.php:554 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:556 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Podobne zainteresowania" -#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:558 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Zaproś znajomych" -#: ../../view/theme/diabook/theme.php:531 -#: ../../view/theme/diabook/theme.php:590 +#: ../../view/theme/diabook/theme.php:575 +#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:536 +#: ../../view/theme/diabook/theme.php:580 msgid "Set zoomfactor for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:581 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:538 +#: ../../view/theme/diabook/theme.php:582 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:551 -#: ../../view/theme/diabook/theme.php:592 +#: ../../view/theme/diabook/theme.php:595 +#: ../../view/theme/diabook/theme.php:638 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:558 -#: ../../view/theme/diabook/theme.php:593 +#: ../../view/theme/diabook/theme.php:602 +#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:595 +#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:641 msgid "Last Tweets" msgstr "Ostatnie Tweetnięcie" -#: ../../view/theme/diabook/theme.php:568 +#: ../../view/theme/diabook/theme.php:612 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:632 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "nie pokazuj" -#: ../../view/theme/diabook/theme.php:587 +#: ../../view/theme/diabook/theme.php:632 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "pokaż" -#: ../../view/theme/diabook/theme.php:588 +#: ../../view/theme/diabook/theme.php:633 msgid "Show/hide boxes at right-hand column:" msgstr "" @@ -7999,7 +8004,7 @@ msgstr "Bezpłciowy" #: ../../include/profile_selectors.php:6 msgid "Non-specific" -msgstr "" +msgstr "Niespecyficzne" #: ../../include/profile_selectors.php:6 msgid "Other" @@ -8035,7 +8040,7 @@ msgstr "Biseksualny" #: ../../include/profile_selectors.php:23 msgid "Autosexual" -msgstr "" +msgstr "Niezidentyfikowany" #: ../../include/profile_selectors.php:23 msgid "Abstinent" @@ -8083,7 +8088,7 @@ msgstr "" #: ../../include/profile_selectors.php:42 msgid "Infatuated" -msgstr "" +msgstr "zakochany" #: ../../include/profile_selectors.php:42 msgid "Dating" @@ -8226,11 +8231,11 @@ msgstr "" msgid "older" msgstr "" -#: ../../include/text.php:597 +#: ../../include/text.php:604 msgid "No contacts" msgstr "Brak kontaktów" -#: ../../include/text.php:606 +#: ../../include/text.php:613 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" @@ -8238,207 +8243,207 @@ msgstr[0] "%d kontakt" msgstr[1] "%d kontaktów" msgstr[2] "%d kontakty" -#: ../../include/text.php:719 +#: ../../include/text.php:726 msgid "poke" msgstr "zaczep" -#: ../../include/text.php:719 ../../include/conversation.php:210 +#: ../../include/text.php:726 ../../include/conversation.php:210 msgid "poked" msgstr "zaczepiony" -#: ../../include/text.php:720 +#: ../../include/text.php:727 msgid "ping" msgstr "" -#: ../../include/text.php:720 +#: ../../include/text.php:727 msgid "pinged" msgstr "" -#: ../../include/text.php:721 +#: ../../include/text.php:728 msgid "prod" msgstr "" -#: ../../include/text.php:721 +#: ../../include/text.php:728 msgid "prodded" msgstr "" -#: ../../include/text.php:722 +#: ../../include/text.php:729 msgid "slap" msgstr "spoliczkuj" -#: ../../include/text.php:722 +#: ../../include/text.php:729 msgid "slapped" msgstr "spoliczkowany" -#: ../../include/text.php:723 +#: ../../include/text.php:730 msgid "finger" msgstr "dotknąć" -#: ../../include/text.php:723 +#: ../../include/text.php:730 msgid "fingered" msgstr "dotknięty" -#: ../../include/text.php:724 +#: ../../include/text.php:731 msgid "rebuff" msgstr "odprawiać" -#: ../../include/text.php:724 +#: ../../include/text.php:731 msgid "rebuffed" msgstr "odprawiony" -#: ../../include/text.php:736 +#: ../../include/text.php:743 msgid "happy" msgstr "szczęśliwy" -#: ../../include/text.php:737 +#: ../../include/text.php:744 msgid "sad" msgstr "smutny" -#: ../../include/text.php:738 +#: ../../include/text.php:745 msgid "mellow" msgstr "spokojny" -#: ../../include/text.php:739 +#: ../../include/text.php:746 msgid "tired" msgstr "zmęczony" -#: ../../include/text.php:740 +#: ../../include/text.php:747 msgid "perky" msgstr "pewny siebie" -#: ../../include/text.php:741 +#: ../../include/text.php:748 msgid "angry" msgstr "wściekły" -#: ../../include/text.php:742 +#: ../../include/text.php:749 msgid "stupified" msgstr "odurzony" -#: ../../include/text.php:743 +#: ../../include/text.php:750 msgid "puzzled" msgstr "zdziwiony" -#: ../../include/text.php:744 +#: ../../include/text.php:751 msgid "interested" msgstr "interesujący" -#: ../../include/text.php:745 +#: ../../include/text.php:752 msgid "bitter" msgstr "zajadły" -#: ../../include/text.php:746 +#: ../../include/text.php:753 msgid "cheerful" msgstr "wesoły" -#: ../../include/text.php:747 +#: ../../include/text.php:754 msgid "alive" msgstr "żywy" -#: ../../include/text.php:748 +#: ../../include/text.php:755 msgid "annoyed" msgstr "irytujący" -#: ../../include/text.php:749 +#: ../../include/text.php:756 msgid "anxious" msgstr "zazdrosny" -#: ../../include/text.php:750 +#: ../../include/text.php:757 msgid "cranky" msgstr "zepsuty" -#: ../../include/text.php:751 +#: ../../include/text.php:758 msgid "disturbed" msgstr "przeszkadzający" -#: ../../include/text.php:752 +#: ../../include/text.php:759 msgid "frustrated" msgstr "rozbity" -#: ../../include/text.php:753 +#: ../../include/text.php:760 msgid "motivated" msgstr "zmotywowany" -#: ../../include/text.php:754 +#: ../../include/text.php:761 msgid "relaxed" msgstr "zrelaksowany" -#: ../../include/text.php:755 +#: ../../include/text.php:762 msgid "surprised" msgstr "zaskoczony" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "January" msgstr "Styczeń" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "February" msgstr "Luty" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "March" msgstr "Marzec" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "April" msgstr "Kwiecień" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "May" msgstr "Maj" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "June" msgstr "Czerwiec" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "July" msgstr "Lipiec" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "August" msgstr "Sierpień" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "September" msgstr "Wrzesień" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "October" msgstr "Październik" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "November" msgstr "Listopad" -#: ../../include/text.php:919 +#: ../../include/text.php:926 msgid "December" msgstr "Grudzień" -#: ../../include/text.php:1005 +#: ../../include/text.php:1010 msgid "bytes" msgstr "bajty" -#: ../../include/text.php:1032 ../../include/text.php:1044 +#: ../../include/text.php:1037 ../../include/text.php:1049 msgid "Click to open/close" msgstr "Kliknij aby otworzyć/zamknąć" -#: ../../include/text.php:1217 ../../include/user.php:236 +#: ../../include/text.php:1222 ../../include/user.php:236 msgid "default" msgstr "standardowe" -#: ../../include/text.php:1229 +#: ../../include/text.php:1234 msgid "Select an alternate language" msgstr "Wybierz alternatywny język" -#: ../../include/text.php:1439 +#: ../../include/text.php:1444 msgid "activity" msgstr "aktywność" -#: ../../include/text.php:1442 +#: ../../include/text.php:1447 msgid "post" msgstr "post" -#: ../../include/text.php:1597 +#: ../../include/text.php:1602 msgid "Item filed" msgstr "" @@ -8446,11 +8451,11 @@ msgstr "" msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:2222 +#: ../../include/diaspora.php:2236 msgid "Attachments:" msgstr "Załączniki:" -#: ../../include/network.php:849 +#: ../../include/network.php:847 msgid "view full size" msgstr "Zobacz pełen rozmiar" @@ -8474,15 +8479,24 @@ msgstr "" msgid "Error! I can't import this file: DB schema version is not compatible." msgstr "" -#: ../../include/uimport.php:92 +#: ../../include/uimport.php:81 +msgid "Error! Cannot check nickname" +msgstr "" + +#: ../../include/uimport.php:85 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "" + +#: ../../include/uimport.php:104 msgid "User creation error" msgstr "" -#: ../../include/uimport.php:110 +#: ../../include/uimport.php:122 msgid "User profile creation error" msgstr "" -#: ../../include/uimport.php:155 +#: ../../include/uimport.php:167 #, php-format msgid "%d contact not imported" msgid_plural "%d contacts not imported" @@ -8490,7 +8504,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../../include/uimport.php:233 +#: ../../include/uimport.php:245 msgid "Done. You can now login with your username and password" msgstr "" @@ -8525,7 +8539,7 @@ msgstr "Stwórz nową grupę" msgid "Contacts not in any group" msgstr "Kontakt nie jest w żadnej grupie" -#: ../../include/nav.php:46 ../../boot.php:945 +#: ../../include/nav.php:46 ../../boot.php:946 msgid "Logout" msgstr "Wyloguj się" @@ -8533,7 +8547,7 @@ msgstr "Wyloguj się" msgid "End this session" msgstr "Zakończ sesję" -#: ../../include/nav.php:49 ../../boot.php:1721 +#: ../../include/nav.php:49 ../../boot.php:1722 msgid "Status" msgstr "Status" @@ -8571,7 +8585,7 @@ msgstr "Rozmowy na tej stronie" #: ../../include/nav.php:103 msgid "Directory" -msgstr "" +msgstr "Katalog" #: ../../include/nav.php:103 msgid "People directory" @@ -8613,11 +8627,11 @@ msgstr "Zarządzaj" msgid "Manage other pages" msgstr "Zarządzaj innymi stronami" -#: ../../include/nav.php:138 ../../boot.php:1235 +#: ../../include/nav.php:138 ../../boot.php:1236 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:138 ../../boot.php:1235 +#: ../../include/nav.php:138 ../../boot.php:1236 msgid "Manage/edit profiles" msgstr "Zarządzaj profilami" @@ -8764,12 +8778,12 @@ msgstr "sekundy" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/datetime.php:472 ../../include/items.php:1689 +#: ../../include/datetime.php:472 ../../include/items.php:1695 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/datetime.php:473 ../../include/items.php:1690 +#: ../../include/datetime.php:473 ../../include/items.php:1696 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -8778,24 +8792,24 @@ msgstr "" msgid "From: " msgstr "Z:" -#: ../../include/bbcode.php:185 ../../include/bbcode.php:406 +#: ../../include/bbcode.php:202 ../../include/bbcode.php:423 msgid "Image/photo" msgstr "Obrazek/zdjęcie" -#: ../../include/bbcode.php:371 ../../include/bbcode.php:391 +#: ../../include/bbcode.php:388 ../../include/bbcode.php:408 msgid "$1 wrote:" msgstr "$1 napisał:" -#: ../../include/bbcode.php:410 ../../include/bbcode.php:411 +#: ../../include/bbcode.php:427 ../../include/bbcode.php:428 msgid "Encrypted content" msgstr "" #: ../../include/dba.php:41 #, php-format msgid "Cannot locate DNS info for database server '%s'" -msgstr "" +msgstr "Nie można zlokalizować serwera DNS dla bazy danych '%s'" -#: ../../include/message.php:15 ../../include/message.php:171 +#: ../../include/message.php:15 ../../include/message.php:172 msgid "[no subject]" msgstr "[bez tematu]" @@ -9044,15 +9058,15 @@ msgstr "Nie można otrzymać informacji kontaktowych" msgid "following" msgstr "następujący" -#: ../../include/items.php:3357 +#: ../../include/items.php:3363 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:3357 +#: ../../include/items.php:3363 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:4038 +#: ../../include/items.php:4044 msgid "Archives" msgstr "Archiwum" @@ -9191,11 +9205,11 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:599 ../../object/Item.php:218 +#: ../../include/conversation.php:599 ../../object/Item.php:220 msgid "Categories:" msgstr "Kategorie:" -#: ../../include/conversation.php:600 ../../object/Item.php:219 +#: ../../include/conversation.php:600 ../../object/Item.php:221 msgid "Filed under:" msgstr "" @@ -9290,106 +9304,110 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:604 +#: ../../boot.php:605 msgid "Delete this item?" msgstr "Usunąć ten element?" -#: ../../boot.php:607 +#: ../../boot.php:608 msgid "show fewer" msgstr "Pokaż mniej" -#: ../../boot.php:816 +#: ../../boot.php:817 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:818 +#: ../../boot.php:819 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:919 +#: ../../boot.php:920 msgid "Create a New Account" msgstr "Załóż nowe konto" -#: ../../boot.php:948 +#: ../../boot.php:949 msgid "Nickname or Email address: " msgstr "Nick lub adres email:" -#: ../../boot.php:949 +#: ../../boot.php:950 msgid "Password: " msgstr "Hasło:" -#: ../../boot.php:950 +#: ../../boot.php:951 msgid "Remember me" msgstr "" -#: ../../boot.php:953 +#: ../../boot.php:954 msgid "Or login using OpenID: " msgstr "Lub zaloguj się korzystając z OpenID:" -#: ../../boot.php:959 +#: ../../boot.php:960 msgid "Forgot your password?" msgstr "Zapomniałeś swojego hasła?" -#: ../../boot.php:1084 +#: ../../boot.php:1085 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1161 +#: ../../boot.php:1162 msgid "Edit profile" msgstr "Edytuj profil" -#: ../../boot.php:1227 +#: ../../boot.php:1228 msgid "Message" msgstr "Wiadomość" -#: ../../boot.php:1349 ../../boot.php:1435 +#: ../../boot.php:1350 ../../boot.php:1436 msgid "g A l F d" msgstr "" -#: ../../boot.php:1350 ../../boot.php:1436 +#: ../../boot.php:1351 ../../boot.php:1437 msgid "F d" msgstr "" -#: ../../boot.php:1395 ../../boot.php:1476 +#: ../../boot.php:1396 ../../boot.php:1477 msgid "[today]" msgstr "[dziś]" -#: ../../boot.php:1407 +#: ../../boot.php:1408 msgid "Birthday Reminders" msgstr "Przypomnienia o urodzinach" -#: ../../boot.php:1408 +#: ../../boot.php:1409 msgid "Birthdays this week:" msgstr "Urodziny w tym tygodniu:" -#: ../../boot.php:1469 +#: ../../boot.php:1470 msgid "[No description]" msgstr "[Brak opisu]" -#: ../../boot.php:1487 +#: ../../boot.php:1488 msgid "Event Reminders" msgstr "Przypominacze wydarzeń" -#: ../../boot.php:1488 +#: ../../boot.php:1489 msgid "Events this week:" msgstr "Wydarzenia w tym tygodniu:" -#: ../../boot.php:1724 +#: ../../boot.php:1725 msgid "Status Messages and Posts" msgstr "Status wiadomości i postów" -#: ../../boot.php:1731 +#: ../../boot.php:1732 msgid "Profile Details" msgstr "Szczegóły profilu" -#: ../../boot.php:1748 +#: ../../boot.php:1749 msgid "Events and Calendar" msgstr "Wydarzenia i kalendarz" -#: ../../boot.php:1755 +#: ../../boot.php:1756 msgid "Only You Can See This" +msgstr "Tylko ty możesz to zobaczyć" + +#: ../../object/Item.php:232 +msgid "via" msgstr "" #: ../../index.php:398 diff --git a/view/pl/strings.php b/view/pl/strings.php index 156cd785d2..8e2c1782eb 100644 --- a/view/pl/strings.php +++ b/view/pl/strings.php @@ -179,7 +179,7 @@ $a->strings["Disallowed profile URL."] = "Nie dozwolony adres URL profilu."; $a->strings["Failed to update contact record."] = "Aktualizacja nagrania kontaktu nie powiodła się."; $a->strings["Your introduction has been sent."] = "Twoje dane zostały wysłane."; $a->strings["Please login to confirm introduction."] = "Proszę zalogować się do potwierdzenia wstępu."; -$a->strings["Incorrect identity currently logged in. Please login to this profile."] = ""; +$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Niepoprawna tożsamość obecnego użytkownika. Proszę zalogować się na tego użytkownika. "; $a->strings["Hide this contact"] = "Ukryj kontakt"; $a->strings["Welcome home %s."] = "Welcome home %s."; $a->strings["Please confirm your introduction/connection request to %s."] = "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s."; @@ -248,9 +248,9 @@ $a->strings["OpenSSL PHP module"] = ""; $a->strings["mysqli PHP module"] = ""; $a->strings["mb_string PHP module"] = ""; $a->strings["Apache mod_rewrite module"] = ""; -$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = ""; +$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Błąd: moduł Apache webserver mod-rewrite jest potrzebny, jednakże nie jest zainstalowany."; $a->strings["Error: libCURL PHP module required but not installed."] = "Błąd: libCURL PHP wymagany moduł, lecz nie zainstalowany."; -$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = ""; +$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Błąd: moduł graficzny GD z PHP potrzebuje wsparcia technicznego JPEG, jednakże on nie jest zainstalowany."; $a->strings["Error: openssl PHP module required but not installed."] = "Błąd: openssl PHP wymagany moduł, lecz nie zainstalowany."; $a->strings["Error: mysqli PHP module required but not installed."] = "Błąd: mysqli PHP wymagany moduł, lecz nie zainstalowany."; $a->strings["Error: mb_string PHP module required but not installed."] = ""; @@ -373,7 +373,7 @@ $a->strings["Contact has been blocked"] = "Kontakt został zablokowany"; $a->strings["Contact has been unblocked"] = "Kontakt został odblokowany"; $a->strings["Contact has been ignored"] = "Kontakt jest ignorowany"; $a->strings["Contact has been unignored"] = "Kontakt nie jest ignorowany"; -$a->strings["Contact has been archived"] = ""; +$a->strings["Contact has been archived"] = "Kontakt został zarchiwizowany"; $a->strings["Contact has been unarchived"] = ""; $a->strings["Contact has been removed."] = "Kontakt został usunięty."; $a->strings["You are mutual friends with %s"] = "Jesteś już znajomym z %s"; @@ -418,7 +418,7 @@ $a->strings["Update public posts"] = ""; $a->strings["Update now"] = "Aktualizuj teraz"; $a->strings["Currently blocked"] = "Obecnie zablokowany"; $a->strings["Currently ignored"] = "Obecnie zignorowany"; -$a->strings["Currently archived"] = ""; +$a->strings["Currently archived"] = "Obecnie zarchiwizowany"; $a->strings["Replies/likes to your public posts may still be visible"] = ""; $a->strings["Suggestions"] = "Sugestie"; $a->strings["Suggest potential friends"] = "Sugerowani znajomi"; @@ -525,7 +525,7 @@ $a->strings["Automatically approve all connection/friend requests as friends"] = $a->strings["Private Forum [Experimental]"] = ""; $a->strings["Private forum - approved members only"] = ""; $a->strings["OpenID:"] = "OpenID:"; -$a->strings["(Optional) Allow this OpenID to login to this account."] = ""; +$a->strings["(Optional) Allow this OpenID to login to this account."] = "Przeznacz to OpenID do logowania się na to konto."; $a->strings["Publish your default profile in your local site directory?"] = ""; $a->strings["Publish your default profile in the global social directory?"] = "Opublikować twój niewypełniony profil w globalnym, społecznym katalogu?"; $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Ukryć listę znajomych przed odwiedzającymi Twój profil?"; @@ -538,7 +538,7 @@ $a->strings["Profile is not published."] = "Profil nie $a->strings["or"] = "lub"; $a->strings["Your Identity Address is"] = "Twój adres identyfikacyjny to"; $a->strings["Automatically expire posts after this many days:"] = ""; -$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = ""; +$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte."; $a->strings["Advanced expiration settings"] = ""; $a->strings["Advanced Expiration"] = ""; $a->strings["Expire posts:"] = "Wygasające posty:"; @@ -560,7 +560,7 @@ $a->strings["Use Browser Location:"] = "Użyj położenia przeglądarki:"; $a->strings["Security and Privacy Settings"] = "Ustawienia bezpieczeństwa i prywatności"; $a->strings["Maximum Friend Requests/Day:"] = "Maksymalna liczba zaproszeń do grona przyjaciół na dzień:"; $a->strings["(to prevent spam abuse)"] = "(aby zapobiec spamowaniu)"; -$a->strings["Default Post Permissions"] = ""; +$a->strings["Default Post Permissions"] = "Domyślne prawa dostępu wiadomości"; $a->strings["(click to open/close)"] = "(kliknij by otworzyć/zamknąć)"; $a->strings["Maximum private messages per day from unknown people:"] = ""; $a->strings["Notification Settings"] = "Ustawienia powiadomień"; @@ -581,7 +581,7 @@ $a->strings["Advanced Account/Page Type Settings"] = ""; $a->strings["Change the behaviour of this account for special situations"] = ""; $a->strings["Manage Identities and/or Pages"] = ""; $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = ""; -$a->strings["Select an identity to manage: "] = ""; +$a->strings["Select an identity to manage: "] = "Wybierz tożsamość do zarządzania:"; $a->strings["Search Results For:"] = "Szukaj wyników dla:"; $a->strings["Remove term"] = ""; $a->strings["Saved Searches"] = ""; @@ -608,6 +608,7 @@ $a->strings["Private messages to this person are at risk of public disclosure."] $a->strings["Invalid contact."] = "Zły kontakt"; $a->strings["Personal Notes"] = "Osobiste notatki"; $a->strings["Save"] = "Zapisz"; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro."; $a->strings["Import"] = ""; $a->strings["Move account"] = ""; $a->strings["You can import an account from another Friendica server.
\r\n You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.
\r\n This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = ""; @@ -688,7 +689,6 @@ $a->strings["Failed to send email message. Here is the message that failed."] = $a->strings["Your registration can not be processed."] = "Twoja rejestracja nie może zostać przeprowadzona. "; $a->strings["Registration request at %s"] = "Prośba o rejestrację u %s"; $a->strings["Your registration is pending approval by the site owner."] = "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny."; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro."; $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = ""; $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów."; $a->strings["Your OpenID (optional): "] = "Twój OpenID (opcjonalnie):"; @@ -753,9 +753,9 @@ $a->strings["%s and You"] = "%s i ty"; $a->strings["Delete conversation"] = "Usuń rozmowę"; $a->strings["D, d M Y - g:i A"] = "D, d M R - g:m AM/PM"; $a->strings["%d message"] = array( - 0 => "", - 1 => "", - 2 => "", + 0 => " %d wiadomość", + 1 => " %d wiadomości", + 2 => " %d wiadomości", ); $a->strings["Message not available."] = "Wiadomość nie jest dostępna."; $a->strings["Delete message"] = "Usuń wiadomość"; @@ -776,7 +776,7 @@ $a->strings["User registrations waiting for confirmation"] = "Rejestracje użytk $a->strings["Normal Account"] = "Konto normalne"; $a->strings["Soapbox Account"] = ""; $a->strings["Community/Celebrity Account"] = "Konto społeczności/gwiazdy"; -$a->strings["Automatic Friend Account"] = ""; +$a->strings["Automatic Friend Account"] = "Automatyczny przyjaciel konta"; $a->strings["Blog Account"] = ""; $a->strings["Private Forum"] = ""; $a->strings["Message queues"] = ""; @@ -953,7 +953,7 @@ $a->strings["Religion"] = "Religia"; $a->strings["Political Views"] = "Poglądy polityczne"; $a->strings["Gender"] = "Płeć"; $a->strings["Sexual Preference"] = "Orientacja seksualna"; -$a->strings["Homepage"] = ""; +$a->strings["Homepage"] = "Strona Główna"; $a->strings["Interests"] = "Zainteresowania"; $a->strings["Address"] = "Adres"; $a->strings["Location"] = "Położenie"; @@ -1158,7 +1158,7 @@ $a->strings["%d person doesn't like this"] = array( 1 => " %d osób tego nie lubi", 2 => " %d osób tego nie lubi", ); -$a->strings["Get added to this list!"] = ""; +$a->strings["Get added to this list!"] = "Zostań dodany do listy!"; $a->strings["Generate new key"] = "Stwórz nowy klucz"; $a->strings["Widgets key"] = ""; $a->strings["Widgets available"] = ""; @@ -1374,7 +1374,7 @@ $a->strings["I'm going first this time..."] = "Zaczynam..."; $a->strings["You won!"] = "Wygrałeś!"; $a->strings["\"Cat\" game!"] = "Gra \"Kot\"!"; $a->strings["I won!"] = "Wygrałem!"; -$a->strings["Randplace Settings"] = ""; +$a->strings["Randplace Settings"] = "Ustawienia Randplace"; $a->strings["Enable Randplace Plugin"] = ""; $a->strings["Post to Dreamwidth"] = ""; $a->strings["Dreamwidth Post Settings"] = ""; @@ -1511,7 +1511,7 @@ $a->strings["Purge internal list of jabber addresses of contacts"] = ""; $a->strings["Add contact"] = "Dodaj kontakt"; $a->strings["View Source"] = "Podgląd źródła"; $a->strings["Post to StatusNet"] = "Wyślij do sieci StatusNet"; -$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = ""; +$a->strings["Please contact your site administrator.
The provided API URL is not valid."] = "Proszę się skontaktować z administratorem strony.
API URL nie jest poprawne"; $a->strings["We could not contact the StatusNet API with the Path you entered."] = ""; $a->strings["StatusNet settings updated."] = "Ustawienia StatusNet zaktualizowane"; $a->strings["StatusNet Posting Settings"] = ""; @@ -1526,7 +1526,7 @@ $a->strings["To connect to your StatusNet account click the button below to get $a->strings["Log in with StatusNet"] = "Zaloguj się przez StatusNet"; $a->strings["Copy the security code from StatusNet here"] = "Tutaj skopiuj kod bezpieczeństwa z StatusNet"; $a->strings["Cancel Connection Process"] = "Anuluj proces łączenia"; -$a->strings["Current StatusNet API is"] = ""; +$a->strings["Current StatusNet API is"] = "Aktualnym StatusNet API jest"; $a->strings["Cancel StatusNet Connection"] = ""; $a->strings["Currently connected to: "] = "Obecnie połączone z:"; $a->strings["If enabled all your public 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."] = ""; @@ -1696,7 +1696,7 @@ $a->strings["Intersex"] = "Międzypłciowy"; $a->strings["Transsexual"] = "Transseksualista"; $a->strings["Hermaphrodite"] = "Hermafrodyta"; $a->strings["Neuter"] = "Bezpłciowy"; -$a->strings["Non-specific"] = ""; +$a->strings["Non-specific"] = "Niespecyficzne"; $a->strings["Other"] = "Inne"; $a->strings["Undecided"] = "Niezdecydowany"; $a->strings["Males"] = "Mężczyźni"; @@ -1705,7 +1705,7 @@ $a->strings["Gay"] = "Gej"; $a->strings["Lesbian"] = "Lesbijka"; $a->strings["No Preference"] = "Brak preferencji"; $a->strings["Bisexual"] = "Biseksualny"; -$a->strings["Autosexual"] = ""; +$a->strings["Autosexual"] = "Niezidentyfikowany"; $a->strings["Abstinent"] = "Abstynent"; $a->strings["Virgin"] = "Dziewica"; $a->strings["Deviant"] = "Zboczeniec"; @@ -1717,7 +1717,7 @@ $a->strings["Lonely"] = "Samotny"; $a->strings["Available"] = "Dostępny"; $a->strings["Unavailable"] = "Niedostępny"; $a->strings["Has crush"] = ""; -$a->strings["Infatuated"] = ""; +$a->strings["Infatuated"] = "zakochany"; $a->strings["Dating"] = "Randki"; $a->strings["Unfaithful"] = "Niewierny"; $a->strings["Sex Addict"] = "Uzależniony od seksu"; @@ -1818,6 +1818,8 @@ $a->strings["Embedding disabled"] = ""; $a->strings["Error decoding account file"] = ""; $a->strings["Error! No version data in file! This is not a Friendica account file?"] = ""; $a->strings["Error! I can't import this file: DB schema version is not compatible."] = ""; +$a->strings["Error! Cannot check nickname"] = ""; +$a->strings["User '%s' already exists on this server!"] = ""; $a->strings["User creation error"] = ""; $a->strings["User profile creation error"] = ""; $a->strings["%d contact not imported"] = array( @@ -1844,7 +1846,7 @@ $a->strings["Apps"] = "Aplikacje"; $a->strings["Addon applications, utilities, games"] = ""; $a->strings["Search site content"] = "Przeszukaj zawartość strony"; $a->strings["Conversations on this site"] = "Rozmowy na tej stronie"; -$a->strings["Directory"] = ""; +$a->strings["Directory"] = "Katalog"; $a->strings["People directory"] = ""; $a->strings["Conversations from your friends"] = ""; $a->strings["Friend Requests"] = "Podania o przyjęcie do grona znajomych"; @@ -1901,7 +1903,7 @@ $a->strings["From: "] = "Z:"; $a->strings["Image/photo"] = "Obrazek/zdjęcie"; $a->strings["$1 wrote:"] = "$1 napisał:"; $a->strings["Encrypted content"] = ""; -$a->strings["Cannot locate DNS info for database server '%s'"] = ""; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Nie można zlokalizować serwera DNS dla bazy danych '%s'"; $a->strings["[no subject]"] = "[bez tematu]"; $a->strings["Visible to everybody"] = "Widoczny dla wszystkich"; $a->strings["Friendica Notification"] = ""; @@ -2035,7 +2037,8 @@ $a->strings["Events this week:"] = "Wydarzenia w tym tygodniu:"; $a->strings["Status Messages and Posts"] = "Status wiadomości i postów"; $a->strings["Profile Details"] = "Szczegóły profilu"; $a->strings["Events and Calendar"] = "Wydarzenia i kalendarz"; -$a->strings["Only You Can See This"] = ""; +$a->strings["Only You Can See This"] = "Tylko ty możesz to zobaczyć"; +$a->strings["via"] = ""; $a->strings["toggle mobile"] = ""; $a->strings["Bg settings updated."] = ""; $a->strings["Bg Settings"] = ""; diff --git a/view/settings_features.tpl b/view/settings_features.tpl new file mode 100644 index 0000000000..4065d8fc77 --- /dev/null +++ b/view/settings_features.tpl @@ -0,0 +1,20 @@ +

$title

+ + +
+ + +{{ for $features as $f }} +

$f.0

+ +{{ for $f.1 as $fcat }} + {{ inc $field_yesno with $field=$fcat }}{{endinc}} +{{ endfor }} +{{ endfor }} + +
+ +
+ +
+ diff --git a/view/theme/darkzero-NS/unsupported b/view/theme/darkzero-NS/unsupported deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl new file mode 100644 index 0000000000..8aabb51ec9 --- /dev/null +++ b/view/theme/diabook/admin_users.tpl @@ -0,0 +1,88 @@ + +
+

$title - $page

+ +
+ +

$h_pending

+ {{ if $pending }} + + + + {{ for $th_pending as $th }}{{ endfor }} + + + + + + {{ for $pending as $u }} + + + + + + + + {{ endfor }} + +
$th
$u.created$u.name + + +
+
$select_all
+
+ {{ else }} +

$no_pending

+ {{ endif }} + + + + +

$h_users

+ {{ if $users }} + + + + + {{ for $th_users as $th }}{{ endfor }} + + + + + + {{ for $users as $u }} + + + + + + + + + + + + {{ endfor }} + +
$th
$u.nickname$u.name$u.register_date$u.lastitem_date + + +
+
$select_all
+
+ {{ else }} + NO USERS?!? + {{ endif }} +
+
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl index 1d15e460d7..08952aad65 100644 --- a/view/theme/diabook/bottom.tpl +++ b/view/theme/diabook/bottom.tpl @@ -15,7 +15,7 @@ $(document).ready(function() { }); - $("div#pause").attr("style", "position: fixed;bottom: 25px;left: 5px;"); + $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;"); $("div#pause").html("pause"); $(document).keydown(function(event) { if (!$("div#pause").html()){ diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index c5a24ec48e..fc3594fdc9 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -6,7 +6,6 @@ -
$mytitle diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl new file mode 100644 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/diabook/contact_template.tpl @@ -0,0 +1,25 @@ + +
+
+
+ + $contact.name + + {{ if $contact.photo_menu }} + menu +
+
    + $contact.photo_menu +
+
+ {{ endif }} +
+ +
+
+
$contact.name
+ +
+
diff --git a/view/theme/diabook/diabook-aerith/style-network.css b/view/theme/diabook/diabook-aerith/style-network.css index af59203642..ef6e5cac14 100644 --- a/view/theme/diabook/diabook-aerith/style-network.css +++ b/view/theme/diabook/diabook-aerith/style-network.css @@ -1,6 +1,88 @@ -@import url('../../diabook/style-network.css'); +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ -/* There seem to be a stupid number of icons. Can we do this better? Are they all actually used? */ .icon.contacts { background-image: url("../diabook-aerith/icons/contacts.png");} .icon.notifications { @@ -11,6 +93,7 @@ background-image: url("../diabook-aerith/icons/messages.png");} .icon.community { background-image: url("../diabook-aerith/icons/community.png");} + .icon.drop { background-image: url("../diabook-aerith/icons/drop.png");} .icon.drophide { background-image: url("../diabook-aerith/icons/drop.png");} .icon.dislike { background-image: url("../diabook-aerith/icons/dislike.png");} @@ -26,91 +109,419 @@ .icon.lock { background-image: url("../diabook-aerith/icons/lock.png");} .icon.unlock { background-image: url("../diabook-aerith/icons/unlock.png");} .icon.language { background-image: url("../diabook-aerith/icons/language.png");} -.camera { background-image: url("../diabook-aerith/icons/camera.png");} -.attach { background-image: url("../diabook-aerith/icons/attach.png");} -.video2 { background-image: url("../diabook-aerith/icons/video.png");} -.video { background-image: url("../diabook-aerith/icons/video.png");} -.audio2 { background-image: url("../diabook-aerith/icons/audio.png");} -.audio { background-image: url("../diabook-aerith/icons/audio.png");} -.weblink { background-image: url("../diabook-aerith/icons/weblink.png");} -.globe { background-image: url("../diabook-aerith/icons/globe.png");} -.unglobe { background-image: url("../diabook-aerith/icons/unglobe.png");} -.edit {background-image: url("../diabook-aerith/icons/pencil2.png");} + + +.camera { background-image: url("../diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../diabook-aerith/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../diabook-aerith/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../diabook-aerith/icons/video.png"); + display: block; width: 100%; height: 140px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../diabook-aerith/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../diabook-aerith/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../diabook-aerith/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} + + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + .icon.on { background-image: url("../diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} .prev { background-position: -90px -60px;} .next { background-position: -110px -60px;} -.attachtype {background-image: url('../../../../images/content-types.png');} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../../images/content-types.png'); +} + +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + .icon.border.camera{ - background-image: url("../diabook-aerith/icons/camera.png");} -.icon.border.link{background-image: url("../diabook-aerith/icons/weblink.png");} -.icon.s10.notify {background-image: url("../../../../images/icons/10/notify_off.png");} -.icon.s10.gear {background-image: url("../../../../images/icons/10/gear.png");} -.icon.s10.add {background-image: url("../../../../images/icons/10/add.png");} -.icon.s10.delete {background-image: url("../../../../images/icons/10/delete.png");} -.icon.s10.edit {background-image: url("../../../../images/icons/10/edit.png");} -.icon.s10.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s10.menu {background-image: url("../../../../images/icons/10/menu.png");} -.icon.s10.link {background-image: url("../../../../images/icons/10/link.png");} -.icon.s10.lock {background-image: url("../../../../images/icons/10/lock.png");} -.icon.s10.unlock {background-image: url("../../../../images/icons/10/unlock.png");} -.icon.s16.notify {background-image: url("../../../../images/icons/16/notify_off.png");} -.icon.s16.gear {background-image: url("../../../../images/icons/16/gear.png");} -.icon.s16.add {background-image: url("../../../../images/icons/16/add.png");} -.icon.s16.delete {background-image: url("../../../../images/icons/16/delete.png");} -.icon.s16.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s16.menu {background-image: url("../../../../images/icons/16/menu.png");} -.icon.s16.lock {background-image: url("../../../../images/icons/16/lock.png");} -.icon.s16.unlock {background-image: url("../../../../images/icons/16/unlock.png");} -.icon.s22.notify {background-image: url("../../../../images/icons/22/notify_off.png");} -.icon.s22.gear {background-image: url("../../../../images/icons/22/gear.png");} -.icon.s22.add {background-image: url("../../../../images/icons/22/add.png");} -.icon.s22.delete {background-image: url("../../../../images/icons/22/delete.png");} -.icon.s22.edit {background-image: url("../../../../images/icons/22/edit.png");} -.icon.s22.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s22.menu {background-image: url("../../../../images/icons/22/menu.png");} -.icon.s22.link {background-image: url("../../../../images/icons/22/link.png");} -.icon.s22.lock {background-image: url("../../../../images/icons/22/lock.png");} -.icon.s22.unlock {background-image: url("../../../../images/icons/22/unlock.png");} -.icon.s48.notify {background-image: url("../../../../images/icons/48/notify_off.png");} -.icon.s48.gear {background-image: url("../../../../images/icons/48/gear.png");} -.icon.s48.add {background-image: url("../../../../images/icons/48/add.png");} -.icon.s48.delete {background-image: url("../../../../images/icons/48/delete.png");} -.icon.s48.edit {background-image: url("../../../../images/icons/48/edit.png");} -.icon.s48.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s48.menu {background-image: url("../../../../images/icons/48/menu.png");} -.icon.s48.link {background-image: url("../../../../images/icons/48/link.png");} -.icon.s48.lock {background-image: url("../../../../images/icons/48/lock.png");} -.icon.s48.unlock {background-image: url("../../../../images/icons/48/unlock.png");} + background-image: url("../diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../../images/icons/48/unlock.png"); +} -.hide-comments-outer {background-color: #fff;} +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} -a {color: #333333;} +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 1px; + width: 484px; + border-bottom: 1px solid #BDCDD4; + background-color: #fff; + padding: 8px; +} +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, #sidebar-group-list .tool:hover , #fileas-sidebar .tool:hover { background: aliceBlue; } - +.tool .label { + float: left; +} +.tool .action { + float: right; +} .tool a { color: #3465A4; } - -nav a, nav a:active, nav a:visited, nav a:link, nav a:hover { -color: #000; +.tool a:hover { + text-decoration: none; } - /* popup notifications */ -div.jGrowl div.notice {background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;} -div.jGrowl div.info {background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;} - - +div.jGrowl div.notice { + background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; background: #ff500f; background-color: #ff500f; + z-index: 100; border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; @@ -128,21 +539,47 @@ background-image: -webkit-gradient( color-stop(0.82, rgb(255,255,255)) ); } - -header #site-location {display: none;} - +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: left; + width: 82%%; + margin-left: 25%; +} header #banner a, header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { color: black; + text-decoration: none; + outline: none; + vertical-align: middle; font-weight: bolder; + margin-left: 3px; } - +header #banner #logo-img { + height: 25px; + margin-top: 3px; +} +header #banner #logo-text { + font-size: 20px; + position: absolute; + top: 10%; +} +/* nav */ nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; background: #ff500f; color: #000; + z-index: 99; border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; @@ -160,7 +597,95 @@ background-image: -webkit-gradient( color-stop(0.82, rgb(255,255,255)) ); } +nav a, +nav a:active, +nav a:visited, +nav a:link, +nav a:hover { + /*color: #1f1f1f;*/ + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} nav .nav-menu-icon:hover { position: relative; height: 22px; @@ -171,21 +696,93 @@ nav .nav-menu-icon:hover { border-radius: 5px 5px 0 0; } - nav .nav-notify { +nav .nav-menu-icon.selected { background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #fff; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; border: 1px solid black; } - -nav #nav-home-link, #nav-directory-link, #nav-apps-link{font-size: 14px;} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + font-size: 14px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; +} nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ - background-image: url("../diabook-aerith/icons/messages.png");} + background-image: url("../diabook-aerith/icons/messages.png"); + } /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ - background-image: url("../diabook-aerith/icons/notify.png");} + background-image: url("../diabook-aerith/icons/notify.png"); + } nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ - background-image: url("../diabook-aerith/icons/contacts.png");} + background-image: url("../diabook-aerith/icons/contacts.png"); + } nav #nav-apps-link.selected { background-color: #fff; @@ -194,70 +791,1327 @@ nav #nav-apps-link.selected { border-radius: 5px 5px 0 0; } -ul.menu-popup a:hover { - background-color: #3465A4; - color: #fff; +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ } +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #fff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #3465A4; /*bdcdd4;*/ + color: #fff; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; + +} #profile_side a{ color: #333; } +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: aliceBlue; + } +.menu-profile-list-item{ + padding-left: 5px; + vertical-align: middle; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-icon.home{ + background: url("../diabook-aerith/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; + } +.menu-profile-icon.photos{ + background: url("../diabook-aerith/icons/mess_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ + background: url("../diabook-aerith/icons/events.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ + background: url("../diabook-aerith/icons/notes.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ + background: url("../diabook-aerith/icons/pubgroups.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ + background: url("../diabook-aerith/icons/com_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ + background: url("../diabook-aerith/icons/pscontacts.png") no-repeat; + float: left; + height: 22px; + width: 22px;} -.menu-profile-list:hover{background: aliceBlue;} +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 160px; + padding: 0px 10px 0px 10px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside #page-sidebar{display: none;} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +aside #search-text { + width: 150px; + height: 17px; + padding-left: 10px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; +-moz-border-bottom-colors: #dbdbdb; + -moz-border-top-colors: #999; + -moz-border-left-colors: #999; + -moz-border-right-colors: #dbdbdb; +} +aside #side-follow-url { + width: 150px; + } +aside #side-peoplefind-url { + width: 150px; + } +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.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; +} +.widget input.action { + 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; +} +.widget:hover .title .action { + 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; +} +.widget .tool:hover .action { + 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; +} +.widget .tool:hover .action.ticked { + 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; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums ul li a{ + color: #3465A4; +} +.widget .tool.selected { + background: url("../diabook-aerith/icons/selected.png") no-repeat left center; +} +/* widget: search */ +span.sbox_l { + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + +} -.menu-profile-icon.home{background: url("../diabook-aerith/icons/home.png") no-repeat;} -.menu-profile-icon.photos{background: url("../diabook-aerith/icons/mess_side.png") no-repeat;} -.menu-profile-icon.events{background: url("../diabook-aerith/icons/events.png") no-repeat;} -.menu-profile-icon.notes{background: url("../diabook-aerith/icons/notes.png") no-repeat;} -.menu-profile-icon.foren{background: url("../diabook-aerith/icons/pubgroups.png") no-repeat;} -.menu-profile-icon.com_side{background: url("../diabook-aerith/icons/com_side.png") no-repeat;} -.menu-profile-icon.pscontacts{background: url("../diabook-aerith/icons/pscontacts.png") no-repeat;} +span.sbox_r { + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; +} -aside #dfrn-request-link {background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;} +span.sbox input { + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: auto; + padding: 0px 0px 0px 12px; +} -#side-bar-photos-albums li{list-style-type: disc;} -#side-bar-photos-albums ul li{margin-left: 30px; - padding-left: 0px;} -#side-bar-photos-albums ul li a{color: #3465A4;} +body .pageheader{ + text-align: center; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; + } +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } +#birthday-wrapper a { + color: #3465A4; + } -.widget .tool.selected {background: url("../diabook-aerith/icons/selected.png") no-repeat left center;} -span.sbox_l {background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left;} -span.sbox_r {background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left;} -span.sbox input {background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left;} -#birthday-wrapper a {color: #3465A4;} +right_aside { + display: table-cell; + vertical-align: top; + width: 170px; + + /*border-left: 1px solid #D2D2D2;*/ + + /* background: #F1F1F1; */ +} right_aside a{color: #3465A4;} - +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; +margin-top:30px;} +right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } +right_aside .directory-photo { margin: 0px; } +right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } +right_aside #likes { margin: 0px; padding: 0px; list-style: none; } +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} +right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../diabook-aerith/icons/close_box.png"); - cursor: pointer;} + float: right; + cursor: pointer; + opacity: 0.1; + } +.close_box:hover { + background-image: url("../diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + 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; + } -.close_box:hover {background-image: url("../diabook-aerith/icons/close_box.png");} -.tread-wrapper a{color: #3465A4;} +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 575px; + padding-top: 10px; +} +.tread-wrapper a{ + color: #3465A4; +} -.wall-item-comment-wrapper {background-color: #fff; - width: 500px;} +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} -.button.creation2 {background-color: #3465A4;} +.wall-item-container { + display: table; + width: 580px; +} -#acl-search {background: #ffffff url("../../../../images/search_18.png") no-repeat right center;} -#acl-showall {background-image: url("../../../../images/show_all_off.png");} +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} -#acl-showall.selected {background-image: url("../../../../images/show_all_on.png");} +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* 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:hover .wall-item-bottom { +/* 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-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-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} -.acl-button-show {background-image: url("../../../../images/show_off.png");} -.acl-button-hide {background-image: url("../../../../images/hide_off.png");} -.acl-button-show.selected {background-image: url("../../../../images/show_on.png");} -.acl-button-hide.selected {background-image: url("../../../../images/hide_on.png");} +.wall-item-container .wall-item-content { -ul.tabs li .active {background-color: #3465A4;} + max-width: 420px; + word-wrap: break-word; -.field .onoff a {background-image: url("../../../../images/onoff.jpg");} -.oauthapp img.noicon {background-image: url("../../../../images/icons/48/plugin.png");} +} +.wall-item-container .wall-item-content img { + max-width: 400px; + +} +.wall-item-container .wall-item-links, .wall-item-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; + -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; + -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 { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-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-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 500px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} + +.wall-item-comment-wrapper { + margin: 1px 5px 5px 80px; + background-color: #fff; + width: 500px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1.6em ; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 500px; + margin-top: 10px; + background-color: #fff797; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 585px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +.grey +{ + display: inline; + float: right; + } +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 583px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #d2d2d2; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 585px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 585px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 585px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; + +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; +} +.button.creation2 { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + cursor: pointer; + font-weight: bolder; +} +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} +ul.tabs li .active { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + margin-left: 5px; +} +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666666; + background-image: url("../../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; margin: 0px; @@ -265,17 +2119,498 @@ border-radius: 10px; height: 145px !important; width: 145px !important; } - .lframe { float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; } -.contact-photo-menu-button {background-image: url("../../../../images/icons/16/menu.png");} +.contact-photo-menu-button { + position: relative; + background-image: url("../../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -16px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} -.event-description:before {content: url('../../../../images/calendar.png');} +/* page footer */ +footer { + height: 100px; + display: table-row; +} -.calendar.eventcal a {color: #3465A4;} +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + + font-weight: bold; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ +#prof-members-end{ + clear: both; + } + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#prvmail-upload-wrapper, +#prvmail-link-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; +} + +#prvmail-end { + clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} +a.mail-list-link { + display: block; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*a.mail-list-link:hover { +* background-color: #15607B; +* color: #F5F6FB; +*} +*/ + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.eventcal { + float: left; + font-size: 20px; +} + +.vevent { + +} +.vevent .event-description, .vevent .event-location { + margin-left: 10px; + margin-right: 10px; +} +.vevent .event-start { + margin-left: 10px; + margin-right: 10px; +} + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} + +.event-description:before { + content: url('../../../../images/calendar.png'); + margin-right: 15px; +} + +.event-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.calendar.eventcal a { + color: #3465A4; + } +.today { + font-weight: bold; + color: #FF0000; +} + +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + +#identity-manage-desc { + margin-top:15px; + margin-bottom: 15px; +} + +#identity-manage-choose { + margin-bottom: 15px; +} + +#identity-submit { + margin-top: 20px; +} + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} +.lightbox{ + float: left; + } + +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + 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; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.profile-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.profile-match-name { + float: left; + text-align: center; + width: 120px; + overflow: hidden; +} + +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: 0px; + top: -16px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums{ + margin-top: 15px; + } +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} .photo-top-album-name { width: 100%; position: absolute; @@ -283,5 +2618,40 @@ width: 145px !important; padding-left: 3px; background-color: #EEE; } -.photo-top-album-link{color: #3465A4;} +.photo-top-album-link{ + color: #3465A4; + } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} diff --git a/view/theme/diabook/diabook-aerith/style-profile.css b/view/theme/diabook/diabook-aerith/style-profile.css index c6c1fecfa6..2b7d3df173 100644 --- a/view/theme/diabook/diabook-aerith/style-profile.css +++ b/view/theme/diabook/diabook-aerith/style-profile.css @@ -1,10 +1,99 @@ -@import url('../../diabook/style-profile.css'); +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ - .icon.contacts {background-image: url("../diabook-aerith/icons/contacts.png");} -.icon.notifications {background-image: url("../diabook-aerith/icons/notifications.png");} -.icon.notify {background-image: url("../diabook-aerith/icons/notify.png");} -.icon.messages {background-image: url("../diabook-aerith/icons/messages.png");} -.icon.community {background-image: url("../diabook-aerith/icons/community.png");} +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + +.icon.contacts { + background-image: url("../diabook-aerith/icons/contacts.png");} +.icon.notifications { + background-image: url("../diabook-aerith/icons/notifications.png");} +.icon.notify { + background-image: url("../diabook-aerith/icons/notify.png");} +.icon.messages { + background-image: url("../diabook-aerith/icons/messages.png");} +.icon.community { + background-image: url("../diabook-aerith/icons/community.png");} + .icon.drop { background-image: url("../diabook-aerith/icons/drop.png");} .icon.drophide { background-image: url("../diabook-aerith/icons/drop.png");} .icon.dislike { background-image: url("../diabook-aerith/icons/dislike.png");} @@ -20,73 +109,419 @@ .icon.lock { background-image: url("../diabook-aerith/icons/lock.png");} .icon.unlock { background-image: url("../diabook-aerith/icons/unlock.png");} .icon.language { background-image: url("../diabook-aerith/icons/language.png");} -.camera { background-image: url("../diabook-aerith/icons/camera.png");} -.attach { background-image: url("../diabook-aerith/icons/attach.png");} -.video2 { background-image: url("../diabook-aerith/icons/video.png");} -.video { background-image: url("../diabook-aerith/icons/video.png");} -.audio2 { background-image: url("../diabook-aerith/icons/audio.png");} -.audio { background-image: url("../diabook-aerith/icons/audio.png");} -.weblink { background-image: url("../diabook-aerith/icons/weblink.png");} -.globe { background-image: url("../diabook-aerith/icons/globe.png");} -.unglobe { background-image: url("../diabook-aerith/icons/unglobe.png");} -.edit {background-image: url("../diabook-aerith/icons/pencil2.png");} + + +.camera { background-image: url("../diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../diabook-aerith/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../diabook-aerith/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../diabook-aerith/icons/video.png"); + display: block; width: 100%; height: 140px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../diabook-aerith/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../diabook-aerith/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../diabook-aerith/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} + + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + .icon.on { background-image: url("../diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} .prev { background-position: -90px -60px;} .next { background-position: -110px -60px;} -.attachtype {background-image: url('../../../../images/content-types.png');} -.icon.border.camera{background-image: url("../diabook-aerith/icons/camera.png");} -.icon.border.link{background-image: url("../diabook-aerith/icons/weblink.png");} -.icon.s10.notify {background-image: url("../../../../images/icons/10/notify_off.png");} -.icon.s10.gear {background-image: url("../../../../images/icons/10/gear.png");} -.icon.s10.add {background-image: url("../../../../images/icons/10/add.png");} -.icon.s10.delete {background-image: url("../../../../images/icons/10/delete.png");} -.icon.s10.edit {background-image: url("../../../../images/icons/10/edit.png");} -.icon.s10.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s10.menu {background-image: url("../../../../images/icons/10/menu.png");} -.icon.s10.link {background-image: url("../../../../images/icons/10/link.png");} -.icon.s10.lock {background-image: url("../../../../images/icons/10/lock.png");} -.icon.s10.unlock {background-image: url("../../../../images/icons/10/unlock.png");} -.icon.s16.notify {background-image: url("../../../../images/icons/16/notify_off.png");} -.icon.s16.gear {background-image: url("../../../../images/icons/16/gear.png");} -.icon.s16.add {background-image: url("../../../../images/icons/16/add.png");} -.icon.s16.delete {background-image: url("../../../../images/icons/16/delete.png");} -.icon.s16.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s16.menu {background-image: url("../../../../images/icons/16/menu.png");} -.icon.s16.lock {background-image: url("../../../../images/icons/16/lock.png");} -.icon.s16.unlock {background-image: url("../../../../images/icons/16/unlock.png");} -.icon.s22.notify {background-image: url("../../../../images/icons/22/notify_off.png");} -.icon.s22.gear {background-image: url("../../../../images/icons/22/gear.png");} -.icon.s22.add {background-image: url("../../../../images/icons/22/add.png");} -.icon.s22.delete {background-image: url("../../../../images/icons/22/delete.png");} -.icon.s22.edit {background-image: url("../../../../images/icons/22/edit.png");} -.icon.s22.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s22.menu {background-image: url("../../../../images/icons/22/menu.png");} -.icon.s22.link {background-image: url("../../../../images/icons/22/link.png");} -.icon.s22.lock {background-image: url("../../../../images/icons/22/lock.png");} -.icon.s22.unlock {background-image: url("../../../../images/icons/22/unlock.png");} -.icon.s48.notify {background-image: url("../../../../images/icons/48/notify_off.png");} -.icon.s48.gear {background-image: url("../../../../images/icons/48/gear.png");} -.icon.s48.add {background-image: url("../../../../images/icons/48/add.png");} -.icon.s48.delete {background-image: url("../../../../images/icons/48/delete.png");} -.icon.s48.edit {background-image: url("../../../../images/icons/48/edit.png");} -.icon.s48.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s48.menu {background-image: url("../../../../images/icons/48/menu.png");} -.icon.s48.link {background-image: url("../../../../images/icons/48/link.png");} -.icon.s48.lock {background-image: url("../../../../images/icons/48/lock.png");} -.icon.s48.unlock {background-image: url("../../../../images/icons/48/unlock.png");} +/*.tagged { background-position: -130px -60px;}*/ -a {color: #333333;} +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../../images/content-types.png'); +} -#sidebar-group-list .tool:hover {background: #EEE;} +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.border.camera{ + background-image: url("../diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 484px; + border-bottom: 1px solid #BDCDD4; + border-top: 1px solid #BDCDD4; + + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover { + background: #EEE; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: ##3F8FBA; +} +.tool a:hover { + text-decoration: none; +} +/* popup notifications */ div.jGrowl div.notice { - background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;} -div.jGrowl div.info {background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;} - + background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; background: #ff500f; background-color: #ff500f; + z-index: 100; border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; @@ -104,18 +539,47 @@ background-image: -webkit-gradient( color-stop(0.82, rgb(255,255,255)) ); } - +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: left; + width: 82%%; + margin-left: 25%; +} header #banner a, header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { color: #1f1f1f; - font-weight: bolder;} - + text-decoration: none; + outline: none; + vertical-align: middle; + font-weight: bolder; + margin-left: 3px; +} +header #banner #logo-img { + height: 25px; + margin-top: 3px; +} +header #banner #logo-text { + font-size: 20px; + position: absolute; + top: 10%; +} +/* nav */ nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; background: #ff500f; color: #1f1f1f; + z-index: 99; border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; @@ -133,23 +597,95 @@ background-image: -webkit-gradient( color-stop(0.82, rgb(255,255,255)) ); } - nav a, nav a:active, nav a:visited, nav a:link, nav a:hover { - color: #1f1f1f;} - + color: #1f1f1f; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} nav #banner a, nav #banner a:active, nav #banner a:visited, nav #banner a:link, nav #banner a:hover { color: #1f1f1f; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; } +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} nav .nav-menu-icon:hover { position: relative; height: 22px; @@ -160,10 +696,81 @@ nav .nav-menu-icon:hover { border-radius: 5px 5px 0 0; } -nav .nav-notify { +nav .nav-menu-icon.selected { background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #fff; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; border: 1px solid black; } +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + font-size: 14px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; +} nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ background-image: url("../diabook-aerith/icons/messages.png"); @@ -176,7 +783,7 @@ nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selecte nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ background-image: url("../diabook-aerith/icons/contacts.png"); } - + nav #nav-apps-link.selected { background-color: #fff; moz-border-radius: 5px 5px 0 0; @@ -184,11 +791,169 @@ nav #nav-apps-link.selected { border-radius: 5px 5px 0 0; } -ul.menu-popup a:hover { - background-color: #3465A4; - color: #fff; +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ } +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #fff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #3465A4; /*bdcdd4;*/ + color: #fff; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ + +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 16px; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: #EEE; + } +.menu-profile-list-item{ + padding-left: 5px; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } +/*http://prothemedesign.com/circular-icons/*/ .menu-profile-list.home{ background: url("../diabook-aerith/icons/home.png") no-repeat; } @@ -208,10 +973,172 @@ ul.menu-popup a:hover { background: url("../diabook-aerith/icons/com_side.png") no-repeat; } -aside #dfrn-request-link { - background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center; - } +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 160px; + padding: 0px 10px 0px 10px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +aside #search-text { + width: 150px; + height: 17px; + padding-left: 10px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; +} +aside #side-follow-url { + width: 150px; + } +aside #side-peoplefind-url { + width: 150px; + } +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 48px; + height: 48px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.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; +} +.widget input.action { + 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; +} +.widget:hover .title .action { + 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; +} +.widget .tool:hover .action { + 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; +} +.widget .tool:hover .action.ticked { + 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; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} #side-bar-photos-albums li{ list-style-type: disc; } @@ -222,55 +1149,780 @@ list-style-type: disc; #side-bar-photos-albums ul li a{ color: #3465A4; } - .widget .tool.selected { background: url("../diabook-aerith/icons/selected.png") no-repeat left center; } - +/* widget: search */ span.sbox_l { background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + } span.sbox_r { background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; } span.sbox input { background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 611px; + padding: 0px 0px 0px 12px; } +body .pageheader{ + text-align: center; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; + } +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} + +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } #birthday-wrapper a { color: #3465A4; } +right_aside { + display: table-cell; + vertical-align: top; + width: 170px; + /*padding-right: 10px;*/ + /*border-left: 1px solid #D2D2D2;*/ + + /* background: #F1F1F1; */ +} right_aside a{color: #3465A4;} - +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; +margin-top:30px;} +right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } +right_aside .directory-photo { margin: 0px; } +right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } +right_aside #likes { margin: 0px; padding: 0px; list-style: none; } +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} +right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 0.1; } .close_box:hover { background-image: url("../diabook-aerith/icons/close_box.png"); + float: right; + cursor: pointer; + 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 */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 575px; + padding-top: 10px; +} .tread-wrapper a{ color: #3465A4; } - -.button.creation2 { - background-color: #3465A4;} - -#acl-search { - background: #ffffff url("../../../../images/search_18.png") no-repeat right center; +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; } +.wall-item-container { + display: table; + width: 580px; +} + + +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} + +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* 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:hover .wall-item-bottom { +/* 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-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-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} + +.wall-item-container .wall-item-content { + + max-width: 420px; + word-wrap: break-word; + + +} + +.wall-item-container .wall-item-content img { + max-width: 400px; + +} +.wall-item-container .wall-item-links, .wall-item-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; + -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; + -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 { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-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-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 500px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 5px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1.6em ; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 500px; + margin-top: 10px; + background-color: #fff797; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 585px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +.grey +{ + display: inline; + float: right; + } +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 583px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #d2d2d2; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 585px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 585px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 585px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + font-weight: bolder; + cursor: pointer; +} +.button.creation2 { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + font-weight: bolder; + cursor: pointer; +} +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} #acl-showall { - background-image: url("../../../../images/show_all_off.png");} - + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} #acl-showall.selected { - background-image: url("../../../../images/show_all_on.png");} - + color: #000000; + background-color: #ff9900; + background-image: url("../../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} .acl-button-show { background-image: url("../../../../images/show_off.png"); } @@ -278,37 +1930,657 @@ right_aside a{color: #3465A4;} background-image: url("../../../../images/hide_off.png"); } .acl-button-show.selected { + color: #000000; + background-color: #9ade00; background-image: url("../../../../images/show_on.png"); } .acl-button-hide.selected { + color: #000000; + background-color: #ff4141; background-image: url("../../../../images/hide_on.png"); } - - +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} ul.tabs li .active { - background-color: #3465A4;} - + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + margin-left: 5px; +} +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} .field .onoff a { + display: block; + border: 1px solid #666666; background-image: url("../../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; } +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} .oauthapp img.noicon { background-image: url("../../../../images/icons/48/plugin.png"); - } - + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 0px;} +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; +} +.lframe { + float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; +} -.contact-photo-menu-button {background-image: url("../../../../images/icons/16/menu.png");} +.contact-photo-menu-button { + position: relative; + background-image: url("../../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -16px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + + font-weight: bold; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 48px; + height: 48px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ +#prof-members-end{ + clear: both; + } + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#prvmail-upload-wrapper, +#prvmail-link-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; +} + +#prvmail-end { + clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} +a.mail-list-link { + display: block; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*a.mail-list-link:hover { +* background-color: #15607B; +* color: #F5F6FB; +*} +*/ + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.eventcal { + float: left; + font-size: 20px; +} + +.vevent { + +} +.vevent .event-description, .vevent .event-location { + margin-left: 10px; + margin-right: 10px; +} +.vevent .event-start { + margin-left: 10px; + margin-right: 10px; +} + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} .event-description:before { - content: url('../../../../images/calendar.png');} + content: url('../../../../images/calendar.png'); + margin-right: 15px; +} +.event-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} .calendar.eventcal a { color: #3465A4; } +.today { + font-weight: bold; + color: #FF0000; +} +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + +#identity-manage-desc { + margin-top:15px; + margin-bottom: 15px; +} + +#identity-manage-choose { + margin-bottom: 15px; +} + +#identity-submit { + margin-top: 20px; +} + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} +.lightbox{ + float: left; + } + +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + 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; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.profile-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.profile-match-name { + float: left; + text-align: center; + width: 120px; + overflow: hidden; +} + +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: 0px; + top: -16px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums{ + margin-top: 15px; + } +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} .photo-top-album-name { width: 100%; position: absolute; @@ -319,3 +2591,37 @@ margin: 0px;} .photo-top-album-link{ color: #3465A4; } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index 3ca3fa1048..630b331e93 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -1,22 +1,119 @@ -@import url('../diabook/style.css'); +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ -/* Why are these paths so long? They should probably become ../icons/ in the next revision */ +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; + list-style: none; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ .icon.bb-url{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-url.png");} + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-url.png"); + float: right; + margin-top: 2px;} .icon.quote{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/quote.png");} + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/quote.png"); + float: right; + margin-top: 2px;} .icon.bold{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bold.png");} + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bold.png"); + float: right; + margin-top: 2px;} .icon.underline{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/underline.png");} + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/underline.png"); + float: right; + margin-top: 2px;} .icon.italic{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/italic.png");} + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/italic.png"); + float: right; + margin-top: 2px;} .icon.bb-image{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-image.png");} + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-image.png"); + float: right; + margin-top: 2px;} .icon.bb-video{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-video.png");} - .icon.contacts { + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-video.png"); + float: right; + margin-top: 2px;} + +.icon.contacts { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png");} .icon.notifications { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notifications.png");} @@ -42,57 +139,446 @@ .icon.lock { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/lock.png");} .icon.unlock { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unlock.png");} .icon.language { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/language.png");} -.camera { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png");} -.attach { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/attach.png");} -.video2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); } -.video { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png");} -.audio2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png");} -.audio { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png");} -.weblink { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png");} -.globe { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/globe.png");} -.unglobe { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unglobe.png");} -.edit {background-image: url("../../../view/theme/diabook/diabook-aerith/icons/pencil2.png");} -.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png");} -.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png");} -.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png");} + + +.camera { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); + display: block; width: 100%; height: 140px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../../../view/theme/diabook/diabook-aerith/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} +.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png"); + display: block; width: 16px; height: 16px; background-repeat: no-repeat;} +.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png"); + display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;} +.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png"); + display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;} + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + .icon.on { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} .icon.prev { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/prev.png"); background-repeat: no-repeat;} .icon.next { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/next.png"); background-repeat: no-repeat;} -icon.border.camera{background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png");} -.icon.border.link{background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png");} -av #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/messages.png");} -.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notify.png");} -nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png");} +/*.tagged { background-position: -130px -60px;}*/ -.menu-profile-icon.home{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/home.png") no-repeat;} -.menu-profile-icon.photos{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/mess_side.png") no-repeat;} -.menu-profile-icon.events{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/events.png") no-repeat;} -.menu-profile-icon.notes{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/notes.png") no-repeat;} -.menu-profile-icon.foren{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/pubgroups.png") no-repeat;} -.menu-profile-icon.com_side{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/com_side.png") no-repeat;} -.menu-profile-icon.pscontacts{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/pscontacts.png") no-repeat;} +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.png'); +} + +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.border.camera{ + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 684px; + border-bottom: 1px solid #BDCDD4; + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +#jappix_mini { +right: 45px !important; +} +h4 { + font-size: 1.1em; +} +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} -a {color: #333333;} +.wall-item-name-link { +/* float: left;*/ +} -#fileas-sidebar .tool:hover {background: aliceBlue;} +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3465A4; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*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; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: aliceBlue; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: ##3F8FBA; +} +.tool a:hover { + text-decoration: none; +} +/* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} /* header */ header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; background: #ff500f; background-color: #ff500f; + z-index: 100; border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; @@ -101,6 +587,7 @@ background-image: -o-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,2 background-image: -moz-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); background-image: -webkit-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); background-image: -ms-linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); + background-image: -webkit-gradient( linear, left bottom, @@ -109,30 +596,126 @@ background-image: -webkit-gradient( color-stop(0.82, rgb(255,255,255)) ); } - +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: banner; + width: 82%; + margin-left: 25%; +} header #banner a, header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { color: #1f1f1f; + text-decoration: none; + outline: none; + vertical-align: middle; font-weight: bolder; + margin-left: 3px; +} +header #banner #logo-img { + height: 25px; + margin-top: 3px; } - header #banner #logo-text { font-size: 20px!important;position: relative!important;top: -4px!important; } - /* messages */ #message-new { background: #3465A4; border: 1px solid #333; + width: 150px; +} +#message-new a { + color: #ffffff; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + text-decoration: none; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + 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; +} +#mail-display-subject:hover .mail-delete { + 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; } - /* nav */ -nav { background: #ff500f; +nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; + background: #ff500f; color: #1f1f1f; - border-bottom: 1px; + z-index: 99; + border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; background-image: linear-gradient(bottom, rgb(215,227,241) 26%, rgb(255,255,255) 82%); @@ -149,15 +732,95 @@ background-image: -webkit-gradient( color-stop(0.82, rgb(255,255,255)) ); } - nav a, nav a:active, nav a:visited, nav a:link, nav a:hover { color: #1f1f1f; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; } +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} nav .nav-menu-icon:hover { position: relative; height: 22px; @@ -168,15 +831,94 @@ nav .nav-menu-icon:hover { border-radius: 5px 5px 0 0; } +nav .nav-menu-icon.selected { + background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} nav .nav-notify { -background-color: #fff; + display: none; + position: absolute; + background-color: #fff; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; border: 1px solid black; } - +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } nav #nav-home-link, #nav-directory-link, #nav-apps-link{ -font-size: 14px; + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + font-size: 14px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; } +nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/messages.png"); + } + +/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notify.png"); + } + +nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ + background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png"); + } + nav #nav-apps-link.selected { background-color: #fff; moz-border-radius: 5px 5px 0 0; @@ -184,18 +926,285 @@ nav #nav-apps-link.selected { border-radius: 5px 5px 0 0; } -ul.menu-popup { - background: #fff;} +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #fff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} ul.menu-popup a:hover { background-color: #3465A4; /*bdcdd4;*/ color: #fff; } +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 425px !important; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ -.menu-profile-list:hover{ - background: aliceBlue; +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; } +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: aliceBlue; + } +.menu-profile-list-item{ + padding-left: 5px; + vertical-align: middle; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-icon.home{ + background: url("../../../view/theme/diabook/diabook-aerith/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; + } +.menu-profile-icon.photos{ + background: url("../../../view/theme/diabook/diabook-aerith/icons/mess_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ + background: url("../../../view/theme/diabook/diabook-aerith/icons/events.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ + background: url("../../../view/theme/diabook/diabook-aerith/icons/notes.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ + background: url("../../../view/theme/diabook/diabook-aerith/icons/pubgroups.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ + background: url("../../../view/theme/diabook/diabook-aerith/icons/com_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ + background: url("../../../view/theme/diabook/diabook-aerith/icons/pscontacts.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 180px; + padding: 0px 10px 0px 20px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside #page-sidebar{display: none;} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +aside #search-text { + width: 173px; + height: 17px; + padding-left: 10px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; +} +aside #side-follow-url { + width: 173px; + } +aside #side-peoplefind-url { + width: 173px; + } +#contact-block { + overflow: auto; + height: auto; +} aside #likes a, a:visited, a:link { color: #3465A4; text-decoration: none; @@ -206,8 +1215,41 @@ aside #likes a:hover{ text-decoration: underline; } +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +#login-submit-wrapper{ - + margin-bottom: 12px; + } +aside #login-submit-button{ + margin-left: 0px!important; + } +aside #login-extra-links{ + padding-top: 0px!important; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -252,24 +1294,283 @@ transition: all 0.2s ease-in-out; float: right; height: 10px; } - +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.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; +} +.widget input.action { + 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; +} +.widget:hover .title .action { + 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; +} +.widget .tool:hover .action { + 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; +} +.widget .tool:hover .action.ticked { + 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; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} #side-bar-photos-albums ul li{ margin-left: 30px; padding-left: 0px; } #side-bar-photos-albums ul li a{ color: #3465A4; - +} .widget .tool.selected { - background: url("../../../view/theme/diabook/diabook-aerith/icons/selected.png") no-repeat left center;} + background: url("../../../view/theme/diabook/diabook-aerith/icons/selected.png") no-repeat left center; +} +/* widget: search */ +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 800px; + padding: 0px 0px 0px 12px; +} +body .pageheader{ + text-align: center; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 775px; + } +.qcomment{ + max-width: 122px; + } +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} + +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } #birthday-wrapper a { color: #3465A4; } - +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 775px; + padding-top: 10px; +} .tread-wrapper a{ color: #3465A4; } +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} + +.wall-item-container { + 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 { + + max-width: 720px; + word-wrap: break-word; + + 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 { display: table-row; @@ -384,41 +1685,1261 @@ transition: all 0.2s ease-in-out; width: 700px; border-bottom: 1px solid hsl(198, 21%, 79%); } +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 5px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1.6em ; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} .comment-edit-preview { width: 500px; margin-top: 10px; background-color: #fff797; } +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ -.button.creation2 { - background-color: #3465A4; - cursor: pointer; +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; } +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} -/*ACL*/ +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 785px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +.grey +{ + display: inline; + float: right; + } +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 783px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title, #profile-jot-form #jot-category { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #d2d2d2; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 785px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 785px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 785px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; + +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + font-weight: bolder; + cursor: pointer; +} +.button.creation2 { + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + font-weight: bolder; + cursor: pointer; +} +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} ul.tabs li .active { background-color: #3465A4; - box-shadow: 2px 2px 2px #CFCFCF;} - + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + margin-left: 5px; +} +//settings tabs +ul.rs_tabs { + list-style-type: none; + font-size: 11px; +} +ul.rs_tabs li { + float: left; + margin-bottom: 30px; + clear: both; +} ul.rs_tabs li .selected { - background-color: #3465A4;} + background-color: #3465A4; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + font-size: 13px; +} +.rs_tabs { + list-style-type: none; + font-size: 11px; + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.rs_tab.button { + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bolder; + padding: 3px; + color: #333333; + text-decoration: none; + } +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666666; + background-image: url("../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +.suggest-select { +width: 500px; +height: 350px; + } +.message-to-select { + width: 400px; + height: 150px; + } +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} -/*Photo */ +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; +} +.lframe { + float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; } +.contact-photo-menu-button { + position: relative; + background-image: url("../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -16px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + + font-weight: bold; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ +#prof-members-end{ + clear: both; + } + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#prvmail-upload-wrapper, +#prvmail-link-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; +} + +#prvmail-end { + clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} +a.mail-list-link { + display: block; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*a.mail-list-link:hover { +* background-color: #15607B; +* color: #F5F6FB; +*} +*/ + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.eventcal { + float: left; + font-size: 20px; +} + +.vevent { +position: relative; +width: 400px; +padding: 20px; +padding-top: 10px; +margin: 0 0px; +margin-bottom: 10px; +background-color: white; +-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +} +.vevent .event-location { + margin-left: 10px; + margin-right: 10px; +} +.vevent .event-description { +margin-left: 10px; +margin-right: 10px; +font-size: 1.1em; +font-weight: bolder; +} +.vevent .event-start, .vevent .event-end { + +margin-right: 20px; +margin-bottom: 2px; +margin-top: 2px; +font-size: 0.9em; +text-align: left; +} +.event-start .dtstart, .event-end .dtend { +float: right; +} + + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} + +.event-description:before { + content: url("../../../view/theme/diabook/icons/events2.png") !important; + margin-right: 15px; +} + +.event-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} .calendar.eventcal a { color: #3465A4; + } +.today { + font-weight: bold; + color: #FF0000; } +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + +#identity-manage-desc { + margin-top:15px; + margin-bottom: 15px; +} + +#identity-manage-choose { + margin-bottom: 15px; +} + +#identity-submit { + margin-top: 20px; +} + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} +.lightbox{ + float: left; + } +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + margin-right: 10px; + } +.wall-item-like-buttons .icon.like { +float: left; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.profile-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.profile-match-name { + float: left; + text-align: center; + width: 120px; + overflow: hidden; +} + +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: 0px; + top: -16px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 800px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} + +section .directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} +.contact-name { + font-weight: bold; + font-size: 18px; + margin-bottom: -3px; + text-align: left; +} +.contact-details { + color: #999999; +} +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} +#side-bar-photos-albums{ + margin-top: 15px; +} +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} .photo-top-album-name { width: 100%; position: absolute; @@ -428,4 +2949,38 @@ border-radius: 10px; } .photo-top-album-link{ color: #3465A4; -} \ No newline at end of file + } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook/diabook-blue/style-network.css b/view/theme/diabook/diabook-blue/style-network.css index 873cbb26fa..123792b656 100644 --- a/view/theme/diabook/diabook-blue/style-network.css +++ b/view/theme/diabook/diabook-blue/style-network.css @@ -1,6 +1,88 @@ -@import url('../../diabook/style-network.css'); +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ -/* There seem to be a stupid number of icons. Can we do this better? Are they all actually used? */ .icon.contacts { background-image: url("../diabook-blue/icons/contacts.png");} .icon.notifications { @@ -11,6 +93,7 @@ background-image: url("../diabook-blue/icons/messages.png");} .icon.community { background-image: url("../diabook-blue/icons/community.png");} + .icon.drop { background-image: url("../diabook-blue/icons/drop.png");} .icon.drophide { background-image: url("../diabook-blue/icons/drop.png");} .icon.dislike { background-image: url("../diabook-blue/icons/dislike.png");} @@ -26,109 +109,557 @@ .icon.lock { background-image: url("../diabook-blue/icons/lock.png");} .icon.unlock { background-image: url("../diabook-blue/icons/unlock.png");} .icon.language { background-image: url("../diabook-blue/icons/language.png");} -.camera { background-image: url("../diabook-blue/icons/camera.png");} -.attach { background-image: url("../diabook-blue/icons/attach.png");} -.video2 { background-image: url("../diabook-blue/icons/video.png");} -.video { background-image: url("../diabook-blue/icons/video.png");} -.audio2 { background-image: url("../diabook-blue/icons/audio.png");} -.audio { background-image: url("../diabook-blue/icons/audio.png");} -.weblink { background-image: url("../diabook-blue/icons/weblink.png");} -.globe { background-image: url("../diabook-blue/icons/globe.png");} -.unglobe { background-image: url("../diabook-blue/icons/unglobe.png");} -.edit {background-image: url("../diabook-blue/icons/pencil2.png");} + + +.camera { background-image: url("../diabook-blue/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../diabook-blue/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../diabook-blue/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../diabook-blue/icons/video.png"); + display: block; width: 100%; height: 140px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../diabook-blue/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../diabook-blue/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../diabook-blue/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../diabook-blue/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../diabook-blue/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../diabook-blue/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} + + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + .icon.on { background-image: url("../diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;} .prev { background-position: -90px -60px;} .next { background-position: -110px -60px;} -.attachtype {background-image: url('../../../../images/content-types.png');} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../../images/content-types.png'); +} + +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + .icon.border.camera{ - background-image: url("../diabook-blue/icons/camera.png");} -.icon.border.link{background-image: url("../diabook-blue/icons/weblink.png");} -.icon.s10.notify {background-image: url("../../../../images/icons/10/notify_off.png");} -.icon.s10.gear {background-image: url("../../../../images/icons/10/gear.png");} -.icon.s10.add {background-image: url("../../../../images/icons/10/add.png");} -.icon.s10.delete {background-image: url("../../../../images/icons/10/delete.png");} -.icon.s10.edit {background-image: url("../../../../images/icons/10/edit.png");} -.icon.s10.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s10.menu {background-image: url("../../../../images/icons/10/menu.png");} -.icon.s10.link {background-image: url("../../../../images/icons/10/link.png");} -.icon.s10.lock {background-image: url("../../../../images/icons/10/lock.png");} -.icon.s10.unlock {background-image: url("../../../../images/icons/10/unlock.png");} -.icon.s16.notify {background-image: url("../../../../images/icons/16/notify_off.png");} -.icon.s16.gear {background-image: url("../../../../images/icons/16/gear.png");} -.icon.s16.add {background-image: url("../../../../images/icons/16/add.png");} -.icon.s16.delete {background-image: url("../../../../images/icons/16/delete.png");} -.icon.s16.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s16.menu {background-image: url("../../../../images/icons/16/menu.png");} -.icon.s16.lock {background-image: url("../../../../images/icons/16/lock.png");} -.icon.s16.unlock {background-image: url("../../../../images/icons/16/unlock.png");} -.icon.s22.notify {background-image: url("../../../../images/icons/22/notify_off.png");} -.icon.s22.gear {background-image: url("../../../../images/icons/22/gear.png");} -.icon.s22.add {background-image: url("../../../../images/icons/22/add.png");} -.icon.s22.delete {background-image: url("../../../../images/icons/22/delete.png");} -.icon.s22.edit {background-image: url("../../../../images/icons/22/edit.png");} -.icon.s22.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s22.menu {background-image: url("../../../../images/icons/22/menu.png");} -.icon.s22.link {background-image: url("../../../../images/icons/22/link.png");} -.icon.s22.lock {background-image: url("../../../../images/icons/22/lock.png");} -.icon.s22.unlock {background-image: url("../../../../images/icons/22/unlock.png");} -.icon.s48.notify {background-image: url("../../../../images/icons/48/notify_off.png");} -.icon.s48.gear {background-image: url("../../../../images/icons/48/gear.png");} -.icon.s48.add {background-image: url("../../../../images/icons/48/add.png");} -.icon.s48.delete {background-image: url("../../../../images/icons/48/delete.png");} -.icon.s48.edit {background-image: url("../../../../images/icons/48/edit.png");} -.icon.s48.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s48.menu {background-image: url("../../../../images/icons/48/menu.png");} -.icon.s48.link {background-image: url("../../../../images/icons/48/link.png");} -.icon.s48.lock {background-image: url("../../../../images/icons/48/lock.png");} -.icon.s48.unlock {background-image: url("../../../../images/icons/48/unlock.png");} + background-image: url("../diabook-blue/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../diabook-blue/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../../images/icons/48/unlock.png"); +} -.hide-comments-outer {background-color: #fff;} +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} -a {color: #333333;} +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 1px; + width: 484px; + border-bottom: 1px solid #BDCDD4; + background-color: #fff; + padding: 8px; +} +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #1872A2; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} #saved-search-ul .tool:hover, #nets-sidebar .tool:hover, -#sidebar-group-list .tool:hover , +#sidebar-group-list .tool:hover, #fileas-sidebar .tool:hover { - background: aliceBlue; + background: #308DBF; +} +.tool .label { + float: left; +} +.tool .action { + float: right; } - .tool a { - color: #333333; + color: ##3F8FBA; } - -nav a, nav a:active, nav a:visited, nav a:link, nav a:hover { -color: #fff; +.tool a:hover { + text-decoration: none; } - /* popup notifications */ -div.jGrowl div.notice {background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;} -div.jGrowl div.info {background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;} - - +div.jGrowl div.notice { + background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; background: #1872a2; background-color: #1872a2; + z-index: 100; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: left; + width: 82%%; + margin-left: 25%; } - -header #site-location {display: none;} - header #banner a, header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: #fff; - font-weight: bolder; + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: middle; + font-weight: bolder; + margin-left: 3px; } - +header #banner #logo-img { + height: 25px; + margin-top: 3px; +} +header #banner #logo-text { + font-size: 20px; + position: absolute; + top: 10%; +} +/* nav */ nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; background: #1872a2; - color: #fff; + color: #ffffff; + z-index: 99; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; +} +nav a, +nav a:active, +nav a:visited, +nav a:link, +nav a:hover { + color: #ffffff; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; } +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} nav .nav-menu-icon:hover { background-color: #308dbf; position: relative; @@ -140,88 +671,1408 @@ nav .nav-menu-icon:hover { border-radius: 5px 5px 0 0; } - nav .nav-notify { - border: 1px solid black; +nav .nav-menu-icon.selected { + background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #ff0000; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; +} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; } - -nav #nav-home-link, #nav-directory-link, #nav-apps-link{font-size: 14px;} nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ - background-image: url("../diabook-blue/icons/messages.png");} + background-image: url("../diabook-blue/icons/messages2.png"); + } /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ - background-image: url("../diabook-blue/icons/notify.png");} + background-image: url("../diabook-blue/icons/notify2.png"); + } nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ - background-image: url("../diabook-blue/icons/contacts.png");} + background-image: url("../diabook-blue/icons/contacts2.png"); + } nav #nav-apps-link.selected { - background-color: #364e59;; - moz-border-radius: 5px 5px 0 0; --webkit-border-radius: 5px 5px 0 0; -border-radius: 5px 5px 0 0; + background-color: #364e59; } +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} ul.menu-popup a:hover { - background-color: #308DBF; + background-color: #308DBF; /*bdcdd4;*/ color: #fff; } +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ -.menu-profile-list:hover{background: #308DBF;} +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} -.menu-profile-icon.home{background: url("../diabook-blue/icons/home.png") no-repeat;} -.menu-profile-icon.photos{background: url("../diabook-blue/icons/mess_side.png") no-repeat;} -.menu-profile-icon.events{background: url("../diabook-blue/icons/events.png") no-repeat;} -.menu-profile-icon.notes{background: url("../diabook-blue/icons/notes.png") no-repeat;} -.menu-profile-icon.foren{background: url("../diabook-blue/icons/pubgroups.png") no-repeat;} -.menu-profile-icon.com_side{background: url("../diabook-blue/icons/com_side.png") no-repeat;} -.menu-profile-icon.pscontacts{background: url("../diabook-blue/icons/pscontacts.png") no-repeat;} +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} -aside #dfrn-request-link {background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center;} +/*profile_side*/ +#profile_side { + margin-bottom: 30px; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: #308DBF; + } +.menu-profile-list-item{ + padding-left: 5px; + vertical-align: middle; + } +.menu-profile-list-item:hover{ + text-decoration: none; + + } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-icon.home{ + background: url("../diabook-blue/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; + } +.menu-profile-icon.photos{ + background: url("../diabook-blue/icons/mess_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ + background: url("../diabook-blue/icons/events.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ + background: url("../diabook-blue/icons/notes.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ + background: url("../diabook-blue/icons/pubgroups.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ + background: url("../diabook-blue/icons/com_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ + background: url("../diabook-blue/icons/pscontacts.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 160px; + padding: 0px 10px 0px 10px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside #page-sidebar{display: none;} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +aside #search-text { + width: 150px; + height: 17px; + padding-left: 10px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; +-moz-border-bottom-colors: #dbdbdb; + -moz-border-top-colors: #999; + -moz-border-left-colors: #999; + -moz-border-right-colors: #dbdbdb; +} +aside #side-follow-url { + width: 150px; + } +aside #side-peoplefind-url { + width: 150px; + } +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.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; +} +.widget input.action { + 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; +} +.widget:hover .title .action { + 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; +} +.widget .tool:hover .action { + 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; +} +.widget .tool:hover .action.ticked { + 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; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums ul li a{ + color: #1872A2; +} +.widget .tool.selected { + background: url("../diabook-blue/icons/selected.png") no-repeat left center; +} +/* widget: search */ +span.sbox_l { + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + +} -#side-bar-photos-albums li{list-style-type: disc;} -#side-bar-photos-albums ul li{margin-left: 30px; - padding-left: 0px;} -#side-bar-photos-albums ul li a{color: #1872a2;} +span.sbox_r { + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; +} +span.sbox input { + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: auto; + padding: 0px 0px 0px 12px; +} -.widget .tool.selected {background: url("../diabook-blue/icons/selected.png") no-repeat left center;} -span.sbox_l {background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left;} -span.sbox_r {background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left;} -span.sbox input {background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left;} +body .pageheader{ + text-align: center; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; + } +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} -right_aside a{color: #1872a2;} +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } +right_aside { + display: table-cell; + vertical-align: top; + width: 170px; + + /*border-left: 1px solid #D2D2D2;*/ + + /* background: #F1F1F1; */ +} +right_aside a{color: #1872A2;} +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; +margin-top:30px;} +right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } +right_aside .directory-photo { margin: 0px; } +right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } +right_aside #likes { margin: 0px; padding: 0px; list-style: none; } +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} +right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../diabook-blue/icons/close_box.png"); - cursor: pointer;} + float: right; + cursor: pointer; + opacity: 0.1; + } +.close_box:hover { + background-image: url("../diabook-blue/icons/close_box.png"); + float: right; + cursor: pointer; + 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 */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 575px; + padding-top: 10px; +} +.tread-wrapper a{ + color: #1872A2; +} -.close_box:hover {background-image: url("../diabook-blue/icons/close_box.png");} +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} -.tread-wrapper a{color: #1872a2;} +.wall-item-container { + display: table; + width: 580px; +} -.wall-item-comment-wrapper {background-color: #fff; - width: 500px;} -.button.creation2 {background-color: #055580;} +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} -#acl-search {background: #ffffff url("../../../../images/search_18.png") no-repeat right center;} +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* 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:hover .wall-item-bottom { +/* 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-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-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} -#acl-showall {background-image: url("../../../../images/show_all_off.png");} +.wall-item-container .wall-item-content { -#acl-showall.selected {background-image: url("../../../../images/show_all_on.png");} + max-width: 420px; + word-wrap: break-word; -.acl-button-show {background-image: url("../../../../images/show_off.png");} -.acl-button-hide {background-image: url("../../../../images/hide_off.png");} -.acl-button-show.selected {background-image: url("../../../../images/show_on.png");} -.acl-button-hide.selected {background-image: url("../../../../images/hide_on.png");} -ul.tabs li .active {background-color: #055580;} +} -.field .onoff a {background-image: url("../../../../images/onoff.jpg");} +.wall-item-container .wall-item-content img { + max-width: 400px; -.oauthapp img.noicon {background-image: url("../../../../images/icons/48/plugin.png");} +} +.wall-item-container .wall-item-links, .wall-item-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; + -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; + -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 { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-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-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 500px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/ +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} + +.wall-item-comment-wrapper { + margin: 1px 5px 5px 80px; + background-color: #fff; + width: 500px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 2.0em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 500px; + margin-top: 10px; + background-color: #fff797; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 585px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +.grey +{ + display: inline; + float: right; + } +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 583px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #d2d2d2; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 585px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 585px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 585px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; +} +.button.creation2 { + background-color: #055580; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + cursor: pointer; + font-weight: bolder; +} +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} +ul.tabs li .active { + background-color: #055580; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; +} +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666666; + background-image: url("../../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; margin: 0px; @@ -229,17 +2080,498 @@ border-radius: 10px; height: 145px !important; width: 145px !important; } - .lframe { float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; } -.contact-photo-menu-button {background-image: url("../../../../images/icons/16/menu.png");} +.contact-photo-menu-button { + position: relative; + background-image: url("../../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} -.event-description:before {content: url('../../../../images/calendar.png');} +/* page footer */ +footer { + height: 100px; + display: table-row; +} -.calendar.eventcal a {color: #1872a2;} +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + + font-weight: bold; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ +#prof-members-end{ + clear: both; + } + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#prvmail-upload-wrapper, +#prvmail-link-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; +} + +#prvmail-end { + clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} +a.mail-list-link { + display: block; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*a.mail-list-link:hover { +* background-color: #15607B; +* color: #F5F6FB; +*} +*/ + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.eventcal { + float: left; + font-size: 20px; +} + +.vevent { + +} +.vevent .event-description, .vevent .event-location { + margin-left: 10px; + margin-right: 10px; +} +.vevent .event-start { + margin-left: 10px; + margin-right: 10px; +} + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} + +.event-description:before { + content: url('../../../../images/calendar.png'); + margin-right: 15px; +} + +.event-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.calendar.eventcal a { + color: #1872A2; + } +.today { + font-weight: bold; + color: #FF0000; +} + +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + +#identity-manage-desc { + margin-top:15px; + margin-bottom: 15px; +} + +#identity-manage-choose { + margin-bottom: 15px; +} + +#identity-submit { + margin-top: 20px; +} + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} +.lightbox{ + float: left; + } + +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + 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; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.profile-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.profile-match-name { + float: left; + text-align: center; + width: 120px; + overflow: hidden; +} + +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: 0px; + top: -16px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums{ + margin-top: 15px; + } +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} .photo-top-album-name { width: 100%; position: absolute; @@ -247,5 +2579,40 @@ width: 145px !important; padding-left: 3px; background-color: #EEE; } -.photo-top-album-link{color: #1872a2;} +.photo-top-album-link{ + color: #1872A2; + } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} diff --git a/view/theme/diabook/diabook-blue/style-profile.css b/view/theme/diabook/diabook-blue/style-profile.css index fb21d7e578..b8064c9c0f 100644 --- a/view/theme/diabook/diabook-blue/style-profile.css +++ b/view/theme/diabook/diabook-blue/style-profile.css @@ -1,10 +1,99 @@ -@import url('../../diabook/style-profile.css'); +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ - .icon.contacts {background-image: url("../diabook-blue/icons/contacts.png");} -.icon.notifications {background-image: url("../diabook-blue/icons/notifications.png");} -.icon.notify {background-image: url("../diabook-blue/icons/notify.png");} -.icon.messages {background-image: url("../diabook-blue/icons/messages.png");} -.icon.community {background-image: url("../diabook-blue/icons/community.png");} +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + +.icon.contacts { + background-image: url("../diabook-blue/icons/contacts.png");} +.icon.notifications { + background-image: url("../diabook-blue/icons/notifications.png");} +.icon.notify { + background-image: url("../diabook-blue/icons/notify.png");} +.icon.messages { + background-image: url("../diabook-blue/icons/messages.png");} +.icon.community { + background-image: url("../diabook-blue/icons/community.png");} + .icon.drop { background-image: url("../diabook-blue/icons/drop.png");} .icon.drophide { background-image: url("../diabook-blue/icons/drop.png");} .icon.dislike { background-image: url("../diabook-blue/icons/dislike.png");} @@ -20,106 +109,559 @@ .icon.lock { background-image: url("../diabook-blue/icons/lock.png");} .icon.unlock { background-image: url("../diabook-blue/icons/unlock.png");} .icon.language { background-image: url("../diabook-blue/icons/language.png");} -.camera { background-image: url("../diabook-blue/icons/camera.png");} -.attach { background-image: url("../diabook-blue/icons/attach.png");} -.video2 { background-image: url("../diabook-blue/icons/video.png");} -.video { background-image: url("../diabook-blue/icons/video.png");} -.audio2 { background-image: url("../diabook-blue/icons/audio.png");} -.audio { background-image: url("../diabook-blue/icons/audio.png");} -.weblink { background-image: url("../diabook-blue/icons/weblink.png");} -.globe { background-image: url("../diabook-blue/icons/globe.png");} -.unglobe { background-image: url("../diabook-blue/icons/unglobe.png");} -.edit {background-image: url("../diabook-blue/icons/pencil2.png");} + + +.camera { background-image: url("../diabook-blue/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../diabook-blue/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../diabook-blue/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../diabook-blue/icons/video.png"); + display: block; width: 100%; height: 140px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../diabook-blue/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../diabook-blue/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../diabook-blue/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../diabook-blue/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../diabook-blue/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../diabook-blue/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} + + + + +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +.block { background-position: -90px 0px;} +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ + +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + .icon.on { background-image: url("../diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;} .prev { background-position: -90px -60px;} .next { background-position: -110px -60px;} -.attachtype {background-image: url('../../../../images/content-types.png');} -.icon.border.camera{background-image: url("../diabook-blue/icons/camera.png");} -.icon.border.link{background-image: url("../diabook-blue/icons/weblink.png");} -.icon.s10.notify {background-image: url("../../../../images/icons/10/notify_off.png");} -.icon.s10.gear {background-image: url("../../../../images/icons/10/gear.png");} -.icon.s10.add {background-image: url("../../../../images/icons/10/add.png");} -.icon.s10.delete {background-image: url("../../../../images/icons/10/delete.png");} -.icon.s10.edit {background-image: url("../../../../images/icons/10/edit.png");} -.icon.s10.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s10.menu {background-image: url("../../../../images/icons/10/menu.png");} -.icon.s10.link {background-image: url("../../../../images/icons/10/link.png");} -.icon.s10.lock {background-image: url("../../../../images/icons/10/lock.png");} -.icon.s10.unlock {background-image: url("../../../../images/icons/10/unlock.png");} -.icon.s16.notify {background-image: url("../../../../images/icons/16/notify_off.png");} -.icon.s16.gear {background-image: url("../../../../images/icons/16/gear.png");} -.icon.s16.add {background-image: url("../../../../images/icons/16/add.png");} -.icon.s16.delete {background-image: url("../../../../images/icons/16/delete.png");} -.icon.s16.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s16.menu {background-image: url("../../../../images/icons/16/menu.png");} -.icon.s16.lock {background-image: url("../../../../images/icons/16/lock.png");} -.icon.s16.unlock {background-image: url("../../../../images/icons/16/unlock.png");} -.icon.s22.notify {background-image: url("../../../../images/icons/22/notify_off.png");} -.icon.s22.gear {background-image: url("../../../../images/icons/22/gear.png");} -.icon.s22.add {background-image: url("../../../../images/icons/22/add.png");} -.icon.s22.delete {background-image: url("../../../../images/icons/22/delete.png");} -.icon.s22.edit {background-image: url("../../../../images/icons/22/edit.png");} -.icon.s22.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s22.menu {background-image: url("../../../../images/icons/22/menu.png");} -.icon.s22.link {background-image: url("../../../../images/icons/22/link.png");} -.icon.s22.lock {background-image: url("../../../../images/icons/22/lock.png");} -.icon.s22.unlock {background-image: url("../../../../images/icons/22/unlock.png");} -.icon.s48.notify {background-image: url("../../../../images/icons/48/notify_off.png");} -.icon.s48.gear {background-image: url("../../../../images/icons/48/gear.png");} -.icon.s48.add {background-image: url("../../../../images/icons/48/add.png");} -.icon.s48.delete {background-image: url("../../../../images/icons/48/delete.png");} -.icon.s48.edit {background-image: url("../../../../images/icons/48/edit.png");} -.icon.s48.star {background-image: url("../../../../images/star_dummy.png");} -.icon.s48.menu {background-image: url("../../../../images/icons/48/menu.png");} -.icon.s48.link {background-image: url("../../../../images/icons/48/link.png");} -.icon.s48.lock {background-image: url("../../../../images/icons/48/lock.png");} -.icon.s48.unlock {background-image: url("../../../../images/icons/48/unlock.png");} +/*.tagged { background-position: -130px -60px;}*/ -a {color: #333333;} - - -#sidebar-group-list .tool:hover {background: #EEE;} - -div.jGrowl div.notice { - background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;} -div.jGrowl div.info {background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;} - -header { - background: #1872a2; - background-color: #1872a2; +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../../images/content-types.png'); } +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.border.camera{ + background-image: url("../diabook-blue/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../diabook-blue/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 484px; + border-bottom: 1px solid #BDCDD4; + border-top: 1px solid #BDCDD4; + + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #1872A2; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*color: #005c94; */ + text-decoration: underline; +} +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover { + background: #EEE; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: ##3F8FBA; +} +.tool a:hover { + text-decoration: none; +} +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ +header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; + background: #1872a2; + background-color: #1872a2; + z-index: 100; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: left; + width: 82%%; + margin-left: 25%; +} header #banner a, header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { color: #ffffff; - font-weight: bolder;} - + text-decoration: none; + outline: none; + vertical-align: middle; + font-weight: bolder; + margin-left: 3px; +} +header #banner #logo-img { + height: 25px; + margin-top: 3px; +} +header #banner #logo-text { + font-size: 20px; + position: absolute; + top: 10%; +} +/* nav */ nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; background: #1872a2; color: #ffffff; + z-index: 99; + border-bottom: 1px; + border-bottom-color: black; + border-bottom-style: inset; } - nav a, nav a:active, nav a:visited, nav a:link, nav a:hover { - color: #ffffff;} - + color: #ffffff; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} nav #banner a, nav #banner a:active, nav #banner a:visited, nav #banner a:link, nav #banner a:hover { color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; } +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} nav .nav-menu-icon:hover { + background-color: #308dbf; position: relative; height: 22px; padding: 5px; @@ -129,35 +671,259 @@ nav .nav-menu-icon:hover { border-radius: 5px 5px 0 0; } +nav .nav-menu-icon.selected { + background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} nav .nav-notify { + display: none; + position: absolute; background-color: #ff0000; - border: 1px solid black; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; +} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } +nav #nav-home-link, #nav-directory-link, #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; } nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ - background-image: url("../diabook-blue/icons/messages.png"); + background-image: url("../diabook-blue/icons/messages2.png"); } /*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ - background-image: url("../diabook-blue/icons/notify.png"); + background-image: url("../diabook-blue/icons/notify2.png"); } nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ - background-image: url("../diabook-blue/icons/contacts.png"); + background-image: url("../diabook-blue/icons/contacts2.png"); + } + +nav #nav-apps-link.selected { + background-color: #364e59; +} + +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ +} + +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; } -nav #nav-apps-link.selected { - background-color: #364e59; - moz-border-radius: 5px 5px 0 0; --webkit-border-radius: 5px 5px 0 0; -border-radius: 5px 5px 0 0; +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; } - ul.menu-popup a:hover { - background-color: #308dbf; + background-color: #308DBF; /*bdcdd4;*/ color: #fff; } +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} + +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + padding-top: 3px; + padding-bottom: 3px; + padding-left: 16px; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: #EEE; + } +.menu-profile-list-item{ + padding-left: 5px; + } +.menu-profile-list-item:hover{ + text-decoration: none; + } +/*http://prothemedesign.com/circular-icons/*/ .menu-profile-list.home{ background: url("../diabook-blue/icons/home.png") no-repeat; } @@ -177,10 +943,172 @@ ul.menu-popup a:hover { background: url("../diabook-blue/icons/com_side.png") no-repeat; } -aside #dfrn-request-link { - background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center; - } +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 160px; + padding: 0px 10px 0px 10px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +aside #search-text { + width: 150px; + height: 17px; + padding-left: 10px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; +} +aside #side-follow-url { + width: 150px; + } +aside #side-peoplefind-url { + width: 150px; + } +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 48px; + height: 48px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.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; +} +.widget input.action { + 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; +} +.widget:hover .title .action { + 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; +} +.widget .tool:hover .action { + 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; +} +.widget .tool:hover .action.ticked { + 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; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} #side-bar-photos-albums li{ list-style-type: disc; } @@ -189,57 +1117,779 @@ list-style-type: disc; padding-left: 0px; } #side-bar-photos-albums ul li a{ - color: #308dbf; + color: #1872A2; } - .widget .tool.selected { background: url("../diabook-blue/icons/selected.png") no-repeat left center; } - +/* widget: search */ span.sbox_l { background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-left: 10px; + margin-top: 5px; + } span.sbox_r { background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; + float: left; + width: 19px; height: 19px; + margin-top: 5px; } span.sbox input { background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; + float: left; + margin-top: 5px; + border: 0; + height: 13px; width: 100px; + padding: 3px; + font: 11px/13px arial; + color: #000; +} +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 611px; + padding: 0px 0px 0px 12px; } -#birthday-wrapper a { - color: #308dbf; +body .pageheader{ + text-align: center; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 575px; + } +.qcomment{ + max-width: 122px; + } +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} + +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; } -right_aside a{color: #308dbf;} - +right_aside { + display: table-cell; + vertical-align: top; + width: 170px; + /*padding-right: 10px;*/ + /*border-left: 1px solid #D2D2D2;*/ + + /* background: #F1F1F1; */ +} +right_aside a{color: #1872A2;} +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; +margin-top:30px;} +right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } +right_aside .directory-photo { margin: 0px; } +right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } +right_aside #likes { margin: 0px; padding: 0px; list-style: none; } +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 9px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} +#page-sidebar-right_aside .label {max-width: 128px;} +right_aside .icon {width: 10px; height: 10px;} .close_box { background-image: url("../diabook-blue/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 0.1; } .close_box:hover { background-image: url("../diabook-blue/icons/close_box.png"); + float: right; + cursor: pointer; + 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 */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 575px; + padding-top: 10px; +} .tread-wrapper a{ - color: #308dbf; + color: #1872A2; +} + +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} + +.wall-item-container { + display: table; + width: 580px; } +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} + +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { +/* 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:hover .wall-item-bottom { +/* 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-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-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + + clear: both; + overflow: hidden; + + margin-bottom: 5px; +} + +.wall-item-container .wall-item-content { + + max-width: 420px; + word-wrap: break-word; + + +} + +.wall-item-container .wall-item-content img { + max-width: 400px; + +} +.wall-item-container .wall-item-links, .wall-item-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; + -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; + -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 { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; + display: table-cell; +} +.wall-item-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-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 500px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 5px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 2.0em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 500px; + margin-top: 10px; + background-color: #fff797; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} + +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 585px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +.grey +{ + display: inline; + float: right; + } +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 583px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #d2d2d2; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 585px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 585px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 585px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + font-size: 14px; +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; +} .button.creation2 { - background-color: #308dbf;} - -#acl-search { - background: #ffffff url("../../../../images/search_18.png") no-repeat right center; + background-color: #055580; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + cursor: pointer; + font-weight: bolder; +} +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../../images/search_18.png") no-repeat right center; + padding-right: 20px; } - #acl-showall { - background-image: url("../../../../images/show_all_off.png");} - + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} #acl-showall.selected { - background-image: url("../../../../images/show_all_on.png");} - + color: #000000; + background-color: #ff9900; + background-image: url("../../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} .acl-button-show { background-image: url("../../../../images/show_off.png"); } @@ -247,37 +1897,657 @@ right_aside a{color: #308dbf;} background-image: url("../../../../images/hide_off.png"); } .acl-button-show.selected { + color: #000000; + background-color: #9ade00; background-image: url("../../../../images/show_on.png"); } .acl-button-hide.selected { + color: #000000; + background-color: #ff4141; background-image: url("../../../../images/hide_on.png"); } - - +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; +} ul.tabs li .active { - background-color: #308dbf;} - + background-color: #055580; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; +} +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} .field .onoff a { + display: block; + border: 1px solid #666666; background-image: url("../../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; } +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } + +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} .oauthapp img.noicon { background-image: url("../../../../images/icons/48/plugin.png"); - } - + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; -margin: 0px;} +margin: 0px; +border-radius: 10px; +height: 145px !important; +width: 145px !important; +} +.lframe { + float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; +} -.contact-photo-menu-button {background-image: url("../../../../images/icons/16/menu.png");} +.contact-photo-menu-button { + position: relative; + background-image: url("../../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} -.event-description:before { - content: url('../../../../images/calendar.png');} +/* page footer */ +footer { + height: 100px; + display: table-row; +} -.calendar.eventcal a { - color: #308dbf; +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + + font-weight: bold; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 48px; + height: 48px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ +#prof-members-end{ + clear: both; } +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#prvmail-upload-wrapper, +#prvmail-link-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; +} + +#prvmail-end { + clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} +a.mail-list-link { + display: block; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*a.mail-list-link:hover { +* background-color: #15607B; +* color: #F5F6FB; +*} +*/ + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.eventcal { + float: left; + font-size: 20px; +} + +.vevent { + +} +.vevent .event-description, .vevent .event-location { + margin-left: 10px; + margin-right: 10px; +} +.vevent .event-start { + margin-left: 10px; + margin-right: 10px; +} + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} + +.event-description:before { + content: url('../../../../images/calendar.png'); + margin-right: 15px; +} + +.event-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} +.calendar.eventcal a { + color: #1872A2; + } +.today { + font-weight: bold; + color: #FF0000; +} + +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + +#identity-manage-desc { + margin-top:15px; + margin-bottom: 15px; +} + +#identity-manage-choose { + margin-bottom: 15px; +} + +#identity-submit { + margin-top: 20px; +} + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} +.lightbox{ + float: left; + } + +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + 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; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.profile-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.profile-match-name { + float: left; + text-align: center; + width: 120px; + overflow: hidden; +} + +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: 0px; + top: -16px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: left; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } +#side-bar-photos-albums{ + margin-top: 15px; + } +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} .photo-top-album-name { width: 100%; position: absolute; @@ -286,5 +2556,39 @@ margin: 0px;} background-color: #EEE; } .photo-top-album-link{ - color: #308dbf; + color: #1872A2; } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css index 993eb38d51..952f907750 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -1,139 +1,801 @@ -@import url('../diabook/style.css'); +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ -/* Why are these paths so long? They should probably become ../icons/ in the next revision */ +/* ========= */ +/* = Admin = */ +/* ========= */ +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; + list-style: none; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ .icon.bb-url{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-url.png");} + background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-url.png"); + float: right; + margin-top: 2px;} .icon.quote{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/quote.png");} + background-image: url("../../../view/theme/diabook/diabook-blue/icons/quote.png"); + float: right; + margin-top: 2px;} .icon.bold{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bold.png");} + background-image: url("../../../view/theme/diabook/diabook-blue/icons/bold.png"); + float: right; + margin-top: 2px;} .icon.underline{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/underline.png");} + background-image: url("../../../view/theme/diabook/diabook-blue/icons/underline.png"); + float: right; + margin-top: 2px;} .icon.italic{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/italic.png");} + background-image: url("../../../view/theme/diabook/diabook-blue/icons/italic.png"); + float: right; + margin-top: 2px;} .icon.bb-image{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-image.png");} + background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-image.png"); + float: right; + margin-top: 2px;} .icon.bb-video{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/bb-video.png");} - .icon.contacts { - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png");} -.icon.notifications { - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notifications.png");} -.icon.notify { - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notify.png");} -.icon.messages { - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/messages.png");} -.icon.community { - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/community.png");} + background-image: url("../../../view/theme/diabook/diabook-blue/icons/bb-video.png"); + float: right; + margin-top: 2px;} -.icon.drop { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/drop.png");} -.icon.drophide { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/drop.png");} -.icon.dislike { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/dislike.png");} -.icon.like { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/like.png");} -.icon.pencil { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/pencil.png");} -.icon.recycle { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/recycle.png");} -.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/remote.png");} -.icon.tagged { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/tagged.png");} -.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/file_as.png");} -.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unstarred.png");} -.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/starred.png");} -.icon.link { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/link.png");} -.icon.lock { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/lock.png");} -.icon.unlock { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unlock.png");} -.icon.language { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/language.png");} -.camera { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png");} -.attach { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/attach.png");} -.video2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png"); } -.video { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/video.png");} -.audio2 { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png");} -.audio { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/audio.png");} -.weblink { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png");} -.globe { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/globe.png");} -.unglobe { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/unglobe.png");} -.edit {background-image: url("../../../view/theme/diabook/diabook-aerith/icons/pencil2.png");} -.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png");} -.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png");} -.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png");} -.icon.on { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/toogle_on.png"); background-repeat: no-repeat;} -.icon.off { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/toogle_off.png"); background-repeat: no-repeat;} -.icon.prev { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/prev.png"); background-repeat: no-repeat;} -.icon.next { background-image: url("../../../view/theme/diabook/diabook-aerith/icons/next.png"); background-repeat: no-repeat;} -icon.border.camera{background-image: url("../../../view/theme/diabook/diabook-aerith/icons/camera.png");} -.icon.border.link{background-image: url("../../../view/theme/diabook/diabook-aerith/icons/weblink.png");} -av #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/messages.png");} -.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ - background-image: url("../../../view/theme/diabook/diabook-aerith/icons/notify.png");} -nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{background-image: url("../../../view/theme/diabook/diabook-aerith/icons/contacts.png");} - -.menu-profile-icon.home{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/home.png") no-repeat;} -.menu-profile-icon.photos{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/mess_side.png") no-repeat;} -.menu-profile-icon.events{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/events.png") no-repeat;} -.menu-profile-icon.notes{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/notes.png") no-repeat;} -.menu-profile-icon.foren{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/pubgroups.png") no-repeat;} -.menu-profile-icon.com_side{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/com_side.png") no-repeat;} -.menu-profile-icon.pscontacts{ - background: url("../../../view/theme/diabook/diabook-aerith/icons/pscontacts.png") no-repeat;} +.icon.contacts { + background-image: url("../../../view/theme/diabook/diabook-blue/icons/contacts.png");} +.icon.notifications { + background-image: url("../../../view/theme/diabook/diabook-blue/icons/notifications.png");} +.icon.notify { + background-image: url("../../../view/theme/diabook/diabook-blue/icons/notify.png");} +.icon.messages { + background-image: url("../../../view/theme/diabook/diabook-blue/icons/messages.png");} +.icon.community { + background-image: url("../../../view/theme/diabook/diabook-blue/icons/community.png");} + +.icon.drop { background-image: url("../../../view/theme/diabook/diabook-blue/icons/drop.png");} +.icon.drophide { background-image: url("../../../view/theme/diabook/diabook-blue/icons/drop.png");} +.icon.dislike { background-image: url("../../../view/theme/diabook/diabook-blue/icons/dislike.png");} +.icon.like { background-image: url("../../../view/theme/diabook/diabook-blue/icons/like.png");} +.icon.pencil { background-image: url("../../../view/theme/diabook/diabook-blue/icons/pencil.png");} +.icon.recycle { background-image: url("../../../view/theme/diabook/diabook-blue/icons/recycle.png");} +.icon.remote-link { background-image: url("../../../view/theme/diabook/diabook-blue/icons/remote.png");} +.icon.tagged { background-image: url("../../../view/theme/diabook/diabook-blue/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook/diabook-blue/icons/file_as.png");} +.star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/diabook-blue/icons/unstarred.png");} +.star-item.icon.starred { background-image: url("../../../view/theme/diabook/diabook-blue/icons/starred.png");} +.icon.link { background-image: url("../../../view/theme/diabook/diabook-blue/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook/diabook-blue/icons/lock.png");} +.icon.unlock { background-image: url("../../../view/theme/diabook/diabook-blue/icons/unlock.png");} +.icon.language { background-image: url("../../../view/theme/diabook/diabook-blue/icons/language.png");} +.camera { background-image: url("../../../view/theme/diabook/diabook-blue/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../../../view/theme/diabook/diabook-blue/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video2 { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../../../view/theme/diabook/diabook-blue/icons/video.png"); + display: block; width: 100%; height: 140px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../../../view/theme/diabook/diabook-blue/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../../../view/theme/diabook/diabook-blue/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../../../view/theme/diabook/diabook-blue/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../../../view/theme/diabook/diabook-blue/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.edit {background-image: url("../../../view/theme/diabook/diabook-blue/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} +.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png"); + display: block; width: 16px; height: 16px; background-repeat: no-repeat;} +.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png"); + display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;} +.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png"); + display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;} + -a {color: #333333;} +.article { background-position: -50px 0px;} +/*.audio { background-position: -70px 0px;}*/ +/*.drop { background-position: -110px 0px;}*/ +/*.drophide { background-position: -130px 0px;}*/ +/*.edit { background-position: -150px 0px;}*/ +/*.camera { background-position: -170px 0px;}*/ +/*.dislike { background-position: -190px 0px;}*/ +/*.like { background-position: -210px 0px;}*/ +/*.link { background-position: -230px 0px;}*/ -#fileas-sidebar .tool:hover {background: #308dbf;} +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +/*.pencil { background-position: -150px -20px;}*/ +.small-pencil { background-position: -170px -20px;} +/*.recycle { background-position: -190px -20px;}*/ +/*.remote-link { background-position: -210px -20px;}*/ +.share { background-position: -230px -20px;} +.tools { background-position: -50px -40px;} +/*.lock { background-position: -70px -40px;}*/ + +/*.video { background-position: -110px -40px;}*/ +.youtube { background-position: -130px -40px;} + +/*.attach { background-position: -190px -40px;}*/ +/*.language { background-position: -210px -40px;}*/ + + +.icon.on { background-image: url("../../../view/theme/diabook/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;} +.icon.prev { background-image: url("../../../view/theme/diabook/diabook-blue/icons/prev.png"); background-repeat: no-repeat;} +.icon.next { background-image: url("../../../view/theme/diabook/diabook-blue/icons/next.png"); background-repeat: no-repeat;} +/*.tagged { background-position: -130px -60px;}*/ + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.png'); +} + +.type-video { background-position: 0px 0px; } +.type-image { background-position: -20px 0px; } +.type-audio { background-position: -40px 0px; } +.type-text { background-position: -60px 0px; } +.type-unkn { background-position: -80px 0px; } + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + /*background-image: url('icons.png');*/ +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.border.camera{ + background-image: url("../../../view/theme/diabook/diabook-blue/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + +.icon.border.link{ + background-image: url("../../../view/theme/diabook/diabook-blue/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + margin-left: 10px; + } + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s10.menu { + background-image: url("../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +/*.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +}*/ +.icon.s16.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s16.menu { + background-image: url("../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s22.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/star_dummy.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 684px; + border-bottom: 1px solid #BDCDD4; + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 12.5px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px auto auto; + display: table; +} + +#jappix_mini { +right: 45px !important; +} + + +h4 { + font-size: 1.1em; +} + +a { + color: #333333; + /* color: #3e3e8c; */ + text-decoration: none; +} +a:hover { + /* color: blue; */ + text-decoration: underline +} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #1872A2; + /* color: #3e3e8c; */ + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + /* color: blue; */ + /*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; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 12em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; + padding: 3px; +} +#saved-search-ul .tool:hover, +#nets-sidebar .tool:hover, +#sidebar-group-list .tool:hover, +#fileas-sidebar .tool:hover { + background: #308DBF; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +.tool a { + color: ##3F8FBA; +} +.tool a:hover { + text-decoration: none; +} +/* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} /* header */ header { + position: fixed; + left: 0%; + right: 80%; + top: 0px; + margin: 0px; + padding: 0px; + width: 22%; + height: 32px; background: #1872a2; background-color: #1872a2; + z-index: 100; border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; } - +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: banner; + width: 82%; + margin-left: 25%; +} header #banner a, header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { color: #ffffff; - font-weight: bolder; + text-decoration: none; + outline: none; + vertical-align: middle; + font-weight: bolder; + margin-left: 3px; +} +header #banner #logo-img { + height: 25px; + margin-top: 3px; } - header #banner #logo-text { - font-size: 20px!important;position: relative!important;top: -4px!important; + font-size: 20px!important;position: relative!important;top: -4px!important; } - /* messages */ #message-new { background: #055580; border: 1px solid #333; + width: 150px; } - -/* nav */ -nav { background: #1872a2; +#message-new a { color: #ffffff; - border-bottom: 1px; + text-align: center; + display: block; + font-weight: bold; + padding: 1em 0px; + text-decoration: none; +} +.mail-list-wrapper { + background-color: #f6f7f8; + margin-bottom: 5px; + width: 100%; + height: auto; + overflow: hidden; +} +.mail-list-wrapper span { + display: block; + float: left; + width: 20%; + overflow: hidden; +} +.mail-list-wrapper .mail-subject { + width: 30%; + padding: 4px 0px 0px 4px; +} +.mail-list-wrapper .mail-subject a { + display: block; +} +.mail-list-wrapper .mail-subject.unseen a { + font-weight: bold; +} +.mail-list-wrapper .mail-date { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-from { + padding: 4px 4px 0px 4px; +} +.mail-list-wrapper .mail-count { + padding: 4px 4px 0px 4px; + text-align: right; +} +.mail-list-wrapper .mail-delete { + float: right; +} +#mail-display-subject { + background-color: #f6f7f8; + color: #2d2d2d; + margin-bottom: 10px; + width: 100%; + height: auto; + overflow: hidden; +} +#mail-display-subject span { + float: left; + overflow: hidden; + padding: 4px 0px 0px 10px; +} +#mail-display-subject .mail-delete { + float: right; + 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; +} +#mail-display-subject:hover .mail-delete { + 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; +} +/* nav */ +nav { + width: 80%; + height: 32px; + position: fixed; + left: 22%; + top: 0px; + padding: 0px; + background: #1872a2; + color: #ffffff; + z-index: 99; + border-bottom: 1px; border-bottom-color: black; border-bottom-style: inset; } - nav a, nav a:active, nav a:visited, nav a:link, nav a:hover { color: #ffffff; + text-decoration: none; + outline: none; +} +nav #banner { + overflow: hidden; + /*text-align: center;*/ + width: 100%; +} +nav #banner a, +nav #banner a:active, +nav #banner a:visited, +nav #banner a:link, +nav #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +nav #banner #logo-img { + height: 22px; + margin-top: 5px; +} +nav #banner #logo-text { + font-size: 22px; +} +nav #navbar{ + } +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + /* padding: 1px 1px 3px 1px; */ + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; } +nav #logo-img { + height: 25px; + margin-top: 4px; + margin-left: 30px; +} + +nav #logo-text { + font-size: 22px; + margin-top: 3px; + margin-right: 15px; +} +nav .nav-menu-search { + position: relative; + + margin: 4px 17px; + margin-right: 0px; + height: 17px; + width: 180px; + +} + +nav #search-box #search-text { + background-image: url('icons/lupe.png'); + background-repeat:no-repeat; + padding-left:20px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; + } + + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 5px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} nav .nav-menu-icon:hover { + background-color: #308dbf; position: relative; height: 22px; padding: 5px; @@ -143,46 +805,411 @@ nav .nav-menu-icon:hover { border-radius: 5px 5px 0 0; } +nav .nav-menu-icon.selected { + background-color: #fff; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + /*border-bottom: 3px solid #364A84;*/ +} +nav .nav-menu.selected { + /*border-bottom: 3px solid #9eabb0;*/ +} nav .nav-notify { -background-color: #ff0000; - border: 1px solid black; + display: none; + position: absolute; + background-color: #ff0000; + /* background-color: #19aeff; */ + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + font-weight: 900; + padding: 1px 4px; + top: 0px; + right: -6px; + min-width: 10px; + text-align: center; } - +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu, +nav #nav-home-link, +nav #nav-user-linkmenu +{ + float: right; +} +nav #nav-user-linkmenu{ + margin-right: 0px; + } nav #nav-home-link, #nav-directory-link, #nav-apps-link{ -font-size: 14px; + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 5px; + } +nav #nav-directory-link{ + margin-right: 0px; + } +nav #nav-home-link{ + margin-left: 0px; + } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; } +nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ + background-image: url("../../../view/theme/diabook/diabook-blue/icons/messages2.png"); + } + +/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ + background-image: url("../../../view/theme/diabook/diabook-blue/icons/notify2.png"); + } + +nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ + background-image: url("../../../view/theme/diabook/diabook-blue/icons/contacts2.png"); + } + nav #nav-apps-link.selected { - background-color: #364e59; - moz-border-radius: 5px 5px 0 0; --webkit-border-radius: 5px 5px 0 0; -border-radius: 5px 5px 0 0; + background-color: #364e59; } -ul.menu-popup { - background: #fff;} - -ul.menu-popup a:hover { - background-color: #055580; /*bdcdd4;*/ - color: #fff; +#nav-notifications-mark-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ } -.menu-profile-list:hover{ - background: #308dbf; +#nav-notifications-see-all { + /* padding: 1px 1px 2px 26px; */ + /* border-bottom: 1px solid #364E59; */ + /* margin: 0px 0px 2px 0px; + padding: 5px 10px; */ } -aside #likes a, a:visited, a:link { - color: #055580; - text-decoration: none; - cursor: pointer; - -} -aside #likes a:hover{ - text-decoration: underline; +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; } +ul.menu-popup { + position: absolute; + display: none; + width: 11em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #308DBF; /*bdcdd4;*/ + color: #fff; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 425px !important; + max-height: 550px; + overflow: auto; +} +/* #nav-notifications-menu a { + display: inline; + padding: 5px 0px; + margin: 0px 0px 2px 0px; +} +#nav-notifications-menu li:hover { + background-color: #bdcdd4; +}*/ +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} +.notif-image { + width: 32px; + height: 32px; + padding: 7px 7px 0px 0px; +} + +/*profile_side*/ +#profile_side { + margin-bottom: 30px; +} +#ps-usericon{ + height: 25px + } +#ps-username{ + font-size: 1.17em; + font-weight: bold; + vertical-align: top; + position: absolute; + padding-top: 4px; + padding-left: 5px; + word-wrap: break-word; + width: 130px; + } +#ps-username:hover{ + text-decoration: none; + } +.menu-profile-side{ + list-style: none; + padding-left: 0px; + min-height: 0px; + } +.menu-profile-list{ + height: auto; + overflow: auto; + min-height: 16px; + list-style: none; + } +.menu-profile-list:hover{ + background: #308DBF; + } +.menu-profile-list-item{ + padding-left: 5px; + vertical-align: middle; + } +.menu-profile-list-item:hover{ + text-decoration: none; + + } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-icon.home{ + background: url("../../../view/theme/diabook/diabook-blue/icons/home.png") no-repeat; + float: left; + height: 22px; + width: 22px; + } +.menu-profile-icon.photos{ + background: url("../../../view/theme/diabook/diabook-blue/icons/mess_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.events{ + background: url("../../../view/theme/diabook/diabook-blue/icons/events.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.notes{ + background: url("../../../view/theme/diabook/diabook-blue/icons/notes.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.foren{ + background: url("../../../view/theme/diabook/diabook-blue/icons/pubgroups.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.com_side{ + background: url("../../../view/theme/diabook/diabook-blue/icons/com_side.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +.menu-profile-icon.pscontacts{ + background: url("../../../view/theme/diabook/diabook-blue/icons/pscontacts.png") no-repeat; + float: left; + height: 22px; + width: 22px;} +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 180px; + padding: 0px 10px 0px 20px; + border-right: 1px solid #D2D2D2; + float: left; + /* background: #F1F1F1; */ +} +aside #page-sidebar{display: none;} +aside .vcard .fn { + font-size: 18px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + /*width: 35%;*/ + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 5px; + /*width: 60%;*/ +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #36c; + /* background-color: #19aeff; */ +} +aside #profiles-menu { + width: 20em; +} +aside #search-text { + width: 173px; + height: 17px; + padding-left: 10px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; +} +aside #side-follow-url { + width: 173px; + } +aside #side-peoplefind-url { + width: 173px; + } +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 55px; + height: 55px; +} +#lost-password-link { + float: left; + margin-right: 20px; + } +#login-submit-wrapper{ + + margin-bottom: 12px; + } +aside #login-submit-button{ + margin-left: 0px!important; + } +aside #login-extra-links{ + padding-top: 0px!important; + } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; float: left; @@ -227,24 +1254,281 @@ transition: all 0.2s ease-in-out; float: right; height: 10px; } - +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.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; +} +.widget input.action { + 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; +} +.widget:hover .title .action { + 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; +} +.widget .tool:hover .action { + 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; +} +.widget .tool:hover .action.ticked { + 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; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +#side-bar-photos-albums li{ +list-style-type: disc; +} #side-bar-photos-albums ul li{ margin-left: 30px; padding-left: 0px; } #side-bar-photos-albums ul li a{ - color: #055580; - -.widget .tool.selected { - background: url("../../../view/theme/diabook/diabook-aerith/icons/selected.png") no-repeat left center;} - -#birthday-wrapper a { - color: #055580; - } - -.tread-wrapper a{ - color: #055580; + color: #1872A2; } +.widget .tool.selected { + background: url("../../../view/theme/diabook/diabook-blue/icons/selected.png") no-repeat left center; +} +/* widget: search */ +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 800px; + padding: 0px 0px 0px 12px; +} +body .pageheader{ + text-align: center; + font-size: 20px; + margin-bottom: 20px; + margin-top: 0px; + max-width: 775px; + } +.qcomment{ + max-width: 122px; + } +#id_username { + width: 173px; + } +#id_password { + width: 173px; + } +#id_openid_url { + width: 173px; + } +#contact-edit-end { + } +.pager { + padding: 10px; + text-align: center; + font-size: 1.0em; + clear: both; + display: block; +} + +.tabs { + + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.tab.button { + margin-left: 5px; + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: normal; + padding: 3px; + color: #333333; + } + +#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ + margin-bottom: 10px; + } +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 775px; + padding-top: 10px; +} +.tread-wrapper a{ + color: #1872A2; +} + +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} + +.wall-item-container { + 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 { + + max-width: 720px; + word-wrap: break-word; + + 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 { display: table-row; @@ -359,40 +1643,1261 @@ transition: all 0.2s ease-in-out; width: 700px; border-bottom: 1px solid hsl(198, 21%, 79%); } +.wall-item-container.comment .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - +} +.wall-item-container.comment { + top: 15px !important; + left: 15px !important; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 5px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 2.0em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + font-size: 14px; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} .comment-edit-preview { width: 500px; margin-top: 10px; + background-color: #fff797; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; } +.shiny { + /* border-right: 10px solid #fce94f; */ + border-right: 1px solid #A7C7F7; + padding-right: 12px; +} + +#jot-preview-content{ + margin-top: 30px;} + +#jot-preview-content .tread-wrapper { + background-color: #fff797; +} + +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #999; + padding-left: 3px; + font-size: 12px; +} +.tag a { + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #999; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; + width: 80px; +} + +.contact-photo-wrapper.wwto { + width: 25px; +} + +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper { + left: 0px; + top: 63px; +} +.contact-photo { + width: 48px; + height: 48px; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-name { + /* text-align: center; */ + /*font-weight: bold;*/ + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 785px; + margin: 0px 2em 20px 0px; +} +#profile-jot-form #profile-jot-text { + height: 2.0em; + width: 99%; + font-size: 15px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; + margin-bottom: 10px; +} +.grey +{ + display: inline; + float: right; + } +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 783px; + background-color: #fff; + border-bottom: 2px solid #9eabb0; +} + +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#profile-jot-form #jot-title, #profile-jot-form #jot-category { + + border-radius: 5px 5px 5px 5px; + font-weight: bold; + height: 20px; + margin: 0 0 5px; + width: 60%; + border: 1px solid #d2d2d2; +} +#profile-jot-form #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#profile-jot-form #jot-title:-moz-placeholder { + font-weight: normal; +} +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 785px; + height: 100px; + } +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 785px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 785px; +} + +#profile-jot-submit { + float: right; + margin-top: 2px; + font-size: 14px; +} +#profile-upload-wrapper { + float: left; + margin-top: 2px; + margin-left: 10px; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-rotator { + float: left; + margin-left: 30px; + margin-top: 2px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; + margin-top: 2px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; + margin-top: 2px; +} +#jot-preview-link { + float: right; + margin-left: 10px; + margin-top: 2px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; +} +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } +/** buttons **/ +.button.creation1 { + background-color: #fff; + border: 1px solid #777777; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; +} .button.creation2 { background-color: #055580; - cursor: pointer; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; + cursor: pointer; + font-weight: bolder; +} +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons 14618a**/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 5px; } - - -/*ACL*/ - ul.tabs li .active { background-color: #055580; - box-shadow: 2px 2px 2px #CFCFCF;} - + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; +} +//settings tabs +ul.rs_tabs { + list-style-type: none; + font-size: 11px; +} +ul.rs_tabs li { + float: left; + margin-bottom: 30px; + clear: both; +} ul.rs_tabs li .selected { - background-color: #055580;} + background-color: #055580; + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 2px 2px 2px #CFCFCF; + font-size: 13px; +} +.rs_tabs { + list-style-type: none; + font-size: 11px; + background-position: 0 -20px; + background-repeat: repeat-x; + height: 27px; + padding: 0; + } +.rs_tab.button { + /*background: none repeat scroll 0 0 #F8F8F8;*/ + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bolder; + padding: 3px; + color: #333333; + text-decoration: none; + } +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666666; + background-image: url("../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +.suggest-select { +width: 500px; +height: 350px; + } +.message-to-select { + width: 400px; + height: 150px; + } +#directory-search-form{ + margin-bottom: 50px; + } +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} -/*Photo */ +#profile-edit-links ul { margin: 20px; padding-bottom: 20px; list-style: none; } +#profile-edit-links li { + float: left; + list-style: none; + margin-left: 10px; +} + +.profile-edit-side-div { + display: none; +} + +#register-form label, +#profile-edit-form label { + width: 300px; float: left; +} + +.required { + display: inline; + color: #B20202; +} + +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 120px; + height: 120px; + float: left; +} +/* photo */ .photo { box-shadow: 2px 2px 5px 0px #000000; margin: 0px; border-radius: 10px; +height: 145px !important; +width: 145px !important; +} +.lframe { + float: left; + /*margin: 0px 10px 10px 0px;*/ +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper { + left: 0px; + top: 63px; } +.contact-photo-menu-button { + position: relative; + background-image: url("../../../images/icons/16/menu.png"); + background-position: top left; + background-repeat: no-repeat; + margin: 0px 0px -16px 0px; + padding: 0px; + width: 16px; + height: 16px; + top: -20px; left:0px; + overflow: hidden; + text-indent: 40px; + display: none; + +} +.contact-photo-menu { + width: 11em; + border: 3px solid #364e59; + color: #2d2d2d; + background: #FFFFFF; +/* position: absolute;*/ + position: relative; + left: 0px; top: 0px; + display: none; + z-index: 10000; +} +.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } +.contact-photo-menu li a { + display: block; + padding: 5px 10px; + color: #2d2d2d; + text-decoration: none; +} +.contact-photo-menu li a:hover { + background-color: #bdcdd4; +} + +/* page footer */ +footer { + height: 100px; + display: table-row; +} + +blockquote { + border-left: 1px solid #D2D2D2; + padding-left: 9px; + margin: 0 0 0 .8ex; + color: #777; +} +.oembed { + + font-weight: bold; +} +.aprofile dt{ +box-shadow: 1px 1px 5px 0; + color: #666666; + margin: 15px 0 5px; + padding-left: 5px; + } +/* ================== */ +/* = Contacts Block = */ +/* ================== */ + +.contact-block-img { + width: 55px; + height: 55px; + padding-right: 3px; +} +.contact-block-div { + float: left; +} + +.contact-block-textdiv { width: 150px; height: 34px; float: left; } +#contact-block-end { clear: both; } + +#group-edit-wrapper { + margin-bottom: 10px; +} + +#group-members-end { + clear: both; +} +#group-edit-desc { + margin-top: 15px; +} + +/* +#group-separator, +#prof-separator { display: none;} +*/ +#prof-members-end{ + clear: both; + } + +#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { + margin-bottom: 10px; + margin-top: 20px; +} + +#prvmail-submit { + float: right; + margin-top: 10px; +} + +#prvmail-subject +{ +background: none repeat scroll 0 0 #FFFFFF; +border: 1px solid #CCCCCC; +border-radius: 5px 5px 5px 5px; +font-weight: bold; +height: 20px; +margin: 0 0 5px; +vertical-align: middle; +} +#prvmail-form{ + width: 597px; + } + +#prvmail-upload-wrapper, +#prvmail-link-wrapper, +#prvmail-rotator-wrapper { + float: left; + margin-top: 10px; + margin-right: 10px; + width: 24px; +} + +#prvmail-end { + clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} +a.mail-list-link { + display: block; + font-size: 1.3em; + padding: 4px 0; +} + +/* +*a.mail-list-link:hover { +* background-color: #15607B; +* color: #F5F6FB; +*} +*/ + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.4em; + margin: 10px 0; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} +.mail-conv-break { + clear: both; +} + +.mail-conv-delete-icon { + border: none; +} + +/* ========== */ +/* = Events = */ +/* ========== */ +.eventcal { + float: left; + font-size: 20px; +} + +.vevent { +position: relative; +width: 400px; +padding: 20px; +padding-top: 10px; +margin: 0 0px; +margin-bottom: 10px; +background-color: white; +-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +} +.vevent .event-location { + margin-left: 10px; + margin-right: 10px; +} +.vevent .event-description { +margin-left: 10px; +margin-right: 10px; +font-size: 1.1em; +font-weight: bolder; +} +.vevent .event-start, .vevent .event-end { + +margin-right: 20px; +margin-bottom: 2px; +margin-top: 2px; +font-size: 0.9em; +text-align: left; +} +.event-start .dtstart, .event-end .dtend { +float: right; +} + + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} + +.event-description:before { + content: url("../../../view/theme/diabook/icons/events2.png") !important; + margin-right: 15px; +} + +.event-start, .event-end { + margin-left: 10px; + width: 330px; + clear: both; +} + +.event-start .dtstart, .event-end .dtend { + float: right; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +.calendar { + font-family: Courier, monospace; +} .calendar.eventcal a { - color: #055580; + color: #1872A2; + } +.today { + font-weight: bold; + color: #FF0000; } +.settings-block { + border: 1px solid #AAA; + margin: 10px; + padding: 10px; +} + +.app-title { + margin: 10px; +} + +#identity-manage-desc { + margin-top:15px; + margin-bottom: 15px; +} + +#identity-manage-choose { + margin-bottom: 15px; +} + +#identity-submit { + margin-top: 20px; +} + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} +.lightbox{ + float: left; + } +#photo-photo { + float: left; +} +#photo-like-div .wall-item-like-buttons { + float: left; + margin-right: 10px; + } +.wall-item-like-buttons .icon.like { +float: left; +} + +#photo-photo-end { + clear: both; +} + +.tabs .comment-wwedit-wrapper { + display: block; + margin-top: 30px; + margin-left: 50px; + } + +.profile-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.profile-match-name { + float: left; + text-align: center; + width: 120px; + overflow: hidden; +} + +.profile-match-break, +.profile-match-end { + clear: both; +} + +.profile-match-connect { + text-align: center; + font-weight: bold; +} + +.profile-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 120px; + scroll: auto; +} +#profile-match-wrapper-end { + clear: both; +} + +/* ============= */ +/* = Directory = */ +/* ============= */ +section .directory-item dl { + height: auto; + overflow: auto; +} +section .directory-item dt { + float: left; + margin-left: 0px; + text-align: right; + color: #999; +} +section .directory-item dd { + float: left; + margin-left: 5px; +} +.directory-profile-wrapper { + float: left; + max-height: 178px; + overflow: hidden; + width: 635px; +} +.directory-copy-wrapper { + float: left; + overflow: hidden; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + /* position: absolute; */ + /* position: absolute; */ + left: 0px; + top: -16px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 800px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} + +section .directory-photo-wrapper { + float: left; + height: 200px; + width: 165px; +} +.contact-name { + font-weight: bold; + font-size: 18px; + margin-bottom: -3px; + text-align: left; +} +.contact-details { + color: #999999; +} +.page-type { + font-size: 10px; + font-style: italic; +} +.directory-detailscolumn-wrapper { + float: left; + width: 305px; + margin-right: 10px; +} +.directory-profile-wrapper dl { + margin-top: 3px; + margin-bottom: 3px; +} +.directory-profile-title { + font-weight: bold; + margin-bottom: 3px; + font-size: 14px; +} +#side-bar-photos-albums{ + margin-top: 15px; +} +.photo-top-photo, .photo-album-photo { + -webkit-border-radius: 5px 5px 0 0; + -moz-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +.photo-album-image-wrapper, .photo-top-image-wrapper { + float: left; + -moz-box-shadow: 0 0 5px #888; + -webkit-box-shadow: 0 0 5px #888; + box-shadow: 0 0 5px #888; + background-color: #000; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding-bottom: 20px; + position: relative; + margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; +} .photo-top-album-name { width: 100%; position: absolute; @@ -401,5 +2906,39 @@ border-radius: 10px; background-color: #EEE; } .photo-top-album-link{ - color: #055580; -} \ No newline at end of file + color: #1872A2; + } +.photo-top-album-img{ + + } +/*.photo-top-image-wrapper { + position: relative; + float: left; + margin-top: 15px; + margin-right: 15px; + width: 200px; height: 200px; + overflow: hidden; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + position: absolute; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; + background-color: rgb(255, 255, 255); +}*/ +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + diff --git a/view/theme/diabook/experimental b/view/theme/diabook/experimental deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/diabook/js/jquery.mousewheel.js b/view/theme/diabook/js/jquery.mousewheel.js new file mode 100644 index 0000000000..f1d5f72fd4 --- /dev/null +++ b/view/theme/diabook/js/jquery.mousewheel.js @@ -0,0 +1,84 @@ +/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net) + * Licensed under the MIT License (LICENSE.txt). + * + * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. + * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. + * Thanks to: Seamus Leahy for adding deltaX and deltaY + * + * Version: 3.0.6 + * + * Requires: 1.2.2+ + */ + +(function($) { + +var types = ['DOMMouseScroll', 'mousewheel']; + +if ($.event.fixHooks) { + for ( var i=types.length; i; ) { + $.event.fixHooks[ types[--i] ] = $.event.mouseHooks; + } +} + +$.event.special.mousewheel = { + setup: function() { + if ( this.addEventListener ) { + for ( var i=types.length; i; ) { + this.addEventListener( types[--i], handler, false ); + } + } else { + this.onmousewheel = handler; + } + }, + + teardown: function() { + if ( this.removeEventListener ) { + for ( var i=types.length; i; ) { + this.removeEventListener( types[--i], handler, false ); + } + } else { + this.onmousewheel = null; + } + } +}; + +$.fn.extend({ + mousewheel: function(fn) { + return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel"); + }, + + unmousewheel: function(fn) { + return this.unbind("mousewheel", fn); + } +}); + + +function handler(event) { + var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0; + event = $.event.fix(orgEvent); + event.type = "mousewheel"; + + // Old school scrollwheel delta + if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; } + if ( orgEvent.detail ) { delta = -orgEvent.detail/3; } + + // New school multidimensional scroll (touchpads) deltas + deltaY = delta; + + // Gecko + if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) { + deltaY = 0; + deltaX = -1*delta; + } + + // Webkit + if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; } + if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; } + + // Add event and delta to the front of the arguments + args.unshift(event, delta, deltaX, deltaY); + + return ($.event.dispatch || $.event.handle).apply(this, args); +} + +})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook/message_side.tpl b/view/theme/diabook/message_side.tpl new file mode 100644 index 0000000000..9f15870964 --- /dev/null +++ b/view/theme/diabook/message_side.tpl @@ -0,0 +1,10 @@ +
+ + +
    + {{ for $tabs as $t }} +
  • $t.label
    • + {{ endfor }} +
+ +
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index d45836c221..92ce03cb4c 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -137,8 +137,11 @@ -
$langselector
-
+
$langselector
+
+ + +
+ {{ if $nav.network }} +
+ + + +
+ {{ endif }} + diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 4878e25310..58c960d733 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -3204,6 +3204,9 @@ aside input[type='text'] { float: left; width: 200px; } +.field.yesno label { + font-weight: 700; +} .field input, .field textarea { diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl index e82657583f..b8e77d7fa8 100644 --- a/view/theme/frost/wall_thread.tpl +++ b/view/theme/frost/wall_thread.tpl @@ -66,7 +66,9 @@ {{ if $item.vote }} @@ -80,7 +82,9 @@ {{ if $item.star }} - + {{ endif }} + {{ if $item.tagger }} + {{ endif }} {{ if $item.filer }} diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 55fc322d74..55de92d08f 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -1,7 +1,10 @@
 
- + + {{ if $placeholdercategory }} + + {{ endif }}
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl index b39dda3a2e..eee27776be 100644 --- a/view/theme/quattro/wall_thread.tpl +++ b/view/theme/quattro/wall_thread.tpl @@ -93,8 +93,9 @@ {{ if $item.star }} $item.star.do $item.star.undo - $item.star.tagger - + {{ endif }} + {{ if $item.tagger }} + $item.tagger.add {{ endif }} {{ if $item.filer }} $item.filer @@ -102,7 +103,9 @@ {{ if $item.vote }} $item.vote.like.1 + {{ if $item.vote.dislike }} $item.vote.dislike.1 + {{ endif }} {{ endif }} {{ if $item.vote.share }} diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl index f990c95e11..12792fa0b4 100644 --- a/view/theme/smoothly/jot.tpl +++ b/view/theme/smoothly/jot.tpl @@ -18,9 +18,11 @@
+ {{ if $placeholdercategory }}
+ {{ endif }}